r556: * Depend on po-debconf, and I hope I can drop the debconf-utils dep soon.

     Closes: #163569
   * Removed debconf-utils build-dep. Have no idea why that was there.
   * dh_installman: Don't use extended section as section name for translated
     man pages, use only the numeric section as is done for regular man pages.
     Closes: #163534

diff --git a/debian/changelog b/debian/changelog
index 2ccd1ef9c6fa16b3cc12b880900a261f36d21cee..81b37007e14d2a42d5e1a606589ce8bd5a51e07e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debhelper (4.1.16) unstable; urgency=low
+
+  * Depend on po-debconf, and I hope I can drop the debconf-utils dep soon.
+    Closes: #163569
+  * Removed debconf-utils build-dep. Have no idea why that was there.
+  * dh_installman: Don't use extended section as section name for translated
+    man pages, use only the numeric section as is done for regular man pages.
+    Closes: #163534
+
+ -- Joey Hess <joeyh@debian.org>  Mon,  7 Oct 2002 11:49:37 -0400
+
 debhelper (4.1.15) unstable; urgency=low
 
   * dh_compress: Exclude .css files, to prevent broken links from html files,

diff --git a/debian/control b/debian/control
index 683756d69e7251c02d146df058eb3d6eb889bc8f..5825a2270391207bdddb86a5c833c743346352c4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@debian.org>
-Build-Depends-Indep: perl (>= 5.6.1), coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), debconf-utils (>= 1.1.1), dpkg-dev (>= 1.9.0)
+Build-Depends-Indep: perl (>= 5.6.1), coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), dpkg-dev (>= 1.9.0)
 Standards-Version: 3.5.7.0
 
 Package: debhelper
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), dpkg-dev (>= 1.7.0), html2text, debconf-utils (>= 1.1.1), binutils
+Depends: ${perl:Depends}, ${misc:Depends}, coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), dpkg-dev (>= 1.7.0), html2text, debconf-utils (>= 1.1.1), binutils, po-debconf
 Suggests: dh-make
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to

diff --git a/dh_installman b/dh_installman
index 402f4a94fb974919972e0cc6e7ada827bb4a88ff..3da08ccb0c79fcab1a0f02753104413aed6b231c 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -141,7 +141,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # redirect to appropriate directory, stripping the code.
                my ($langcode)=$basename=~m/.*\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
                if (defined $langcode && $langcode ne '') {
-                       $destdir="$tmp/usr/share/man/$langcode/man$section/";
+                       $destdir="$tmp/usr/share/man/$langcode/man$realsection/";
                        # Strip the language code from the instname.
                        $instname=~s/\.$langcode$//;
                }