Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

6 files changed, 6 insertions, 6 deletions

diff --git a/recipes/telepathy/empathy_0.1.bb b/recipes/telepathy/empathy_0.1.bb
index d8c488c882..7dcc29d1af 100644
--- a/recipes/telepathy/empathy_0.1.bb
+++ b/recipes/telepathy/empathy_0.1.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "telepathy-gabble"
 PR ="r1"
 
 SRC_URI = "http://projects.collabora.co.uk/~xclaesse/empathy-0.1.tar.gz \
-        file://no-gnome.diff;patch=1"
+        file://no-gnome.diff"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/telepathy/empathy_0.5.bb b/recipes/telepathy/empathy_0.5.bb
index 43b328b4ed..bc47e09cde 100644
--- a/recipes/telepathy/empathy_0.5.bb
+++ b/recipes/telepathy/empathy_0.5.bb
@@ -10,7 +10,7 @@ PR ="r1"
 inherit gnome
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \
-           file://no-gnome.diff;patch=1;pnum=0"
+           file://no-gnome.diff;striplevel=0"
 
 FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
         ${datadir}/dbus-1/services/*.service \
diff --git a/recipes/telepathy/empathy_2.28.2.bb b/recipes/telepathy/empathy_2.28.2.bb
index f5e498060c..0a838517de 100644
--- a/recipes/telepathy/empathy_2.28.2.bb
+++ b/recipes/telepathy/empathy_2.28.2.bb
@@ -10,7 +10,7 @@ RRECOMMENDS = "telepathy-gabble"
 
 inherit gnome
 
-SRC_URI += "file://fix-xml-threadbreakage.patch;patch=1"
+SRC_URI += "file://fix-xml-threadbreakage.patch"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/telepathy/libtelepathy_0.3.3.bb b/recipes/telepathy/libtelepathy_0.3.3.bb
index c013afb502..25567cf2c3 100644
--- a/recipes/telepathy/libtelepathy_0.3.3.bb
+++ b/recipes/telepathy/libtelepathy_0.3.3.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 PR = "r0"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
-           file://duplicate-header.patch;patch=1 \
+           file://duplicate-header.patch \
           "
 
 inherit autotools pkgconfig
diff --git a/recipes/telepathy/telepathy-inspector_0.5.0.bb b/recipes/telepathy/telepathy-inspector_0.5.0.bb
index 0ea9a8b29f..5064dad9c4 100644
--- a/recipes/telepathy/telepathy-inspector_0.5.0.bb
+++ b/recipes/telepathy/telepathy-inspector_0.5.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "glib-2.0 gtk+ libglade dbus-glib"
 LICENSE = "LGPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tapioca-voip/telepathy-inspector-0.5.0.tar.gz \
-           file://scons-workaround.patch;patch=1"
+           file://scons-workaround.patch"
 
 inherit scons
 
diff --git a/recipes/telepathy/telepathy-salut_0.3.4.bb b/recipes/telepathy/telepathy-salut_0.3.4.bb
index c9095864a1..1dac4507c6 100644
--- a/recipes/telepathy/telepathy-salut_0.3.4.bb
+++ b/recipes/telepathy/telepathy-salut_0.3.4.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 
 #salut.manager changes every release, don't copy it over blindly!
 SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \
-           file://keep-manager-file.diff;patch=1 \
+           file://keep-manager-file.diff \
 	   file://salut.manager"
 
 inherit autotools pkgconfig