Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

9 files changed, 17 insertions, 342 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 1d1c5ba14c2e..892917366ee6 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.130 2010/04/15 21:06:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.131 2010/04/21 15:18:30 jer Exp $
+
+*dpkg-1.15.7 (21 Apr 2010)
+
+  21 Apr 2010; Jeroen Roovers <jer@gentoo.org> -dpkg-1.15.2.ebuild,
+  -dpkg-1.15.5.5.ebuild, -dpkg-1.15.5.6.ebuild, -dpkg-1.15.5.6-r1.ebuild,
+  -files/dpkg-1.15.5-nls.patch, -files/dpkg-1.15.5-unicode.patch,
+  -dpkg-1.15.6.ebuild, +dpkg-1.15.7.ebuild:
+  Version bump.
 
   15 Apr 2010; Markus Meier <maekke@gentoo.org> dpkg-1.15.6.1.ebuild:
   amd64 stable, bug #309633
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index fb97c08bd7b6..eabf2982e9a6 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,27 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dpkg-1.15.1-nls.patch 625 RMD160 f5db7dff31d1708be5d38c0849e4a39e278536ae SHA1 751bb464b95ca32726532939c249cdb82fda35b5 SHA256 2e1bb1939c29870d71ae4f93ed572db7dffec31d3887cfe1e3047f8ec0b0f5fc
-AUX dpkg-1.15.5-nls.patch 576 RMD160 23c515eb0d4411abe67f545f01d38c62d8b455cc SHA1 56292d9b015a21fb26e647c9ce355cce85feeff0 SHA256 0d6d9281098bb68a649ae295ccae888ba849e5083d8a6d7c8b2d21d0a8c69bfd
-AUX dpkg-1.15.5-unicode.patch 2715 RMD160 831b2637348a4da62f0ae99429cc32f50ff82def SHA1 5d4149c10a86b124e1cdb20c96a3895feb471cdf SHA256 b463f0de1947cb107b656e73dade0a61717998ae7f1de9ab3f6a0b6b06d5e134
 AUX dpkg-1.15.5.6-bootstrap.patch 1067 RMD160 9fe0761df7192424a5fb28de81761f478219e5fb SHA1 ec90b81e0bbf078e95732229afac5fd0943f3b38 SHA256 4144c9a1ae1d157c09418106f0f84a61251e3564f3a90cbe0506db669992646c
-DIST dpkg_1.15.2.tar.gz 7049986 RMD160 21556b88f9b5ba809525b27f94df99d96bdfd37e SHA1 e73a709f80454fc56e2d31dc28230f783661bb93 SHA256 ec92968f6a7fdfeddb4cee5bd177f03b1dd99ec2fe7ea0b6a2e8d4cbbfee1a74
-DIST dpkg_1.15.5.5.tar.bz2 4682843 RMD160 121751ffffe2780ff104db9c1174320330669e4c SHA1 ca6dcc374f62dc03fa795be4337d2c416016cfd8 SHA256 9929db9c3615df97630e3c2c381209ba77c88b2f2b47b1fcb2933f07e2202a07
-DIST dpkg_1.15.5.6.tar.bz2 4642507 RMD160 dccb8d81f41688486303c5d9de147898b9cf1c8e SHA1 340af57cc79ffe17068d3a483ad97a57d27016b9 SHA256 f3e526deff4c9e0fad53a283add6a6f553d59c62274c1fd02cbb240090114d9b
 DIST dpkg_1.15.6.1.tar.bz2 4841958 RMD160 f69942f73c450fab16df999ea11567dd90830c4a SHA1 098fe2e4b1f2898529519bf0876c849811ca17d9 SHA256 83194eecaba9cc2e609c3f0bc204f5e13b37b6c5c6ffc11a5f7382e542091213
-DIST dpkg_1.15.6.tar.bz2 4845122 RMD160 dcaee7a92ae13e03b2db28d7565216355d9019a1 SHA1 8eeac057c2f86768c941fb49d8148bff46b3390a SHA256 0c942d4b556aea1517761ae937518d2de19692b494987653eca9c3316e3d2304
-EBUILD dpkg-1.15.2.ebuild 1486 RMD160 07cfabb8729e9d7e024c5605e2818eebce031c3f SHA1 2ee7d55330c0d453abb6300428909871a2919ee3 SHA256 09226ccf63ac579c3b52419f5bcf0ee854f2cd3a24b29487c9eaa5b7b2e5ab5a
-EBUILD dpkg-1.15.5.5.ebuild 1657 RMD160 2bc0c9486eb0dbab4d5ac4d4db414822c2a83d08 SHA1 9c8e30450f70a6761e461fb0a55664d5493203b1 SHA256 d8941c1b5abc2cdc0dc0a3a0845e99dd86bf86f8d5eb98cfaf220979633f95aa
-EBUILD dpkg-1.15.5.6-r1.ebuild 2057 RMD160 d5f19fabe5759eaf378ce9d627dfe2443e3fc622 SHA1 d213c3a43bc37305f26eb58da1f496bca19536f0 SHA256 b6e7d60085cbed2a271a0ca97d5f9a0e30f5fa290d5d5e1ad2364c74a2152890
-EBUILD dpkg-1.15.5.6.ebuild 1667 RMD160 370ee9024598ab486bb9b0c924644cd73fcbbf5e SHA1 f25f1d553a39c546d9a20fcf843223b3c68c5b8f SHA256 7571e53e0ced6ebbdda2c108a338ed5c8b421c2c217f4d55b4168a22914ff1b1
+DIST dpkg_1.15.7.tar.bz2 4872332 RMD160 62c8cfaacee32faf78bd49e20d0b208e6a2567c3 SHA1 fdf14a74370fb9daac4a67d703f6e60c20eaec51 SHA256 f8d0a779361f3fd7f89a138cd632a4ab47f62ca1ccd0f393f2e81be899605e4f
 EBUILD dpkg-1.15.6.1.ebuild 2386 RMD160 b436d9cd306bdafa6748d62f64774ff5eb5689e0 SHA1 b68241a1fa9d2519f695b50aa2e37122fb417d1c SHA256 b11ce24e01ca2251ad1b741f230aaad5a2559e3fabcd6f6ab823b1ba359f5c79
-EBUILD dpkg-1.15.6.ebuild 2345 RMD160 18f70af4747549213a6a462024c0f228f95aaa58 SHA1 3d197b90e1fbee789730735569fbbaac00afba58 SHA256 f4dbc5398661b28382f8e7eb3da10b82a931032f4a49a795d2f370f6dfa2a827
-MISC ChangeLog 17549 RMD160 f6fd67a0083897dd4b03a75abd4cb54a1dbec678 SHA1 8bbd11252a11b8ebe1b7b1048b83c152f260ba75 SHA256 d1e396cc512aa106560f3661ff72bc9ac904aa2e74947c312c54850d3080dcec
+EBUILD dpkg-1.15.7.ebuild 2390 RMD160 6556da32c80dcda7f60a6b527b9bf7d696e75c2b SHA1 3b89ac73e584ff89e0d86b8a9dc326ffde05dbdb SHA256 e853747c225a9a7f2464ba1c2698d16271392560ce1b689bdd7691f7f422d6eb
+MISC ChangeLog 17843 RMD160 0b776fc9a63dd0e4c9e00a31a6eb9fc567079284 SHA1 de78943761ef0265fd1bcbdb5e0efb88f07f1f32 SHA256 e0eeda61de23c2e3ee6398d19563bca7dd3b4cce1487dcfc7032e039fbb08ed6
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvHf50ACgkQkKaRLQcq0GJPKACghqwbOGPEaxlB99n7Ub2T5EPk
-TjsAn26E6spzsyk6PnlDYKXTyYcNlJlY
-=e8RP
------END PGP SIGNATURE-----
diff --git a/app-arch/dpkg/dpkg-1.15.2.ebuild b/app-arch/dpkg/dpkg-1.15.2.ebuild
deleted file mode 100644
index 3bf7bbd24d01..000000000000
--- a/app-arch/dpkg/dpkg-1.15.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.2.ebuild,v 1.12 2009/12/02 18:43:18 jer Exp $
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc s390 sh sparc x86"
-IUSE="bzip2 nls test unicode zlib"
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	nls? ( app-text/po4a )
-	test? ( dev-perl/Test-Pod dev-perl/IO-String )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.15.1-nls.patch #192819
-	if ! use unicode ; then
-		sed -i "s:ncursesw/::" dselect/{Makefile.in,dselect.h,main.cc} #217046
-		export ac_cv_lib_ncursesw_initscr=no
-	fi
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with bzip2 bz2) \
-		$(use_enable nls) \
-		$(use_with zlib) \
-		--without-selinux \
-		--without-start-stop-daemon \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	rm "${D}"/usr/sbin/install-info
-	rm "${D}"/usr/share/man/man?/install-info.?
-	dodoc ChangeLog INSTALL THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
diff --git a/app-arch/dpkg/dpkg-1.15.5.5.ebuild b/app-arch/dpkg/dpkg-1.15.5.5.ebuild
deleted file mode 100644
index 42d63217e842..000000000000
--- a/app-arch/dpkg/dpkg-1.15.5.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.5.ebuild,v 1.1 2009/12/23 00:16:18 jer Exp $
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 nls test unicode zlib"
-
-LANGS="de es fr hu ja pl pt_BR ru sv"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	nls? ( app-text/po4a )
-	test? ( dev-perl/Test-Pod dev-perl/IO-String )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.15.5-nls.patch
-	epatch "${FILESDIR}"/${PN}-1.15.5-unicode.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with bzip2 bz2) \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		$(use_with zlib) \
-		--without-selinux \
-		--without-start-stop-daemon \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install || die "emake install failed"
-	rm "${D}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog INSTALL THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
diff --git a/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild b/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild
deleted file mode 100644
index 63d8276b5b72..000000000000
--- a/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild,v 1.2 2010/02/19 22:18:01 abcd Exp $
-
-EAPI=3
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 nls test unicode zlib"
-
-LANGS="de es fr hu ja pl pt_BR ru sv"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	nls? ( app-text/po4a )
-	test? ( dev-perl/Test-Pod dev-perl/IO-String )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.15.5-nls.patch
-	epatch "${FILESDIR}"/${PN}-1.15.5-unicode.patch
-	epatch "${FILESDIR}"/${PN}-1.15.5.6-bootstrap.patch
-
-	# don't mess with linker optimisation, respect user's flags (don't break!)
-	sed -i -e '/DPKG_LINKER_OPTIMISATIONS/d' configure.ac || die
-
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with bzip2 bz2) \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		$(use_with zlib) \
-		--without-selinux \
-		--without-start-stop-daemon
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install || die "emake install failed"
-	rm "${ED}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog INSTALL THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
diff --git a/app-arch/dpkg/dpkg-1.15.5.6.ebuild b/app-arch/dpkg/dpkg-1.15.5.6.ebuild
deleted file mode 100644
index af3c4a55de1b..000000000000
--- a/app-arch/dpkg/dpkg-1.15.5.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6.ebuild,v 1.2 2010/01/10 20:21:14 vapier Exp $
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 nls test unicode zlib"
-
-LANGS="de es fr hu ja pl pt_BR ru sv"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	nls? ( app-text/po4a )
-	test? ( dev-perl/Test-Pod dev-perl/IO-String )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.15.5-nls.patch
-	epatch "${FILESDIR}"/${PN}-1.15.5-unicode.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with bzip2 bz2) \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		$(use_with zlib) \
-		--without-selinux \
-		--without-start-stop-daemon \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install || die "emake install failed"
-	rm "${D}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog INSTALL THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
diff --git a/app-arch/dpkg/dpkg-1.15.6.ebuild b/app-arch/dpkg/dpkg-1.15.7.ebuild
index 2fca3376ec75..457ca767f34b 100644
--- a/app-arch/dpkg/dpkg-1.15.6.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.6.ebuild,v 1.5 2010/03/24 19:30:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.7.ebuild,v 1.1 2010/04/21 15:18:31 jer Exp $
 
 EAPI=3
 
@@ -41,9 +41,10 @@ src_prepare() {
 	sed -i -e '1c\#!'"${BASH}" get-version || die
 
 	# bug 310847
-	if [[ "${PV}" = "1.15.6" ]]; then
-		sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d'
-		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d'
+	if [[ "${PV}" = "1.15.7" ]]; then
+		sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d' || die "sed failed"
+		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d' \
+			|| die "sed failed"
 	fi
 
 	eautoreconf
diff --git a/app-arch/dpkg/files/dpkg-1.15.5-nls.patch b/app-arch/dpkg/files/dpkg-1.15.5-nls.patch
deleted file mode 100644
index 88e7b79e3d55..000000000000
--- a/app-arch/dpkg/files/dpkg-1.15.5-nls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp dpkg-1.15.5.2.orig/man/Makefile.am dpkg-1.15.5.2/man/Makefile.am
---- dpkg-1.15.5.2.orig/man/Makefile.am	2009-11-18 07:28:44.000000000 +0000
-+++ dpkg-1.15.5.2/man/Makefile.am	2009-11-21 07:14:37.000000000 +0000
-@@ -36,7 +36,7 @@ update-po:
- 	$(PO4A) $(PO4A_BUILD_OPTS) --force po/po4a.cfg
- 
- # Extract the list of languages from the po4a config file.
--LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
-+LINGUAS := `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
- 
- install-data-local: install-data-local-@USE_PO4A@
- 
diff --git a/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch b/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch
deleted file mode 100644
index 1d257c036f1f..000000000000
--- a/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naurp dpkg-1.15.5.2.orig/m4/dpkg-libs.m4 dpkg-1.15.5.2/m4/dpkg-libs.m4
---- dpkg-1.15.5.2.orig/m4/dpkg-libs.m4	2009-11-21 09:40:57.000000000 +0000
-+++ dpkg-1.15.5.2/m4/dpkg-libs.m4	2009-11-21 09:37:55.000000000 +0000
-@@ -100,14 +100,23 @@ fi
- # DPKG_LIB_CURSES
- # ---------------
- # Check for curses library.
--AC_DEFUN([DPKG_LIB_CURSES],
--[AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl
--AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h \
--                  ncursesw/term.h ncurses/term.h term.h])
--AC_CHECK_LIB([ncursesw], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"],
--	[AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"],
-+AC_DEFUN([DPKG_LIB_CURSES], [
-+AC_REQUIRE([AM_UNICODE])
-+AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl
-+if test "x$USE_UNICODE" = "xyes"; then
-+	AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h \
-+	                  ncursesw/term.h ncurses/term.h term.h])
-+	AC_CHECK_LIB([ncursesw], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"],
-+		[AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"],
-+			[AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"],
-+				[AC_MSG_WARN([no curses library found])])])])
-+else
-+	AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h curses.h \
-+	                  ncurses/term.h term.h])
-+	AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"],
- 		[AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"],
--			[AC_MSG_WARN([no curses library found])])])])
-+			[AC_MSG_WARN([no curses library found])])])
-+fi
- ])# DPKG_LIB_CURSES
- 
- # DPKG_LIB_SSD
-diff -Naurp dpkg-1.15.5.2.orig/m4/unicode.m4 dpkg-1.15.5.2/m4/unicode.m4
---- dpkg-1.15.5.2.orig/m4/unicode.m4	1970-01-01 00:00:00.000000000 +0000
-+++ dpkg-1.15.5.2/m4/unicode.m4	2009-11-21 09:46:53.000000000 +0000
-@@ -0,0 +1,21 @@
-+# unicode.m4
-+dnl Copyright (C) 2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl Author:
-+dnl   Yuri Vasilevski <yvasilev@gentoo.org>, 2009
-+
-+AC_PREREQ(2.50)
-+
-+AC_DEFUN([AM_UNICODE],
-+[
-+  AC_MSG_CHECKING([whether UNICODE is requested])
-+  dnl Default: UNICODE is enabled
-+  AC_ARG_ENABLE(unicode,
-+    [  --disable-unicode       do not use Unicode (wide characters) support],
-+    USE_UNICODE=$enableval, USE_UNICODE=yes)
-+  AC_MSG_RESULT($USE_UNICODE)
-+  AC_SUBST(USE_UNICODE)
-+])