From 093d01d708c2f09213f1667ca45cd165c282e435 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 12 Mar 2008 10:35:31 +0000
Subject: directfb: Remove potential dangerous sed invocation. Add a -I in
 front and replace it with nothing     It is still compiling and packaging.

---
 packages/directfb/++dfb_1.0.0.bb             | 2 +-
 packages/directfb/directfb-examples_1.0.0.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb
index f440e117ff..020cbfe3eb 100644
--- a/packages/directfb/++dfb_1.0.0.bb
+++ b/packages/directfb/++dfb_1.0.0.bb
@@ -11,7 +11,7 @@ RV = "0.9-25"
 inherit autotools pkgconfig
 
 do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
 }
 
 do_stage() {
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 064a808273..e59e4ecf2e 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -11,8 +11,8 @@ 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}:'
+#    find ${S} -type f | xargs sed -i 's:-L/usr/lib::g'
+    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
 }
 
 do_stage() {
-- 
cgit v1.2.3


From 72bbade2b07c4701d0b35f0b3a21d81201302c1c Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 12 Mar 2008 12:32:45 +0000
Subject: directfb: This magic is not needed for directfb     It compiles and
 the packages look fine

---
 packages/directfb/++dfb_1.0.0.bb             | 4 ----
 packages/directfb/directfb-examples_1.0.0.bb | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb
index 020cbfe3eb..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:-I/usr/include::g'
-}
-
 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 e59e4ecf2e..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:-L/usr/lib::g'
-    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
-}
-
 do_stage() {
 	autotools_stage_all
 }
-- 
cgit v1.2.3


From 33b304d6d8413e7c1993aae8aef509a58dd59036 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Mar 2008 13:02:18 +0000
Subject: gsm0710muxd svn add proper RDEPENDS

---
 packages/freesmartphone/gsm0710muxd_svn.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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"
-- 
cgit v1.2.3


From 61835c2897efc6eb52f588ac9a351ec37e82d75a Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 15:59:36 +0000
Subject: gtk+.inc: QA, add LEAD_SONAME

---
 packages/gtk+/gtk+.inc | 2 ++
 1 file changed, 2 insertions(+)

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 \
-- 
cgit v1.2.3


From f336f885a5f0de0a94ff57f5136741ca319efe8c Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Wed, 12 Mar 2008 18:37:15 +0000
Subject: smartmontools: 5.38 release.

---
 packages/smartmontools/smartmontools_5.38.bb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/smartmontools/smartmontools_5.38.bb

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
-- 
cgit v1.2.3


From cec1b020d3e88d90cd1aa209f69d28a0e322eb93 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 18:43:36 +0000
Subject: opie-image-(16mb): replace MACHINE_TASK_PROVIDER with
 task_boot/task_base   courtesy of Henry von Tresckow <hvontres@gmail.com> *
 oebug# 3969 * add task-base-extended for devices without built in wifi *
 remove borken merge feeds

---
 packages/images/opie-image-16mb.bb | 4 ++--
 packages/images/opie-image.bb      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 \
-- 
cgit v1.2.3