From d920890220ba50ac85a5b008ee64cd4d312ac469 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Nov 2006 09:07:55 +0000
Subject: dpkg: sync with poky poky rev 696: "Add dpkg, modified from upstream
 oe." poky rev 728: "Sync up.. all the deb/dpkg changes which I have locally
 are now in svn." poky rev 843: "enable noman.patch to avoid building man
 directory (results in significant speedup)" poky rev 844: "move noman.patch
 inclusion from dpkg.inc to dpkg_1.13.22.bb"

---
 packages/dpkg/dpkg-native_1.13.22.bb | 2 +-
 packages/dpkg/dpkg.inc               | 7 ++++---
 packages/dpkg/dpkg_1.13.22.bb        | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'packages/dpkg')

diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb
index d5f439b871..67e9306de6 100644
--- a/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r0"
+PR = "r1"
 DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc
index fb82fa420a..90173aa55b 100644
--- a/packages/dpkg/dpkg.inc
+++ b/packages/dpkg/dpkg.inc
@@ -1,13 +1,14 @@
 DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
-DEPENDS = "ncurses zlib"
-DEPENDS_${PN} += "update-alternatives"
 
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
+           file://noupdalt.patch;patch=1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 
+RDEPENDS_${PN} += "update-alternatives"
+
 PARALLEL_MAKE = ""
 
 inherit autotools gettext
diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb
index fd97f9fc6e..deccb32827 100644
--- a/packages/dpkg/dpkg_1.13.22.bb
+++ b/packages/dpkg/dpkg_1.13.22.bb
@@ -1,6 +1,7 @@
 require dpkg.inc
 PR = "r0"
 DEPENDS += "ncurses zlib bzip2"
+SRC_URI += "file://noman.patch;patch=1"
 
 EXTRA_OECONF = "--without-static-progs \
 		--without-dselect \
-- 
cgit v1.2.3