[oe-commits] org.oe.dev merge of '91d5e4c4066a9c5a157af1cecfa08fa827e70cb1'

[mickeyl commit]

merge of '91d5e4c4066a9c5a157af1cecfa08fa827e70cb1'
     and 'cb2356de53f19e13c8306f4976bcf0f1b23b36e0'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e033232db3b41547193f4f62c8dc41bc4fb6021d
ViewMTN: http://monotone.openembedded.org/revision/info/e033232db3b41547193f4f62c8dc41bc4fb6021d
Files:
1
packages/python/python-pydirectfb
packages/python/python-pydirectfb/fix-directfb-detection.patch
classes/rootfs_deb.bbclass
packages/curl/curl_7.16.4.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:

#
# mt diff -r91d5e4c4066a9c5a157af1cecfa08fa827e70cb1 -re033232db3b41547193f4f62c8dc41bc4fb6021d
#
# 
# 
# add_dir "packages/python/python-pydirectfb"
# 
# add_file "packages/python/python-pydirectfb/fix-directfb-detection.patch"
#  content [f25fa2882b342ba3de9b944959b575df150dfd5b]
# 
============================================================
--- packages/python/python-pydirectfb/fix-directfb-detection.patch	f25fa2882b342ba3de9b944959b575df150dfd5b
+++ packages/python/python-pydirectfb/fix-directfb-detection.patch	f25fa2882b342ba3de9b944959b575df150dfd5b
@@ -0,0 +1,16 @@
+Index: pydirectfb/setup.py
+===================================================================
+--- pydirectfb.orig/setup.py
++++ pydirectfb/setup.py
+@@ -11,9 +11,10 @@
+     Check dependencies add add the flags to include_dirs, library_dirs and
+     libraries. The basic logic is taken from pygame.
+     """
+-    command = name + '-config --version --cflags --libs 2>/dev/null'
++    command = 'pkg-config %s --modversion --cflags --libs 2>/dev/null' % name
+     try:
+         config = os.popen(command).readlines()
++        print config
+         if len(config) == 0:
+             raise ValueError, 'command not found'
+         flags  = (' '.join(config[1:]) + ' ').split()


#
# mt diff -rcb2356de53f19e13c8306f4976bcf0f1b23b36e0 -re033232db3b41547193f4f62c8dc41bc4fb6021d
#
# 
# 
# patch "classes/rootfs_deb.bbclass"
#  from [a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922]
#    to [a11a09e4cbc92351c6a2152d90f32d639e23ee76]
# 
# patch "packages/curl/curl_7.16.4.bb"
#  from [96043638b03e8381c2d6e87633f13d8b69ae7213]
#    to [9f422993011a8a54e5050ac333fe5e07a7112e3d]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [1887d8e703285a0665b7a07c3d4c98e2165f30ee]
#    to [093b78dbcd548a0f00e99d0e61927ec61afc124b]
# 
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
#  from [a64e90095f6442e2dfb62961b3a54918c8c17519]
#    to [df64576fea94c73841caa9d194cca699ddf9575e]
# 
# patch "packages/zaurus-updater/zaurus-updater.bb"
#  from [c2bc580c5af6e6a1a1fa2ed9220455a8ca8c55f8]
#    to [cf372a56d0952ca445d801dd6b169d120224b6f2]
# 
============================================================
--- classes/rootfs_deb.bbclass	a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922
+++ classes/rootfs_deb.bbclass	a11a09e4cbc92351c6a2152d90f32d639e23ee76
@@ -10,8 +10,12 @@ fakeroot rootfs_deb_do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
 
+	mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
+
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
+	> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
+	> ${STAGING_ETCDIR_NATIVE}/apt/preferences
 	> ${IMAGE_ROOTFS}/var/dpkg/status
 	> ${IMAGE_ROOTFS}/var/dpkg/available
 	# > ${STAGING_DIR}/var/dpkg/status
@@ -36,9 +40,9 @@ fakeroot rootfs_deb_do_rootfs () {
 		priority=$(expr $priority + 5)
 	done
 
-	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
+	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
 
-	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
+	cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
 		| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
 		> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
============================================================
--- packages/curl/curl_7.16.4.bb	96043638b03e8381c2d6e87633f13d8b69ae7213
+++ packages/curl/curl_7.16.4.bb	9f422993011a8a54e5050ac333fe5e07a7112e3d
@@ -1,8 +1,8 @@ SECTION = "console/network"
 DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 S = "${WORKDIR}/curl-${PV}"
@@ -13,7 +13,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LI
                 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
                 --without-ssl \
 		--with-random=/dev/urandom \
-		--without-idn \
+		--without-libidn \
 		--enable-crypto-auth \
 		"
 
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	1887d8e703285a0665b7a07c3d4c98e2165f30ee
+++ packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	093b78dbcd548a0f00e99d0e61927ec61afc124b
@@ -1,12 +1,12 @@ DEPENDS = "libfakekey expat libxft gtk+ 
 DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
-RCONFLICTS = matchbox-keyboard
-RPROVIDES_${PN} = matchbox-keyboard
+RCONFLICTS_${PN} = "matchbox-keyboard"
+RPROVIDES_${PN} = "matchbox-keyboard"
 #DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
 	file://smallscreen-fontsize.patch;patch=1 \
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh	a64e90095f6442e2dfb62961b3a54918c8c17519
+++ packages/zaurus-updater/zaurus-updater/updater.sh	df64576fea94c73841caa9d194cca699ddf9575e
@@ -375,9 +375,6 @@ done
     esac
 done
 
-# starting shell to test -- remove this from final release
-/bin/sh
-
 # reboot
 exit 0
 
============================================================
--- packages/zaurus-updater/zaurus-updater.bb	c2bc580c5af6e6a1a1fa2ed9220455a8ca8c55f8
+++ packages/zaurus-updater/zaurus-updater.bb	cf372a56d0952ca445d801dd6b169d120224b6f2
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r17"
+PR = "r18"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"