[oe-commits] org.oe.dev merge of '344d73d144b1bef8196ec90abf704f5fb1054c19'

[rwhitby commit]

merge of '344d73d144b1bef8196ec90abf704f5fb1054c19'
     and '636bac75e27918f87914b16fd745dd92dd014ea4'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb
Files:
1
packages/tzcode/tzcode-native_2007d.bb
packages/tzcode/tzcode-native_2007e.bb
packages/tzdata/tzdata_2007d.bb
packages/tzdata/tzdata_2007e.bb
packages/btscanner/btscanner_2.0.bb
packages/libwpd/libwpd_0.8.4.bb
packages/libwpd/libwpd_0.8.6.bb
packages/meta/slugos-packages.bb
packages/tasks/task-sdk-sbox.bb
packages/tasks/task-sdk.bb
Diffs:

#
# mt diff -r344d73d144b1bef8196ec90abf704f5fb1054c19 -r0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb
#
# 
# 
# rename "packages/tzcode/tzcode-native_2007d.bb"
#     to "packages/tzcode/tzcode-native_2007e.bb"
# 
# rename "packages/tzdata/tzdata_2007d.bb"
#     to "packages/tzdata/tzdata_2007e.bb"
# 
# patch "packages/btscanner/btscanner_2.0.bb"
#  from [f563d2c71804e85fc993f3b9eb20fbe7b502c7c0]
#    to [c9d31a4e5627566f8a27ace6ad13a828d01d8d25]
# 
# patch "packages/libwpd/libwpd_0.8.4.bb"
#  from [6a501897a9bad2d83ad334b3de3a633aefea9179]
#    to [86f8583bdb198b6e42c7f02f723271c973d2ccbb]
# 
# patch "packages/libwpd/libwpd_0.8.6.bb"
#  from [6a501897a9bad2d83ad334b3de3a633aefea9179]
#    to [86f8583bdb198b6e42c7f02f723271c973d2ccbb]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [445b494b02d0978e46722c8f134f299ed6c5a86b]
#    to [728a70128d71b4be7513509e242d31cbb914c6ad]
# 
# patch "packages/tasks/task-sdk-sbox.bb"
#  from [966af0a869fa2928d03db26ca956bdba685d84d1]
#    to [c59972859e7d181b8def89749a251b263fca1f44]
# 
# patch "packages/tasks/task-sdk.bb"
#  from [219dc0b33aa54da96fc69a0b8303d023597cf330]
#    to [5d2c82b99414c3a5c3d115e9094327afdd6ebefc]
# 
============================================================
--- packages/btscanner/btscanner_2.0.bb	f563d2c71804e85fc993f3b9eb20fbe7b502c7c0
+++ packages/btscanner/btscanner_2.0.bb	c9d31a4e5627566f8a27ace6ad13a828d01d8d25
@@ -1,8 +1,8 @@ HOMEPAGE = "http://www.pentest.co.uk/cgi
 DESCRIPTION = "Extract information from Bluetooth devices in range."
 SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
-DEPENDS = "bluez-libs gdbm ncurses"
+DEPENDS = "bluez-libs gdbm ncurses libxml2"
 PR = "r0"
 LICENSE = "GPLv2"
 
============================================================
--- packages/libwpd/libwpd_0.8.4.bb	6a501897a9bad2d83ad334b3de3a633aefea9179
+++ packages/libwpd/libwpd_0.8.4.bb	86f8583bdb198b6e42c7f02f723271c973d2ccbb
@@ -1,10 +1,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/$
 LICENSE = "LGPL"
 DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
 HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+DEPENDS = "libgsf"
 
-
 inherit autotools pkgconfig
 
 
============================================================
--- packages/libwpd/libwpd_0.8.6.bb	6a501897a9bad2d83ad334b3de3a633aefea9179
+++ packages/libwpd/libwpd_0.8.6.bb	86f8583bdb198b6e42c7f02f723271c973d2ccbb
@@ -1,10 +1,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/$
 LICENSE = "LGPL"
 DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
 HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+DEPENDS = "libgsf"
 
-
 inherit autotools pkgconfig
 
 
============================================================
--- packages/meta/slugos-packages.bb	445b494b02d0978e46722c8f134f299ed6c5a86b
+++ packages/meta/slugos-packages.bb	728a70128d71b4be7513509e242d31cbb914c6ad
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r31"
+PR = "r32"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -162,7 +162,6 @@ SLUGOS_PACKAGES = "\
 	streamripper \
 	sysfsutils \
 	tar \
-	task-native-sdk \
 	task-mokogateway-everything \
 	thttpd \
 	tiff \
@@ -206,6 +205,7 @@ SLUGOS_BROKEN_PACKAGES = "\
 	unionfs-utils \
 	lirc \
 	pwc \
+	task-native-sdk \
 	zd1211 \
 	mysql \
         wview-sim-mysql wview-vpro-mysql \
============================================================
--- packages/tasks/task-sdk-sbox.bb	966af0a869fa2928d03db26ca956bdba685d84d1
+++ packages/tasks/task-sdk-sbox.bb	c59972859e7d181b8def89749a251b263fca1f44
@@ -1,22 +1,12 @@ DESCRIPTION = "SDK task for Scratchbox r
 DESCRIPTION = "SDK task for Scratchbox rootstraps"
-PR = "r4"
+PR = "r5"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 RDEPENDS := "\
-    glib-2.0-utils \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-jpeg \
-    gdk-pixbuf-loader-gif \
-    gdk-pixbuf-loader-xpm \
-    intltool \
-    intltool-dev \
     strace \
     gdb \
     sbrsh \
     fakeroot \
-    matchbox-wm \
-    dbus \
-    joe \
     ipkg \
     "
============================================================
--- packages/tasks/task-sdk.bb	219dc0b33aa54da96fc69a0b8303d023597cf330
+++ packages/tasks/task-sdk.bb	5d2c82b99414c3a5c3d115e9094327afdd6ebefc
@@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages"
 DESCRIPTION = "SDK packages"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -20,47 +20,8 @@ RDEPENDS_task-sdk-base := "\
     glibc \
     glibc-dev \
     libgcc1 \
-    alsa-dev \
-    audiofile-dev \
-    bluez-libs-dev \
-    dbus-dev \
-    expat-dev \
-    fontconfig-dev \
-    freetype-dev \
-    glib-2.0-dev \
-    gstreamer-dev \
-    libice-dev \
     ipkg-dev \
-    jpeg-dev \
-    libapm-dev \
-    alsa-lib-dev \
-    libdisplaymigration-dev \
-    libetpan-dev \
-    libgcrypt-dev \
-    libglade-dev \
-    gnutls-dev \
-    libgpg-error-dev \
-    libidl-dev \
-    libiw-dev \
-    libmimedir-dev \
-    libpcap-dev \
-    libpixman-dev \
-    libpng-dev \
-    libschedule-dev \
-    libsm-dev \
-    libsoundgen-dev \
-    libsoup-dev \
-    libsvg-dev \
-    libtododb-dev \
-    libts-dev \
-    libxml2-dev \
-    ncurses-dev \
-    openobex-dev \
-    popt-dev \
-    readline-dev \
-    libsqlite-dev \
-    zlib-dev \
-    libxmu-dev"
+    "
 
 RDEPENDS_task-sdk-x11 := "\
     atk-dev \


#
# mt diff -r636bac75e27918f87914b16fd745dd92dd014ea4 -r0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb
#
# 
# no changes
#