[oe-commits] org.oe.dev merge of '28e581a252798ea99e74c7aaed5404057a81ccd0'

[pfalcon commit]

merge of '28e581a252798ea99e74c7aaed5404057a81ccd0'
     and '5624487eb13b978b5a6cb83c78e6a60a5d481422'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 332a00dc550ca182177c40331ae4e05ba59793e0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=332a00dc550ca182177c40331ae4e05ba59793e0
Files:
1
packages/pkgconfig/pkgconfig-0.22
packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h
packages/pkgconfig/pkgconfig-native_0.22.bb
packages/pkgconfig/pkgconfig_0.22.bb
packages/ruby/ruby_1.8.5.bb
packages/tasks/task-base.bb
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/opie-alarm/opie-alarm_cvs.bb
Diffs:

#
# mt diff -r28e581a252798ea99e74c7aaed5404057a81ccd0 -r332a00dc550ca182177c40331ae4e05ba59793e0
#
# 
# 
# add_dir "packages/pkgconfig/pkgconfig-0.22"
# 
# add_file "packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h"
#  content [372a1bb7b434a2d33536de584a8e41604dd5fe1e]
# 
# add_file "packages/pkgconfig/pkgconfig-native_0.22.bb"
#  content [1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d]
# 
# add_file "packages/pkgconfig/pkgconfig_0.22.bb"
#  content [fffbd20e4754ed405bc7f24d8eacec693adf09f7]
# 
# patch "packages/ruby/ruby_1.8.5.bb"
#  from [abb57d427cbbc11f4ff83d8dc8f53951a1066f8b]
#    to [7544aec96e0f0bee56c8380879e7478a865e00f5]
# 
# patch "packages/tasks/task-base.bb"
#  from [2b89141c35420f2a2ec89ff47305e1e4034c4067]
#    to [fe2979cb73be668163bfcc4d8438f2aef96d197b]
# 
============================================================
--- packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h	372a1bb7b434a2d33536de584a8e41604dd5fe1e
+++ packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h	372a1bb7b434a2d33536de584a8e41604dd5fe1e
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
============================================================
--- packages/pkgconfig/pkgconfig-native_0.22.bb	1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
+++ packages/pkgconfig/pkgconfig-native_0.22.bb	1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
@@ -0,0 +1,7 @@
+SECTION = "console/utils"
+require pkgconfig_${PV}.bb
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+inherit native
+DEPENDS = ""
============================================================
--- packages/pkgconfig/pkgconfig_0.22.bb	fffbd20e4754ed405bc7f24d8eacec693adf09f7
+++ packages/pkgconfig/pkgconfig_0.22.bb	fffbd20e4754ed405bc7f24d8eacec693adf09f7
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+DESCRIPTION = "pkg-config is a system for managing library \
+compile/link flags that works with automake and autoconf. \
+It replaces the ubiquitous *-config scripts you may have \
+seen with a single tool."
+HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE  = "-1"
+
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+
+inherit autotools
+
+acpaths = "-I ."
+do_configure () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+	gnu-configize
+	libtoolize --force
+        oe_runconf
+}
+
+do_stage_prepend() {
+	install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+
+}
============================================================
--- packages/ruby/ruby_1.8.5.bb	abb57d427cbbc11f4ff83d8dc8f53951a1066f8b
+++ packages/ruby/ruby_1.8.5.bb	7544aec96e0f0bee56c8380879e7478a865e00f5
@@ -1,2 +1,8 @@ DEPENDS = "ruby-native zlib openssl"
 require ruby.inc
 DEPENDS = "ruby-native zlib openssl"
+
+PR = "r1"
+
+FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
+                    ${libdir}/ruby/1.8/*/*/.debug"
+
============================================================
--- packages/tasks/task-base.bb	2b89141c35420f2a2ec89ff47305e1e4034c4067
+++ packages/tasks/task-base.bb	fe2979cb73be668163bfcc4d8438f2aef96d197b
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r40"
+PR = "r41"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -223,9 +223,13 @@ task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
+
 RDEPENDS_task-base-bluetooth = "\ 
     blueprobe \
-    bluez-utils"
+    bluez-utils \
+    bluez-utils-compat \  
+    "
 
 RRECOMMENDS_task-base-bluetooth = "\
     kernel-module-bluetooth \


#
# mt diff -r5624487eb13b978b5a6cb83c78e6a60a5d481422 -r332a00dc550ca182177c40331ae4e05ba59793e0
#
# 
# 
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
#  from [274dcb7d5c72996b49644fa765c72f56ce8f956e]
#    to [2ed176b9d093b41fb1abb2ec3d3fffaed7673a66]
# 
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
#  from [ab53754a45a99c30cb4df8437d42d73aad9d163e]
#    to [729efab276ac16baecddae1fc83592ec38182ff4]
# 
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	274dcb7d5c72996b49644fa765c72f56ce8f956e
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc	2ed176b9d093b41fb1abb2ec3d3fffaed7673a66
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 #
 # Default versions
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20070717"
+OPIE_SRCDATE ?= "20070724"
 OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
 
============================================================
--- packages/opie-alarm/opie-alarm_cvs.bb	ab53754a45a99c30cb4df8437d42d73aad9d163e
+++ packages/opie-alarm/opie-alarm_cvs.bb	729efab276ac16baecddae1fc83592ec38182ff4
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2.1"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
            file://01opiealarm \