[oe-commits] org.oe.dev eds-dbus: sync packaging with poky

[koen commit]

eds-dbus: sync packaging with poky

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

#
# mt diff -r0c0838b4d40e895a2b87a7e504254b4016576a96 -r85ec50cc48ab77a1122873521158b158efa49120
#
# 
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [6a3376c4695e778c50ac4d595490def6f88cf7fd]
#    to [14275a9b033a245f9fc55724c6b9f22430d1ac84]
# 
============================================================
--- packages/eds/eds-dbus_svn.bb	6a3376c4695e778c50ac4d595490def6f88cf7fd
+++ packages/eds/eds-dbus_svn.bb	14275a9b033a245f9fc55724c6b9f22430d1ac84
@@ -1,7 +1,7 @@ LICENSE = "LGPL"
 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 libglade virtual/libiconv zlib intltool"
+DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
 
 PV = "1.4.0+svn${SRCDATE}"
 PR = "r2"
@@ -9,10 +9,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/${
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libdb.patch;patch=1 \
            file://no_iconv_test.patch;patch=1 \
-           file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \
-           file://no_libedataserverui.patch;patch=1;mindate=20061215 \
-           file://disable_orbit.patch;patch=1;maxdate=20061214 \
-           file://fix-bindig-tool.patch;patch=1;maxdate=20061223 \
+           file://no_libedataserverui.patch;patch=1 \
            file://iconv-detect.h"
 
 S = "${WORKDIR}/trunk"
@@ -26,37 +23,31 @@ acpaths = " -I ${STAGING_DATADIR}/acloca
 
 acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
 
-PACKAGES =+ "eds-pixmaps eds-zoneinfo eds-camel-providers eds-camel-lock-helper eds-camel-index-control libcamel-provider libcamel libebook libecal libedata-book libedata-cal libedataserver"
+PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
 
-RDEPENDS_${PN} += "eds-pixmaps eds-zoneinfo"
+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_eds-pixmaps = "${datadir}/pixmaps"
-FILES_eds-zoneinfo = "${datadir}/evolution-data-server-1.4/zoneinfo/"
-FILES_eds-camel-providers = "${libdir}/evolution-data-server-1.2/camel-providers/*.so ${libdir}/evolution-data-server-1.2/camel-providers/*.urls"
-FILES_eds-camel-lock-helper = "${libexecdir}/camel-lock-helper-1.2"
-FILES_eds-camel-index-control = "${libexecdir}/camel-index-control-1.2"
-FILES_libcamel-provider = "${libdir}/libcamel-provider-1.2.so.*"
-FILES_libcamel = "${libdir}/libcamel-1.2.so.*"
-FILES_libebook = "${libdir}/libebook-1.2*"
-FILES_libecal = "${libdir}/libecal-1.2.so.*"
-FILES_libedata-book = "${libdir}/libedata-book-1.2.so.*"
-FILES_libedata-cal = "${libdir}/libedata-cal-1.2.so.*"
-FILES_libedataserver = "${libdir}/libedataserver-1.2.so.*"
+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-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so ${libdir}/pkgconfig/camel*pc ${includedir}/evolution-data-server*/camel"
 
-FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so \
-                ${libdir}/evolution-data-server-1.2/camel-providers/*.so \
-                ${libdir}/evolution-data-server-1.2/camel-providers/*.urls \
-                ${datadir}/evolution-data-server-1.4/zoneinfo/zones.tab \
-                ${datadir}/evolution-data-server-1.4/zoneinfo/*/*.ics \
-                ${datadir}/evolution-data-server-1.4/zoneinfo/*/*/*.ics \
-                ${datadir}/dbus-1/services/*.service"
-FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \
-                    ${libdir}/evolution-data-server-1.2/camel-providers/*.la"
+FILES_libebook = "${libdir}/libebook-*.so.*"
+FILES_libebook-dev = "${libdir}/libebook-1.2.so ${libdir}/pkgconfig/libebook-*.pc ${includedir}/evolution-data-server*/libebook/*.h"
 
+FILES_libecal = "${libdir}/libecal-*.so.* ${datadir}/evolution-data-server-1.4/zoneinfo"
+FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc ${includedir}/evolution-data-server*/libecal/*.h ${includedir}/evolution-data-server*/libical/*.h"
 
+FILES_libedata-book = "${libexecdir}/e-addressbook-factory ${datadir}/dbus-1/services/*.AddressBook.service ${libdir}/libedata-book-*.so.* ${libdir}/evolution-data-server-*/extensions/libebook*.so"
+FILES_libedata-book-dev = "${libdir}/libedata-book-*.so ${libdir}/pkgconfig/libedata-book-*.pc ${includedir}/evolution-data-server-*/libedata-book"
+
+FILES_libedata-cal = "${libexecdir}/e-calendar-factory ${datadir}/dbus-1/services/*.Calendar.service ${libdir}/libedata-cal-*.so.* ${libdir}/evolution-data-server-*/extensions/libecal*.so"
+FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so ${libdir}/pkgconfig/libedata-cal-*.pc ${includedir}/evolution-data-server-*/libedata-cal"
+
+FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
+FILES_libedataserver-dev = "${libdir}/libedataserver-*.so ${libdir}/pkgconfig/libedataserver-*.pc ${includedir}/evolution-data-server-*/libedataserver/*.h"
+
 do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
 
 do_stage () {
         autotools_stage_all
 }
-