r152: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 32d4737055eda1f673b9923f04e9dce086d6ca54..5c2d87a6ab6fd9bc25d79f6832038b6c9fe89943 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+debhelper (1.2.16) unstable; urgency=low
+
+  * dh_installchangelogs: now detects html changelogs and installs them as
+    changelog.html.gz, to comply with latest policy (which I disagree with
+    BTW).
+  * manpages: updated policy version numbers.
+  * dh_installdocs: behavior change: all docs are now installed mode 644.
+    I have looked and it doesn't seem this will actually affect any packages
+    in debian. This is useful only if you want to use dh_installdocs and not
+    dh_fixperms, and that's the only time this behavior change will have any
+    effect, either. (#30118)
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu,  3 Dec 1998 23:31:56 -0800
+
 debhelper (1.2.15) unstable; urgency=low
 
   * Just a re-upload, last upload failed for some obscure reason.

diff --git a/dh_gencontrol.1 b/dh_gencontrol.1
index 7ceb532aa65ccc99ec2a5b2af8cbb725739b80e9..791826195d8d6b84ad69884394b0d27b6aba2a8b 100644 (file)
--- a/dh_gencontrol.1
+++ b/dh_gencontrol.1
@@ -31,6 +31,6 @@ for a list of environment variables that affect all debhelper commands.
 .TP
 .BR dpkg-shlibdeps (1)
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_installchangelogs b/dh_installchangelogs
index 97e057b76a6d0f811e0e0b7252d1451b2275179c..40a68f3d30cfd06de4bc23f90aeaa46ce9671e77 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -42,7 +42,13 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        doit("install","-p","-m644",$changelog,"$TMP/usr/doc/$PACKAGE/$changelog_name");
 
        if ($upstream) {
-               doit("install","-p","-m644",$upstream,"$TMP/usr/doc/$PACKAGE/changelog");
+               if ($upstream=~m/\.html?$/i) {
+                       # HTML changelog
+                       doit("install","-p","-m644",$upstream,"$TMP/usr/doc/$PACKAGE/changelog.html");
+               }
+               else {
+                       doit("install","-p","-m644",$upstream,"$TMP/usr/doc/$PACKAGE/changelog");
+               }
                if ($dh{K_FLAG}) {
                        # Install symlink to original name of the upstream changelog file.
                        # Use basename in case original file was in a subdirectory or something.

diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1
index 815c2dda0c0e967755f3eb9c9c93a33704554e87..436ba9476126e431cf69984e1050292e5a555e3d 100644 (file)
--- a/dh_installchangelogs.1
+++ b/dh_installchangelogs.1
@@ -17,7 +17,9 @@ debian/changelog.)
 .P
 If an upstream changelog file is specified as an option, and the package is
 not a native debian package, then this upstream changelog will be installed
-as usr/doc/package/changelog in the package build directory.
+as usr/doc/package/changelog in the package build directory. If the
+changelog is a html file (determined by file extention), it will be
+installed as usr/doc/package/changelog.html instead.
 .SH OPTIONS
 .TP
 .B debhelper options
@@ -44,6 +46,6 @@ for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
 .BR debhelper (1)
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_installcron.1 b/dh_installcron.1
index adda071169b67d75890f7247273d57280cc62d6e..a83f0401fdc62d2a82d95c028fc6e68f1824f857 100644 (file)
--- a/dh_installcron.1
+++ b/dh_installcron.1
@@ -25,6 +25,6 @@ for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
 .BR debhelper (1)
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_installdeb.1 b/dh_installdeb.1
index 03fa10684d4a84511b5c79636b6a70ba76ba1290..1d17b96caebf262e2fffa22c551f032dd99c98db 100644 (file)
--- a/dh_installdeb.1
+++ b/dh_installdeb.1
@@ -45,6 +45,6 @@ for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
 .BR debhelper (1)
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_installdocs b/dh_installdocs
index 34fe97d18933585b7322d78ed818cd6259a2b02f..97117a344de1313ca9248a4337a774b459cc64ff 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -27,6 +27,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 
        if (@docs) {
                doit("cp","-a",@docs,"$TMP/usr/doc/$PACKAGE/");
+               doit("chmod","-R","go=rX","$TMP/usr/doc");
+               doit("chmod","-R","u+rw","$TMP/usr/doc");
        }
 
        # .Debian is correct, according to policy, but I'm easy.

diff --git a/dh_installdocs.1 b/dh_installdocs.1
index 72f80ecd0b34586346d64290aab05f2da1564f7b..f711492bbc4eda0e2eb9a56f819c27dc8c5a9577 100644 (file)
--- a/dh_installdocs.1
+++ b/dh_installdocs.1
@@ -57,6 +57,6 @@ for a list of environment variables that affect all debhelper commands.
 It's impossible to specify filenames with spaces or other whitespace in them
 in debian/docs file. This is more a historical design flaw than a bug.
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 68dc83ebf798397ff3931bf07df1b5b03903b8b7..dbf6bfc9b7e546c73e03b98f25024e1d217da1f8 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -16,7 +16,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        open (FIND, "find $TMP -type f -name '*.so.*' |");
        while (<FIND>) {
                chomp;
-               ($library, $major)=m#.*/(.*)\.so\.(\d*)\.#;
+               ($library, $major)=m#.*/(.*)\.so\.(\d*)\.?#;
                if (defined($dh{M_PARAMS}) && $dh{M_PARAMS} ne '') {
                        $major=$dh{M_PARAMS};
                }

diff --git a/dh_movefiles.1 b/dh_movefiles.1
index 260d5069135bf03acea7b91346a26834982ed41c..6ec525a881a408f7b16fed641d317946c7d01834 100644 (file)
--- a/dh_movefiles.1
+++ b/dh_movefiles.1
@@ -3,12 +3,12 @@
 dh_movefiles \- moves files out of debian/tmp into subpackages
 .SH SYNOPSIS
 .B dh_movefiles
-.I "[debhelper options] [file ..]"
+.I "[debhelper options] [--sourcedir=dir] [file ..]"
 .SH "DESCRIPTION"
 dh_movefiles is a debhelper program that is responsible for moving files out
-of debian/tmp and into other package build directories. This may be useful
-if your package has a Makefile that installs everything into debian/tmp, and
-you need to break that up into subpackages.
+of debian/tmp or some other directory and into other package build 
+directories. This may be useful if your package has a Makefile that installs
+everything into debian/tmp, and you need to break that up into subpackages.
 .P
 Files named debian/package.files list the files to be moved, separated by
 whitespace. The filenames listed should be relative to debian/tmp/. You can
@@ -27,6 +27,13 @@ See
 .BR debhelper (1)
 for a list of options common to all debhelper commands.
 .TP
+.B --sourcedir=dir
+Instead of moveing files out of debian/tmp (the default), this option makes
+it move files out of some other directory. Since the entire contents of
+the sourcedir is moved, specifiying something like --sourcedir=/ is very
+unsafe, so to prevent mistakes, the sourcedir must be a relative filename; it
+cannot begin with a `/'.
+.TP
 .B file ..
 Lists files to move. The filenames listed should be relative to debian/tmp/.
 You can also list directory names, and the whole directory will be moved. You

diff --git a/dh_shlibdeps.1 b/dh_shlibdeps.1
index f9f6f3e4ea61328769565b6aab10e9edf5d2ae47..b414965f5246d720e1113ada707ce33bcd9584df 100644 (file)
--- a/dh_shlibdeps.1
+++ b/dh_shlibdeps.1
@@ -32,6 +32,6 @@ for a list of environment variables that affect all debhelper commands.
 .TP
 .BR dpkg-shlibdeps (1)
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>

diff --git a/dh_strip.1 b/dh_strip.1
index 6ddcde135056b14d78904c5870f7c6e076bafc26..683de57cf44a4e9d8559789c0ccfd38df0183e72 100644 (file)
--- a/dh_strip.1
+++ b/dh_strip.1
@@ -29,6 +29,6 @@ for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
 .BR debhelper (1)
 .SH "CONFORMS TO"
-Debian policy, version 2.3.0.0
+Debian policy, version 2.5.0.0
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>