import NMU from Stefano Zacchiroliv1.36.4+nmu1branch-v1.36.4

5 files changed, 36 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index e3a33a0..00c7855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+help2man (1.36.4+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Bump debhelper compatibility level to 5 (4 is deprecated now), move
+    the setting to debian/compat
+  * Add missing dependency on ${shlibs:Depends}, neede by the .so file
+    shipped by help2man
+  * Add --version-string option to support programs which are missing some
+    sort of --version option. Thanks to Lionel Elie Mamane for the patch.
+    (Closes: #494739)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Fri, 17 Apr 2009 12:35:34 +0200
+
 help2man (1.36.4) unstable; urgency=low
 
   * Add sv translation from Daniel Nylander (closes: #349568).
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index 6ab70b6..160536a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: perl (>= 5.6.0-18), debhelper (>= 3.0.5), gettext (>= 0.12.1), li
 
 Package: help2man
 Architecture: any
-Depends: ${perl:Depends}
+Depends: ${perl:Depends}, ${shlibs:Depends}
 Recommends: gettext, liblocale-gettext-perl
 Description: Automatic manpage generator
  Program to create simple man pages from the --help and
diff --git a/debian/rules b/debian/rules
index 8dbfc0a..5ebc2a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export DH_COMPAT=4
 
 SHELL = /bin/bash
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -95,6 +94,6 @@ maint-clean: maint-prep
 	configure
 	$(MAKE) maintainer-clean
 	rm -f README ChangeLog $(AM)
-	
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary maint-prep maint-clean
diff --git a/help2man.PL b/help2man.PL
index df54de6..8c749cf 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -163,6 +163,7 @@ alternatives may be specified using:
 
  -h, --help-option=STRING     help option string
  -v, --version-option=STRING  version option string
+ --version-string=STRING      version string
 
 Report bugs to <bug-help2man@gnu.org>.
 EOT
@@ -173,7 +174,7 @@ my $source = '';
 my $locale = 'C';
 my $help_option = '--help';
 my $version_option = '--version';
-my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info);
+my ($opt_name, @opt_include, $opt_output, $opt_info, $opt_no_info, $version_string);
 
 my %opt_def = (
     'n|name=s'		 => \$opt_name,
@@ -188,6 +189,7 @@ my %opt_def = (
     'N|no-info'		 => \$opt_no_info,
     'h|help-option=s'	 => \$help_option,
     'v|version-option=s' => \$version_option,
+    'version-string=s'   => \$version_string,
 );
 
 # Parse options.
@@ -297,11 +299,26 @@ for my $hash (\(%include, %append))
 }
 
 # Grab help and version info from executable.
-my ($help_text, $version_text) = map {
+my ($help_text) = map {
     join '', map { s/ +$//; expand $_ } `$ARGV[0] $_ 2>/dev/null`
 	or kark N_("%s: can't get `%s' info from %s"), $this_program,
 	    $_, $ARGV[0]
-} $help_option, $version_option;
+} $help_option;
+
+my $version_text;
+
+if ($version_string)
+{
+    $version_text = $version_string . "\n";
+}
+else
+{
+    ($version_text) = map {
+	join '', map { s/ +$//; expand $_ } `$ARGV[0] $_ 2>/dev/null`
+	    or kark N_("%s: can't get `%s' info from %s"), $this_program,
+	    $_, $ARGV[0]
+	} $version_option;
+}
 
 my $date = strftime "%B %Y", localtime;
 (my $program = $ARGV[0]) =~ s!.*/!!;