From 24802986187d9fcce6ee4508df5916647d85059b Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 19 Feb 2008 22:46:36 +0100 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ debian/changelog | 1 + debian/control | 2 +- m4/libs.m4 | 7 ++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 528b4853..92a2adb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-19 Frank Lichtenheld + + * 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 * scripts/Dpkg.pm: Allow overriding $pkgdatadir diff --git a/debian/changelog b/debian/changelog index a5c48bc4..4de79785 100644 --- 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 932679bd..8393bf44 100644 --- 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 1bb1cea6..1b3cb246 100644 --- 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 -- 2.39.5