From e06e87d0aee1e09703e21b74a23f2249fcd4c6bb Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 05:06:17 +0000 Subject: [PATCH] r152: Initial Import --- debian/changelog | 14 ++++++++++++++ dh_gencontrol.1 | 2 +- dh_installchangelogs | 8 +++++++- dh_installchangelogs.1 | 6 ++++-- dh_installcron.1 | 2 +- dh_installdeb.1 | 2 +- dh_installdocs | 2 ++ dh_installdocs.1 | 2 +- dh_makeshlibs | 2 +- dh_movefiles.1 | 15 +++++++++++---- dh_shlibdeps.1 | 2 +- dh_strip.1 | 2 +- 12 files changed, 45 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32d4737..5c2d87a 100644 --- 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 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 7ceb532..7918261 100644 --- 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 diff --git a/dh_installchangelogs b/dh_installchangelogs index 97e057b..40a68f3 100755 --- 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 815c2dd..436ba94 100644 --- 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 diff --git a/dh_installcron.1 b/dh_installcron.1 index adda071..a83f040 100644 --- 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 diff --git a/dh_installdeb.1 b/dh_installdeb.1 index 03fa106..1d17b96 100644 --- 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 diff --git a/dh_installdocs b/dh_installdocs index 34fe97d..97117a3 100755 --- 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 72f80ec..f711492 100644 --- 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 diff --git a/dh_makeshlibs b/dh_makeshlibs index 68dc83e..dbf6bfc 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -16,7 +16,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) { open (FIND, "find $TMP -type f -name '*.so.*' |"); while () { 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 260d506..6ec525a 100644 --- 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 f9f6f3e..b414965 100644 --- 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 diff --git a/dh_strip.1 b/dh_strip.1 index 6ddcde1..683de57 100644 --- 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 -- 2.39.2