Link dselect against libncursesw

* m4/libs.m4 (DPKG_LIB_CURSES): Use libncursesw if available.
* debian/control: Change build-dependency from libncurses5-dev
to libncursesw5-dev.

diff --git a/ChangeLog b/ChangeLog
index 528b4853166dc33027857343dbfb425efad3c6f3..92a2adb16828052264dfac6c7b422bb3ebc8d151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-19  Frank Lichtenheld  <djpig@debian.org>
+
+       * m4/libs.m4 (DPKG_LIB_CURSES): Use libncursesw if
+       available.
+       * debian/control: Change build-dependency from
+       libncurses5-dev to libncursesw5-dev.
+
 2008-02-17  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/Dpkg.pm: Allow overriding $pkgdatadir

diff --git a/debian/changelog b/debian/changelog
index a5c48bc463c5f0b5f1982b2c69d10b1d166ad596..4de797852e63ab4ba792f7fba45ff13238e4a0a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ dpkg (1.14.17) UNRELEASED; urgency=low
   * Add support for use of SHA1 and SHA256 checksums in .dsc and
     .changes files. Information will be available in Checksums-Sha{1,256}
     fields. .changes format version increased to 1.8.
+  * Link dselect against libncursesw. Closes: #466321
 
   [ Updated dpkg translations ]
   * Korean (Changwoo Ryu).

diff --git a/debian/control b/debian/control
index 932679bdc97ec267cc5f4f03086c54a9042cf79c..8393bf44d780777fe29c49a7bf3a18b790d39f7e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
 Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.23),
- libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
+ libncursesw5-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
  libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libtimedate-perl, libio-string-perl
 

diff --git a/m4/libs.m4 b/m4/libs.m4
index 1bb1cea6c13285656803a6163606ee0a23d957a3..1b3cb246cfa3b6ede86400f874d78f706eb69b80 100644 (file)
--- a/m4/libs.m4
+++ b/m4/libs.m4
@@ -93,9 +93,10 @@ fi
 # Check for curses library.
 AC_DEFUN([DPKG_LIB_CURSES],
 [AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl
-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_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])])])])
 ])# DPKG_LIB_CURSES
 
 # DPKG_LIB_SSD