[oe-commits] org.oe.dev merge of '9f8dec37506722f0949550fe1cb9c966bcac3ffc'

[rwhitby commit]

merge of '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
     and 'd7b4e8f0922d96a2e6925c4de33ef16e6ce376f0'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0c41f3612b1aad220f3804e0288528ad8eba750d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c41f3612b1aad220f3804e0288528ad8eba750d
Files:
1
packages/nano/nano-1.3.9
packages/nano/nano-2.0.6
packages/nano/nano_1.3.9.bb
packages/nano/nano_2.0.6.bb
packages/bluez/bluez-gnome_0.6.bb
packages/bluez/bluez-gnome_cvs.bb
packages/uclibc/uclibc_0.9.29.bb
Diffs:

#
# mt diff -r9f8dec37506722f0949550fe1cb9c966bcac3ffc -r0c41f3612b1aad220f3804e0288528ad8eba750d
#
# 
# no changes
# 


#
# mt diff -rd7b4e8f0922d96a2e6925c4de33ef16e6ce376f0 -r0c41f3612b1aad220f3804e0288528ad8eba750d
#
# 
# 
# rename "packages/nano/nano-1.3.9"
#     to "packages/nano/nano-2.0.6"
# 
# rename "packages/nano/nano_1.3.9.bb"
#     to "packages/nano/nano_2.0.6.bb"
# 
# patch "packages/bluez/bluez-gnome_0.6.bb"
#  from [3376b3dc47ddc8929f6f0da0aeca6ae5630a1469]
#    to [6841233421c5e08a0657919d990abdc76ffac9e7]
# 
# patch "packages/bluez/bluez-gnome_cvs.bb"
#  from [2450f7eec25de86cb99a2236017092de48cfcc70]
#    to [42803f40aaa448142b85aff6d1c1dc49cdcf1d4d]
# 
# patch "packages/nano/nano_2.0.6.bb"
#  from [7fc420ae1baef48a333d0d04e811791626b1d10d]
#    to [8b385a806eb9109631de3fe69a30bcf634b7b05f]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [9d71a5abb4d130c09cc18f7d6996c3bb64e7268d]
#    to [a27c318d0f522d9889e1763f32eb55a206cd9df2]
# 
============================================================
--- packages/bluez/bluez-gnome_0.6.bb	3376b3dc47ddc8929f6f0da0aeca6ae5630a1469
+++ packages/bluez/bluez-gnome_0.6.bb	6841233421c5e08a0657919d990abdc76ffac9e7
@@ -1,7 +1,7 @@ LICENSE = "GPL+LGPL"
 DESCRIPTION = "BLuetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
-DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex"
+DEPENDS = "dbus-glib gconf libnotify gtk+"
 
 SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
 
============================================================
--- packages/bluez/bluez-gnome_cvs.bb	2450f7eec25de86cb99a2236017092de48cfcc70
+++ packages/bluez/bluez-gnome_cvs.bb	42803f40aaa448142b85aff6d1c1dc49cdcf1d4d
@@ -1,7 +1,7 @@ LICENSE = "GPL+LGPL"
 DESCRIPTION = "BLuetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
-DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex"
+DEPENDS = "dbus-glib gconf libnotify gtk+"
 
 SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome"
 
============================================================
--- packages/nano/nano_1.3.9.bb	7fc420ae1baef48a333d0d04e811791626b1d10d
+++ packages/nano/nano_2.0.6.bb	8b385a806eb9109631de3fe69a30bcf634b7b05f
@@ -6,7 +6,7 @@ DEPENDS = "ncurses"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
 
-SRC_URI = "http://www.nano-editor.org/dist/v1.3/nano-${PV}.tar.gz \
+SRC_URI = "http://www.nano-editor.org/dist/v2.0/nano-${PV}.tar.gz \
            file://glib.m4"
 
 inherit autotools
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	9d71a5abb4d130c09cc18f7d6996c3bb64e7268d
+++ packages/uclibc/uclibc_0.9.29.bb	a27c318d0f522d9889e1763f32eb55a206cd9df2
@@ -14,6 +14,8 @@ SRC_URI += "file://uClibc.machine file:/
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 SRC_URI += "file://uClibc.machine file://uClibc.distro"
+# mmap-unsigned-shift_bugid1303.patch
+# http://uclibc.org/lists/uclibc-cvs/2007-May/011360.html;patch=1"
 
 #recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"