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

8 files changed, 11 insertions, 11 deletions

diff --git a/recipes/evince/evince_0.5.2.bb b/recipes/evince/evince_0.5.2.bb
index 13823d47a2..3cda4a4d82 100644
--- a/recipes/evince/evince_0.5.2.bb
+++ b/recipes/evince/evince_0.5.2.bb
@@ -9,7 +9,7 @@ PR = "r2"
 inherit gnome pkgconfig
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/${PN}-${PV}.tar.bz2 \
-          file://more-no-doc.patch;patch=1"
+          file://more-no-doc.patch"
 
 EXTRA_OECONF = "--disable-tiff"
 
diff --git a/recipes/evince/evince_0.6.1.bb b/recipes/evince/evince_0.6.1.bb
index fa1639782c..50650a4b3b 100644
--- a/recipes/evince/evince_0.6.1.bb
+++ b/recipes/evince/evince_0.6.1.bb
@@ -9,7 +9,7 @@ PR = "r1"
 inherit gnome pkgconfig
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.6/${PN}-${PV}.tar.bz2 \
-          file://more-no-doc.patch;patch=1"
+          file://more-no-doc.patch"
 
 FILES_${PN} += "${datadir}/icons"
 
diff --git a/recipes/evince/evince_0.9.0.bb b/recipes/evince/evince_0.9.0.bb
index 3acc26748c..7d3ec11c38 100644
--- a/recipes/evince/evince_0.9.0.bb
+++ b/recipes/evince/evince_0.9.0.bb
@@ -9,8 +9,8 @@ PR = "r2"
 inherit gnome pkgconfig gtk-icon-cache
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
-           file://no-icon-theme.diff;patch=1;pnum=0 \
-           file://no-help-dir.patch;patch=1"
+           file://no-icon-theme.diff;striplevel=0 \
+           file://no-help-dir.patch"
 
 EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
 
diff --git a/recipes/evince/evince_0.9.2.bb b/recipes/evince/evince_0.9.2.bb
index b9ccf31ebd..d3487a0b34 100644
--- a/recipes/evince/evince_0.9.2.bb
+++ b/recipes/evince/evince_0.9.2.bb
@@ -9,8 +9,8 @@ PR = "r2"
 inherit gnome pkgconfig gtk-icon-cache
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \
-           file://no-icon-theme.diff;patch=1;pnum=0 \
-           file://no-help-dir.patch;patch=1"
+           file://no-icon-theme.diff;striplevel=0 \
+           file://no-help-dir.patch"
 
 EXTRA_OECONF = " --without-libgnome \
                  --disable-thumbnailer \
diff --git a/recipes/evince/evince_2.20.0.bb b/recipes/evince/evince_2.20.0.bb
index b652281252..aa50c75b04 100644
--- a/recipes/evince/evince_2.20.0.bb
+++ b/recipes/evince/evince_2.20.0.bb
@@ -8,8 +8,8 @@ PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += "file://no-icon-theme.diff;patch=1;pnum=0 \
-            file://no-help-dir.patch;patch=1"
+SRC_URI += "file://no-icon-theme.diff;striplevel=0 \
+            file://no-help-dir.patch"
 
 EXTRA_OECONF = " --without-libgnome \
                  --disable-thumbnailer \
diff --git a/recipes/evince/evince_2.23.4.bb b/recipes/evince/evince_2.23.4.bb
index d95d897198..052e8cac38 100644
--- a/recipes/evince/evince_2.23.4.bb
+++ b/recipes/evince/evince_2.23.4.bb
@@ -8,7 +8,7 @@ PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += " file://no-help-dir.patch;patch=1"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = " --without-libgnome \
                  --disable-thumbnailer \
diff --git a/recipes/evince/evince_2.24.1.bb b/recipes/evince/evince_2.24.1.bb
index ea75132c0d..d9d3389c3c 100644
--- a/recipes/evince/evince_2.24.1.bb
+++ b/recipes/evince/evince_2.24.1.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += " file://no-help-dir.patch;patch=1"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = "  \
                  --enable-thumbnailer \
diff --git a/recipes/evince/evince_2.26.2.bb b/recipes/evince/evince_2.26.2.bb
index 18c8933eee..f3dcaceba2 100644
--- a/recipes/evince/evince_2.26.2.bb
+++ b/recipes/evince/evince_2.26.2.bb
@@ -6,7 +6,7 @@ RDEPENDS = "espgs gnome-icon-theme"
 
 inherit gnome pkgconfig gtk-icon-cache
 
-SRC_URI += " file://no-help-dir.patch;patch=1"
+SRC_URI += " file://no-help-dir.patch"
 
 EXTRA_OECONF = "  \
                  --enable-thumbnailer \