[oe-commits] org.oe.dev eds-dbus: merge in some fixes from poky

[koen commit]

eds-dbus: merge in some fixes from poky

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

#
# mt diff -r29a0527be730d9f1226b4ceab4390aa83b2e1054 -rfce83af6d32103c8a36512cca53b8403f3f03600
#
# 
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [32af04ace289a8509af621b6e9da9398daa26899]
#    to [849ca6e1bcce27b70e3757b9118fbe92e36e15f2]
# 
============================================================
--- packages/eds/eds-dbus_svn.bb	32af04ace289a8509af621b6e9da9398daa26899
+++ packages/eds/eds-dbus_svn.bb	849ca6e1bcce27b70e3757b9118fbe92e36e15f2
@@ -1,16 +1,16 @@ PV = "1.4.0+svn${SRCDATE}"
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib"
 
 PV = "1.4.0+svn${SRCDATE}"
-PR = "r16"
+PR = "r17"
 
 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.patch;patch=1 \
-           file://disable_orbit.patch;patch=1 \
+           file://disable_orbit.patch;patch=1;maxdate=20060126 \
            file://iconv-detect.h"
 
 S = "${WORKDIR}/trunk"
@@ -38,24 +38,7 @@ do_stage () {
 do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
 
 do_stage () {
-	oe_libinstall -so -C addressbook/libebook-dbus libebook-1.2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C addressbook/libedata-book-dbus libedata-book-1.2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C calendar/libecal-dbus libecal-1.2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C calendar/libedata-cal-dbus libedata-cal-1.2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C libedataserver libedataserver-1.2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C camel libcamel-1.2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C camel libcamel-provider-1.2 ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/camel-1.2 ${STAGING_INCDIR}/libebook \
-		${STAGING_INCDIR}/libecal ${STAGING_INCDIR}/libedataserver \
-		${STAGING_INCDIR}/libical
-	install -m 0644 ${S}/camel/*.h ${STAGING_INCDIR}/camel-1.2
-	install -m 0644 ${S}/camel/*.def ${STAGING_INCDIR}/camel-1.2
-	ln -sf ${STAGING_INCDIR}/camel-1.2 ${STAGING_INCDIR}/camel
-	install -m 0644 ${S}/addressbook/libebook-dbus/*.h ${STAGING_INCDIR}/libebook
-	install -m 0644 ${S}/calendar/libecal-dbus/*.h ${STAGING_INCDIR}/libecal
-	install -m 0644 ${S}/libedataserver/*.h ${STAGING_INCDIR}/libedataserver
-	install -m 0644 ${S}/calendar/libical/src/libical/*.h ${STAGING_INCDIR}/libical
+	autotools_stage_all
 }