merge of '2811d087e4e2a539efd12b4513c33ff8441b0f93'

     and '95b65603cddbae832076e12aaeb4aac4481b2073'

7 files changed, 9 insertions, 14 deletions

diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb
index f440e117ff..7c4aea3920 100644
--- a/packages/directfb/++dfb_1.0.0.bb
+++ b/packages/directfb/++dfb_1.0.0.bb
@@ -10,10 +10,6 @@ RV = "0.9-25"
 
 inherit autotools pkgconfig
 
-do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-}
-
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 064a808273..7fd3f38848 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -10,11 +10,6 @@ S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
-do_configure_append() {
-#    find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
-    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-}
-
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb
index 60ea915933..c909c401b7 100644
--- a/packages/freesmartphone/gsm0710muxd_svn.bb
+++ b/packages/freesmartphone/gsm0710muxd_svn.bb
@@ -3,11 +3,12 @@ HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "M. Dietrich"
 SECTION = "console/network"
 DEPENDS = "intltool-native dbus dbus-glib"
+RDEPENDS = "dbus dbus-glib"
 RCONFLICTS = "gsmd"
 RREPLACES = "gsmd"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
 S = "${WORKDIR}/gsm0710muxd"
diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc
index 1a8236aa34..23a8b9bc70 100644
--- a/packages/gtk+/gtk+.inc
+++ b/packages/gtk+/gtk+.inc
@@ -8,6 +8,8 @@ DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcr
 
 inherit autotools pkgconfig
 
+LEAD_SONAME = "libgtk-x11-2.0.so"
+
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-update-icon-cache \
 	${bindir}/gtk-query-immodules-2.0 \
diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb
index 42bf611880..3abab2e726 100644
--- a/packages/images/opie-image-16mb.bb
+++ b/packages/images/opie-image-16mb.bb
@@ -1,6 +1,6 @@
 IMAGE_LINGUAS = ""
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb"
+DEPENDS = "task-boot task-opie-16mb"
 
 IMAGE_INSTALL = "task-boot \
                     ipkg ipkg-collateral \
@@ -14,6 +14,6 @@ IMAGE_INSTALL = "task-boot \
 		    task-opie-irda"
 
 # create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 inherit image
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index 04c1f260e8..54e38c498f 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -1,8 +1,8 @@
 IMAGE_LINGUAS = ""
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
+DEPENDS = "task-base task-opie"
 
-IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \
+IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \
 		    task-opie-base-inputmethods task-opie-base-apps \
 		    task-opie-base-settings task-opie-base-decorations \
 		    task-opie-base-styles task-opie-base-pim \
diff --git a/packages/smartmontools/smartmontools_5.38.bb b/packages/smartmontools/smartmontools_5.38.bb
new file mode 100644
index 0000000000..ec9a10d4c5
--- /dev/null
+++ b/packages/smartmontools/smartmontools_5.38.bb
@@ -0,0 +1 @@
+include smartmontools.inc