[oe-commits] org.oe.dev gconf-dbus: update svn version to rev 641, remove cvs version

[mickeyl commit]

gconf-dbus: update svn version to rev 641, remove cvs version
* this makes it work with dbus 1.1.x

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: bb7fd700ef6f36c0c16f778ed407ede5a32c8c2c
ViewMTN: http://monotone.openembedded.org/revision/info/bb7fd700ef6f36c0c16f778ed407ede5a32c8c2c
Files:
1
packages/gnome/gconf-dbus_cvs.bb
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/gnome/gconf-dbus_svn.bb
Diffs:

#
# mt diff -rdb9d94dda99f95b82b314063328d93dbf419d31d -rbb7fd700ef6f36c0c16f778ed407ede5a32c8c2c
#
# 
# 
# delete "packages/gnome/gconf-dbus_cvs.bb"
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [a20012ca4a3de383c6062b1c564166182a18c681]
#    to [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [fb163a1560e2e33896cf337a40acbf4fc419e625]
#    to [06c680c836e1f326a6ad003d8e7198e317e64709]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [17c69da4bd130d92af8af24b002ef34409149a33]
#    to [0ae937994dd634efb5800bcac5e79d9dcfb531b6]
# 
============================================================
--- conf/distro/include/sane-srcdates.inc	a20012ca4a3de383c6062b1c564166182a18c681
+++ conf/distro/include/sane-srcdates.inc	458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
@@ -46,7 +46,6 @@ SRCDATE_gpesyncd ?= "20070701"
 SRCDATE_gpesyncd ?= "20070701"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20070512"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
============================================================
--- conf/distro/include/sane-srcrevs.inc	fb163a1560e2e33896cf337a40acbf4fc419e625
+++ conf/distro/include/sane-srcrevs.inc	06c680c836e1f326a6ad003d8e7198e317e64709
@@ -23,7 +23,7 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-epiphany ?= "7650"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
-SRCREV_pn-gconf-dbus ?= "606"
+SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gsm0710muxd ?= "73"
============================================================
--- packages/gnome/gconf-dbus_svn.bb	17c69da4bd130d92af8af24b002ef34409149a33
+++ packages/gnome/gconf-dbus_svn.bb	0ae937994dd634efb5800bcac5e79d9dcfb531b6
@@ -1,39 +1,38 @@
-SECTION = "x11/utils"
+DESCRIPTION = "The GNOME Settings daemon using DBUS for communication."
 DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
+SECTION = "x11/utils"
 PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
-
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r0"
 
+inherit autotools pkgconfig
+
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-	   file://69gconfd-dbus"
-
-inherit pkgconfig autotools 
+	file://69gconfd-dbus"
 S = "${WORKDIR}/trunk"
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
 
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-
-
 do_configure_prepend() {
-        touch gtk-doc.make
+	touch gtk-doc.make
 }
 
 do_stage() {
-        autotools_stage_all
-        install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+	autotools_stage_all
+	install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
 }
 
-do_install_append () {
+do_install_append() {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
 }
+
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+