r73: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 11a5e95d1b15e080878fe301ca8184a0da589015..8124e62c323dbec58a45049db0e90ddbe2f06d4d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.75) unstable; urgency=low
+
+  * Actually exit if there is an unknown option onthe command line (oooops!)
+  * Fix .so file conversion to actually work (#19933).
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 19 Mar 1998 11:54:58 -0800
+
 debhelper (0.74) unstable; urgency=low
 
   * dh_installmanpages: convert .so links to symlinks at last (#19829).

diff --git a/dh_getopt.pl b/dh_getopt.pl
index f91a42e0aa4daa25fa68580e656397b0a064eb30..0c9bba0b3b3f3bb05e1d5856974c999aa5d85a6e 100755 (executable)
--- a/dh_getopt.pl
+++ b/dh_getopt.pl
@@ -64,7 +64,7 @@ use Getopt::Long;
 Getopt::Long::config("bundling");
 
 # Parse options.
-GetOptions(
+$ret=GetOptions(
        "v" => \$verbose,
        "verbose" => \$verbose,
 
@@ -113,6 +113,10 @@ GetOptions(
        "init-script=s" => \$init_script,
 );
 
+if (!$ret) {
+       $parse_error="exiting with unknown option.";
+}
+
 # Check to see if -V was specified. If so, but no parameters were passed,
 # the variable will be defined but empty.
 if (defined($version_info)) {

diff --git a/dh_installmanpages b/dh_installmanpages
index d5e9198acb31ddbaaed3405e60b9e133f447cad2..a8fb1e992dfda7eaa80f81644540e690efb5601b 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -60,7 +60,7 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Now the .so conversion.
        for file in `find $TMP/usr/man $TMP/usr/X11*/man -type f -size -256c 2>/dev/null`
        do
-               solink=expr "`head -1 $file`" : '\.so \(.*\)'
+               solink=`expr "\`head -1 $file\`" : '\.so \(.*\)'`
                if [ "$solink" ]; then
                        doit "rm -f $file"
                        # The .so links include the subdir the page is in,