Merge branch 'master' into sourcev3

ChangeLog

@@ -1,3 +1,17 @@
+2008-02-20  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Changelog.pm (parse_changelog): Fallback
+	into /usr/lib/dpkg/parsechangelog to find changelog parser
+	in case $dpkglibdir points to another directory (for example
+	when DPKG_DATADIR is manually set).
+
+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

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).

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
 

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

man/ChangeLog

@@ -1,3 +1,10 @@
+2008-02-19  Frank Lichtenheld  <djpig@debian.org>
+
+	* dpkg-source.1: Fix documentation of
+	-sk and -sp. The directory with the
+	unpacked original source will be removed,
+	not the tarball.
+
 2008-02-17  Frank Lichtenheld  <djpig@debian.org>
 
 	* dpkg-architecture.1: Document the files

man/dpkg-source.1

@@ -190,12 +190,15 @@ a VCS, these options do not make sense, and will be ignored.
 Specifies to expect the original source as a tarfile, by default
 .IB package _ upstream-version .orig.tar. extension \fR.
 It will leave this original source in place as a tarfile, or copy it
-to the current directory if it isn't already there.
+to the current directory if it isn't already there. The
+tarball will be unpacked into 
+.IB directory .orig
+for the generation of the diff.
 .TP
 .B \-sp
 Like
 .B \-sk
-but will remove that tarball again afterwards.
+but will remove the directory again afterwards.
 .TP
 .B \-su
 Specifies that the original source is expected as a directory, by

scripts/Dpkg/Changelog.pm

@@ -725,7 +725,8 @@ it's passed as the parameter that follows.
 sub parse_changelog {
     my (%options) = @_;
     my @parserpath = ("/usr/local/lib/dpkg/parsechangelog",
-                      "$dpkglibdir/parsechangelog");
+                      "$dpkglibdir/parsechangelog",
+                      "/usr/lib/dpkg/parsechangelog");
     my $format = "debian";
     my $changelogfile = "debian/changelog";
     my $force = 0;