r40: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 506a35e58758247d195b3174a8a0c024f9ec9183..689ff71c68cdea4cbbc83ff17292846a40a52efe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.34) unstable; urgency=low
+
+  * Fixed typo #16215.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 22 Dec 1997 14:41:46 -0500
+
 debhelper (0.33) unstable; urgency=low
 
   * examples/*: use prefix, instead of PREFIX, becuase autoconf uses that.

diff --git a/dh_installdebfiles.1 b/dh_installdebfiles.1
index 0240f9383f9ce417ed83f3a7ad36109aba00503d..cf1580d0259eb6f541a3425ba63598f0f7ee34c9 100644 (file)
--- a/dh_installdebfiles.1
+++ b/dh_installdebfiles.1
@@ -9,7 +9,7 @@ files into the DEBIAN directory in package build directories with the
 correct permissions, canculating shared library dependancies, and creating a
 control file.
 .P
-This program is depricated. It is now merely a wrapper around three other
+This program is deprecated. It is now merely a wrapper around three other
 programs, and you may replace any calls to this program by:
 .P
   dh_installdeb

diff --git a/dh_lib b/dh_lib
index 388b7f72dbb9da5b6f23ed4db8cd57ff7f430361..7a56c15642692d02321309fd66ab405d943a662c 100644 (file)
--- a/dh_lib
+++ b/dh_lib
@@ -141,9 +141,13 @@ for i; do
        esac
 done
 
-# Get the package version from the changelog.
-LINE=`head -1 debian/changelog`
-VERSION=`expr "$LINE" : '.* (\(.*\))'`
+# Get the package version.
+# Note that the 2>/dev/null is because a bug in dpkg-parsechangelog makes it
+# output a bogus error message to stderr.
+# If it actually has a real error, then the expr will fail, and this whole
+# script will come crashing to a halt, which is good enough to inform
+# the user something's wrong. :-)
+VERSION=`expr "\`dpkg-parsechangelog 2>/dev/null\`" : '.*Version: \(.*\).*Distribution:'`
 
 # Get the name of the main binary package.
 MAINPACKAGE=`grep ^Package: debian/control | cut -d " " -f 2 | head -1`