[oe-commits] org.oe.dev eds-dbus: rework packaging a bit to make it go from "not too broken" to "doesn't make ipkg freak out"

[koen commit]

eds-dbus: rework packaging a bit to make it go from "not too broken" to "doesn't make ipkg freak out"

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 507934891213d0b1326eaf4dd77908d23ad82ada
ViewMTN: http://monotone.openembedded.org/revision.psp?id=507934891213d0b1326eaf4dd77908d23ad82ada
Files:
1
packages/eds/eds-dbus_svn.bb
Diffs:

#
# mt diff -r487c97d1e2989370f13d8c2fdf23f2b699422451 -r507934891213d0b1326eaf4dd77908d23ad82ada
#
# 
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [ab2496a0a8894fe1ef9f4add88042a470b6107d1]
#    to [b946a772da65052b1aa39f2fd6a1cf760c1a3b17]
# 
============================================================
--- packages/eds/eds-dbus_svn.bb	ab2496a0a8894fe1ef9f4add88042a470b6107d1
+++ packages/eds/eds-dbus_svn.bb	b946a772da65052b1aa39f2fd6a1cf760c1a3b17
@@ -1,10 +1,10 @@ PV = "1.4.0+svn${SRCDATE}"
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
 
 PV = "1.4.0+svn${SRCDATE}"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libdb.patch;patch=1 \
@@ -23,13 +23,14 @@ acpaths = " -I ${STAGING_DATADIR}/acloca
 
 acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
 
-PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
+PACKAGES =+ "libcamel-collateral libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
 
 FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
 FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug ${libdir}/evolution-data-server*/extensions/.debug/"
 
-FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* ${libdir}/libcamel-provider-*.so.* ${libdir}/evolution-data-server-*/camel-providers/*.so ${libdir}/evolution-data-server-*/camel-providers/*.urls"
+FILES_libcamel = "${libdir}/libcamel-*.so.* ${libexecdir}/camel-*"
 FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so ${libdir}/pkgconfig/camel*pc ${includedir}/evolution-data-server*/camel"
+FILES_libcamel-collateral = "${libdir}/libcamel-provider-*.so.* ${libdir}/evolution-data-server-*/camel-providers/*.so ${libdir}/evolution-data-server-*/camel-providers/*.urls"
 
 FILES_libebook = "${libdir}/libebook-*.so.*"
 FILES_libebook-dev = "${libdir}/libebook-1.2.so ${libdir}/pkgconfig/libebook-*.pc ${includedir}/evolution-data-server*/libebook/*.h"