[oe-commits] org.oe.dev merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'

[hrw commit]

merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
     and '92f0750aade452d9021d2d2bd259d1b86edde5b5'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 37a4a98782bda17b384e225dc6561e633f49393c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=37a4a98782bda17b384e225dc6561e633f49393c
Files:
1
packages/glib-2.0/glib-2.0_2.12.12.bb
packages/glib-2.0/glib.inc
packages/parted/parted_1.8.7.bb
packages/tasks/task-gpephone.bb
Diffs:

#
# mt diff -r69c4f23827bd5d45cfcc6008cf24a3877da4126e -r37a4a98782bda17b384e225dc6561e633f49393c
#
# 
# 
# patch "packages/glib-2.0/glib-2.0_2.12.12.bb"
#  from [030996100e8c5110ee7690dae2a49a7cef321ecf]
#    to [83e73c427da8f2e30cb58950bde9a902e2900d65]
# 
# patch "packages/glib-2.0/glib.inc"
#  from [3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5]
#    to [29039e156a12c5bbeada136e27b7e662b1928c8c]
# 
============================================================
--- packages/glib-2.0/glib-2.0_2.12.12.bb	030996100e8c5110ee7690dae2a49a7cef321ecf
+++ packages/glib-2.0/glib-2.0_2.12.12.bb	83e73c427da8f2e30cb58950bde9a902e2900d65
@@ -1,6 +1,6 @@ require glib.inc
 require glib.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
============================================================
--- packages/glib-2.0/glib.inc	3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5
+++ packages/glib-2.0/glib.inc	29039e156a12c5bbeada136e27b7e662b1928c8c
@@ -10,10 +10,11 @@ PACKAGES =+ " glib-2.0-utils "
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ " glib-2.0-utils "
 
-PR = "r1"
+PR = "r2"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN} = "${libdir}/lib*so.*"
 FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0"
 
 EXTRA_OECONF = "--disable-debug "


#
# mt diff -r92f0750aade452d9021d2d2bd259d1b86edde5b5 -r37a4a98782bda17b384e225dc6561e633f49393c
#
# 
# 
# patch "packages/parted/parted_1.8.7.bb"
#  from [869ca28033957bf8a0406bc4d16876bd71dff378]
#    to [35f9b305760bd77fe10ab9d0cbac3681d29a911f]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [b6fcf7da200e26f6d129146ad6a7c3120ba4697e]
#    to [722a1f220d1d05ba19002f0f73a5c742112064b8]
# 
============================================================
--- packages/parted/parted_1.8.7.bb	869ca28033957bf8a0406bc4d16876bd71dff378
+++ packages/parted/parted_1.8.7.bb	35f9b305760bd77fe10ab9d0cbac3681d29a911f
@@ -1,9 +1,9 @@ DEPENDS = "readline e2fsprogs-libs"
 DESCRIPTION = "parted, the GNU partition resizing program"
 HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
            
@@ -20,3 +20,8 @@ do_stage() {
 do_stage() {
 	autotools_stage_all
 }
+
+# Requires autoconf 2.61. Without it, will build, but there
+# will be link errors when some other package will link against
+# libparted.
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/tasks/task-gpephone.bb	b6fcf7da200e26f6d129146ad6a7c3120ba4697e
+++ packages/tasks/task-gpephone.bb	722a1f220d1d05ba19002f0f73a5c742112064b8
@@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Pal
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r4"
+PR = "r5"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -18,12 +18,13 @@ RDEPENDS_gpephone-task-development = "\
 
 RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
-    xmonobut \
     gpe-terminal \
     gpe-edit \
     gdb \
     strace \
-    e2fsprogs"
+    e2fsprogs \
+    bluez-utils-compat \
+    minicom"
 
 RDEPENDS_gpephone-task-base = "\
     cms92init \