Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010

Conflicts:
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/openmoko-3rdparty/pisi_0.5.2.bb
	recipes/openmoko-3rdparty/pisi_0.5.3.bb
	recipes/openmoko-3rdparty/pisi_0.5.bb
	recipes/uclibc/uclibc_nptl.bb

9 files changed, 18 insertions, 18 deletions

diff --git a/recipes/rxvt-unicode/rxvt-unicode_4.8.bb b/recipes/rxvt-unicode/rxvt-unicode_4.8.bb
index a68e046c31..b246c567ac 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_4.8.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_4.8.bb
@@ -8,8 +8,8 @@ same time, including Xft fonts."
 PR = "r2"
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rxvt-unicode/rxvt-unicode_4.9.bb b/recipes/rxvt-unicode/rxvt-unicode_4.9.bb
index c63cad1204..bad822288b 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_4.9.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_4.9.bb
@@ -7,8 +7,8 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 
 inherit autotools update-alternatives
 
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.2.bb b/recipes/rxvt-unicode/rxvt-unicode_5.2.bb
index afc6ad805d..d125d37869 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.2.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.2.bb
@@ -7,7 +7,7 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
-	   file://signedchar.patch;patch=1"
+	   file://signedchar.patch"
 
 SRC_URI[md5sum] = "52664198e7c6a500dd9728b1a2c97e8a"
 SRC_URI[sha256sum] = "6ce00673bb9be8ed172c41c9246689916e358d331eb24aa05f5d89db4dd23c82"
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.3.bb b/recipes/rxvt-unicode/rxvt-unicode_5.3.bb
index a6ae3d95a7..7164e1c1bd 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.3.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.3.bb
@@ -7,8 +7,8 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 PR = "r2"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.4.bb b/recipes/rxvt-unicode/rxvt-unicode_5.4.bb
index bfc8e21a02..6c15eb1d9f 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.4.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.4.bb
@@ -7,8 +7,8 @@ output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
 LICENSE = "GPL"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 PR = "r2"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_5.6.bb b/recipes/rxvt-unicode/rxvt-unicode_5.6.bb
index fd3bd51673..5b9c3da6bb 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -11,8 +11,8 @@ FILES_${PN}-daemon = "${bindir}/rxvtd"
 FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch"
 PR = "r3"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_7.7.bb b/recipes/rxvt-unicode/rxvt-unicode_7.7.bb
index adf22d3ae6..e4879ae981 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_7.7.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_7.7.bb
@@ -11,8 +11,8 @@ FILES_${PN}-daemon = "${bindir}/rxvtd"
 FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-           file://xwc.patch;patch=1 \
-           file://signedchar.patch;patch=1"
+           file://xwc.patch \
+           file://signedchar.patch"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/rxvt-unicode/rxvt-unicode_7.9.bb b/recipes/rxvt-unicode/rxvt-unicode_7.9.bb
index 03edd8d447..329c3f0a0d 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_7.9.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_7.9.bb
@@ -11,8 +11,8 @@ FILES_${PN}-daemon = "${bindir}/rxvtd"
 FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-           file://xwc.patch;patch=1 \
-           file://signedchar.patch;patch=1"
+           file://xwc.patch \
+           file://signedchar.patch"
 PR = "r1"
 
 inherit autotools update-alternatives
diff --git a/recipes/rxvt-unicode/rxvt-unicode_cvs.bb b/recipes/rxvt-unicode/rxvt-unicode_cvs.bb
index 0ee35f78c8..67ba216ed2 100644
--- a/recipes/rxvt-unicode/rxvt-unicode_cvs.bb
+++ b/recipes/rxvt-unicode/rxvt-unicode_cvs.bb
@@ -8,9 +8,9 @@ same time, including Xft fonts."
 DEFAULT_PREFERENCE = "-1"
 LICENSE = "GPL"
 SRC_URI = "cvs://anonymous@cvs.schmorp.de/schmorpforge;module=rxvt-unicode;port=636 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1 \
-	   file://makefile.patch;patch=1"
+	   file://xwc.patch \
+	   file://signedchar.patch \
+	   file://makefile.patch"
 
 inherit autotools update-alternatives