debhelper no longer build-depends on man-db, to ease bootstrapping.

The man page recode is not necessary as the man pages are utf-8 already.

diff --git a/debian/changelog b/debian/changelog
index 1e32a1cf5d4a4f6fff474e58cfeb5f12a0afdc26..d634f5a6c81883720c423c27a2fc12db6a29e189 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (8.9.7) UNRELEASED; urgency=low
+
+  * debhelper no longer build-depends on man-db, to ease bootstrapping.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Aug 2011 20:18:01 -0400
+
 debhelper (8.9.6) unstable; urgency=low
 
   * dh_installlogcheck: Add support for --name. Closes: #639020

diff --git a/debian/control b/debian/control
index beea40f7b8cc7b609280a5a9f28de2a476c9ec9f..ec55b5c2cb2903ca8d4cb50164cdf40c4a51cab6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@debian.org>
-Build-Depends: po4a (>= 0.24), man-db (>= 2.5.1), file (>= 3.23), perl-base (>= 5.10)
+Build-Depends: po4a (>= 0.24), file (>= 3.23), perl-base (>= 5.10)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git
 Vcs-Browser: http://git.debian.org/?p=debhelper/debhelper.git;a=summary

diff --git a/dh_installman b/dh_installman
index fb7c8eb4e71b806597706a5a1726a0d0afb825aa..e11828156f6c4b7dc5f4a21f5ca8e460f014014a 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -197,8 +197,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        }
 
        # Now utf-8 conversion.
-       foreach my $dir (qw{usr/share/man}) {
-               if (-e "$tmp/$dir") {
+       if (defined `man --version`) {
+               foreach my $dir (qw{usr/share/man}) {
+                       next unless -e "$tmp/$dir";
                        find(sub {
                                return if ! -f $_ || -l $_;
                                my ($tmp, $orig)=($_.".new", $_);