10 files changed, 16 insertions, 17 deletions

diff --git a/meta/packages/quilt/quilt-native.inc b/meta/packages/quilt/quilt-native.inc
index 0eeaa87e1c..7efea0213d 100644
--- a/meta/packages/quilt/quilt-native.inc
+++ b/meta/packages/quilt/quilt-native.inc
@@ -1,4 +1,4 @@
-SRC_URI_append_build-darwin = "?   file://non-gnu.patch;patch=1 "
+SRC_URI_append_build-darwin = "?   file://non-gnu.patch "
 RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
 
 INHIBIT_AUTOTOOLS_DEPS = "1"
diff --git a/meta/packages/quilt/quilt-native_0.47.bb b/meta/packages/quilt/quilt-native_0.47.bb
deleted file mode 100644
index b6fefce9cc..0000000000
--- a/meta/packages/quilt/quilt-native_0.47.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require quilt_${PV}.inc
-require quilt-native.inc
-
-PR = "r2"
\ No newline at end of file
diff --git a/meta/packages/quilt/quilt-native_0.48.bb b/meta/packages/quilt/quilt-native_0.48.bb
new file mode 100644
index 0000000000..d1dd57619a
--- /dev/null
+++ b/meta/packages/quilt/quilt-native_0.48.bb
@@ -0,0 +1,4 @@
+require quilt.inc
+require quilt-native.inc
+
+PR = "r0"
diff --git a/meta/packages/quilt/quilt.inc b/meta/packages/quilt/quilt.inc
index 944990cd95..e5e0a4feca 100644
--- a/meta/packages/quilt/quilt.inc
+++ b/meta/packages/quilt/quilt.inc
@@ -1,9 +1,11 @@
 DESCRIPTION = "Tool to work with series of patches."
 HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/"
 SECTION = "devel"
-LICENSE = "GPL"
+LICENSE = "GPLv2"
+LIC_CHKSUM_FILES = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz "
+SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
+        file://install.patch"
 
 inherit autotools
 
diff --git a/meta/packages/quilt/quilt-0.47/aclocal.patch b/meta/packages/quilt/quilt/aclocal.patch
index 15b174c6d8..15b174c6d8 100644
--- a/meta/packages/quilt/quilt-0.47/aclocal.patch
+++ b/meta/packages/quilt/quilt/aclocal.patch
diff --git a/meta/packages/quilt/quilt-0.47/install.patch b/meta/packages/quilt/quilt/install.patch
index 0b1e58d021..0b1e58d021 100644
--- a/meta/packages/quilt/quilt-0.47/install.patch
+++ b/meta/packages/quilt/quilt/install.patch
diff --git a/meta/packages/quilt/quilt-0.47/non-gnu.patch b/meta/packages/quilt/quilt/non-gnu.patch
index c1cbfb3983..c1cbfb3983 100644
--- a/meta/packages/quilt/quilt-0.47/non-gnu.patch
+++ b/meta/packages/quilt/quilt/non-gnu.patch
diff --git a/meta/packages/quilt/quilt_0.47.bb b/meta/packages/quilt/quilt_0.47.bb
deleted file mode 100644
index 67524316d8..0000000000
--- a/meta/packages/quilt/quilt_0.47.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require quilt_${PV}.inc
-
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-SRC_URI += "file://aclocal.patch;patch=1"
-PR = "r1"
-
-inherit gettext
diff --git a/meta/packages/quilt/quilt_0.47.inc b/meta/packages/quilt/quilt_0.47.inc
deleted file mode 100644
index bf6267b56c..0000000000
--- a/meta/packages/quilt/quilt_0.47.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require quilt.inc
-
-SRC_URI += "file://install.patch;patch=1"
diff --git a/meta/packages/quilt/quilt_0.48.bb b/meta/packages/quilt/quilt_0.48.bb
new file mode 100644
index 0000000000..5db67b24a1
--- /dev/null
+++ b/meta/packages/quilt/quilt_0.48.bb
@@ -0,0 +1,7 @@
+require quilt.inc
+
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+PR = "r0"
+SRC_URI += "file://aclocal.patch"
+
+inherit gettext