From 8e341a6b390098df2685c8a469fd6bfc3163e442 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Fri, 20 May 2011 14:57:48 -0700
Subject: update-alternatives-dpkg: Update to dpkg base 1.15.8.7

[YOCTO #1062]

Due to failing fetch updated recipe and SRC_URI to use .bz2,

(From OE-Core rev: 87cf2da6373676293f2fdaaebbacc6890235368d)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../update-alternatives/update-alternatives-dpkg.inc         | 12 ++++++++++--
 .../update-alternatives/update-alternatives-dpkg_1.13.22.bb  |  7 -------
 .../update-alternatives/update-alternatives-dpkg_1.15.8.7.bb |  8 ++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
 create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb

diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
index 9b53df8725..f7f9ae979d 100644
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
@@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
 time."
 LICENSE = "GPL"
 SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
-PR = "r2"
+INC_PR = "r2"
+
+inherit gettext
 
 do_patch () {
     cat ${S}/scripts/update-alternatives.pl | \
@@ -32,4 +34,10 @@ do_install () {
     install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
 }
 
+PROVIDES += "virtual/update-alternatives"
+RPROVIDES_${PN} += "update-alternatives"
+EXTRA_RDEPENDS = "perl dpkg"
+EXTRA_RDEPENDS_virtclass-native = ""
+RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
+
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
deleted file mode 100644
index 5d38d5d36f..0000000000
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require update-alternatives-dpkg.inc
-
-PROVIDES += "virtual/update-alternatives"
-RPROVIDES_${PN} += "update-alternatives"
-EXTRA_RDEPENDS = "perl dpkg"
-EXTRA_RDEPENDS_virtclass-native = ""
-RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
new file mode 100644
index 0000000000..5443122952
--- /dev/null
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
@@ -0,0 +1,8 @@
+require update-alternatives-dpkg.inc
+
+PR = "${INC_PR}.0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
+SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
-- 
cgit v1.2.3-54-g00ecf