Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/20 16:29:43+02:00 utwente.nl!koen
Add missing .inc while nobody is looking

2005/06/20 15:41:28+02:00 utwente.nl!koen
  update gconf-osso, courtesy Florian Boor

BKrev: 42b6d54bddf8pOoF8wqQzVHgWz_SRQ

diff --git a/packages/gpe-todo/gpe-todo.inc b/packages/gpe-todo/gpe-todo.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/maemo/gconf-osso/free-entry-fix.diff b/packages/maemo/gconf-osso/free-entry-fix.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/maemo/gconf-osso/no-po-no-examples.diff b/packages/maemo/gconf-osso/no-po-no-examples.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/maemo/gconf-osso/service-file.diff b/packages/maemo/gconf-osso/service-file.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index 8792aa1..8e59751 100644 (file)
--- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
@@ -6,10 +6,14 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PROVIDES = "gconf"
 RPROVIDES = "gconf"
 
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \
            file://gconf-update.patch;patch=1;pnum=0 \
+           file://free-entry-fix.diff;patch=1 \
+           file://no-po-no-examples.diff;patch=1 \
+           file://service-file.diff;patch=1 \
+           file://gconf-daemon-dbus-oe.sh \
            file://gconf-daemon-oe.sh"
 
 S = "${WORKDIR}/gconf2-2.6.4/GConf-2.6.4"
@@ -26,6 +30,7 @@ HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-valu
 do_install_append () {
        install -d ${D}/${sysconfdir}/osso-af-init
        install -m755 ${WORKDIR}/gconf-daemon-oe.sh ${D}${sysconfdir}/osso-af-init/gconf-daemon.sh
+       install -m755 ${WORKDIR}/gconf-daemon-dbus-oe.sh ${D}${sysconfdir}/osso-af-init/gconf-daemon-dbus.sh
        install -d ${D}${sysconfdir}/osso-af-init/gconf-dir
        install -d ${D}/var/lib/gconf
 }