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

3 files changed, 17 insertions, 17 deletions

diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 3343b6fa71..bbe887476d 100644
--- a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -9,17 +9,17 @@ PV = "0.0+svnr${SRCPV}"
 PR = "r11"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
-	    file://smallscreen-fontsize.patch;patch=1 \
-        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-        file://4-Add-rendering-debug-logging.patch;patch=1 \
-        file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
-        file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
-        file://7-Newer-autotools.patch;patch=1 \
+	    file://smallscreen-fontsize.patch \
+        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch \
+        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch \
+        file://4-Add-rendering-debug-logging.patch \
+        file://5-Add-support-for-loading-multiple-independent-layouts.patch \
+        file://6-Add-layout-switch-key-to-all-layouts.patch \
+        file://7-Newer-autotools.patch \
 	    file://80matchboxkeyboard"
 
-SRC_URI_append_om-gta01 = " file://fic-gta01-font-size.patch;patch=1"
-SRC_URI_append_om-gta02 = " file://fic-gta01-font-size.patch;patch=1"
+SRC_URI_append_om-gta01 = " file://fic-gta01-font-size.patch"
+SRC_URI_append_om-gta02 = " file://fic-gta01-font-size.patch"
 
 S = "${WORKDIR}/matchbox-keyboard"
 
diff --git a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb
index dd820e656c..d3ea264e18 100644
--- a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -9,12 +9,12 @@ PV = "0.0+svnr${SRCPV}"
 PR ="r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-           file://smallscreen-fontsize.patch;patch=1 \
-           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-           file://4-Add-rendering-debug-logging.patch;patch=1 \
-           file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
-           file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
+           file://smallscreen-fontsize.patch \
+           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch \
+           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch \
+           file://4-Add-rendering-debug-logging.patch \
+           file://5-Add-support-for-loading-multiple-independent-layouts.patch \
+           file://6-Add-layout-switch-key-to-all-layouts.patch \
           "
 
 
diff --git a/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
index 2e51cb38bf..55497e971f 100644
--- a/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
+++ b/recipes/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
@@ -9,8 +9,8 @@ PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f"
 
 SRC_URI = "http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz \
 #git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \
-           file://auto-mkdir.patch;patch=1 \
-	   file://sanitize-desktop-file.patch;patch=1 \
+           file://auto-mkdir.patch \
+	   file://sanitize-desktop-file.patch \
 	   file://mboxkbd-layouts-gui.png"
 
 S = "${WORKDIR}/git"