dropbear: apply scp-argument-fix.patch to version 0.49 only. reorder some fields according to Style Guide. bump PR.

* commit and cosmetic changes by Laibsch

4 files changed, 7 insertions, 6 deletions

diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb
index df2c2dc26f..c947cf0e74 100644
--- a/packages/dropbear/dropbear-early_1.0.bb
+++ b/packages/dropbear/dropbear-early_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
 SECTION = "devel"
-PR = "r2"
 RDEPENDS = "dropbear"
+PR = "r3"
 
 SRC_URI = "file://dropbear-early"
 
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index 00e5eec2ce..ebe0c1ea9c 100644
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -10,7 +10,6 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
 	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://fix-2kb-keys.patch;patch=1 \
-	   file://scp-argument-fix.patch;patch=1 \
 	   file://allow-nopw.patch \
 	   file://init"
 
diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb
index 0ed386ca0c..bf2f2add60 100644
--- a/packages/dropbear/dropbear_0.49.bb
+++ b/packages/dropbear/dropbear_0.49.bb
@@ -1,3 +1,5 @@
-PR = "r1"
-
 require dropbear.inc
+
+PR = "r2"
+
+SRC_URI += "file://scp-argument-fix.patch;patch=1"
diff --git a/packages/dropbear/dropbear_0.50.bb b/packages/dropbear/dropbear_0.50.bb
index 21d46ef59c..bd8f31cff6 100644
--- a/packages/dropbear/dropbear_0.50.bb
+++ b/packages/dropbear/dropbear_0.50.bb
@@ -1,6 +1,6 @@
-PR = "r0"
-
 require dropbear.inc
 
+PR = "r1"
+
 # testing
 DEFAULT_PREFERENCE = "-1"