r32: Initial Import

diff --git a/README b/README
index 2f2e7c2c8a485d21e148bbb2ae9226f75c67dae5..53b6c3d916395ba58086897151e28d2a156f8dfd 100644 (file)
--- a/README
+++ b/README
@@ -125,4 +125,13 @@ binary package the debhelper program will act on. For example:
 
 This uses debian/tmp-<package> as the package build directory.
 
+Miscellaneous notes:
+-------------------
+
+Some of the dh_* programs (dh_installdirs in particular, I have not checked
+the rest), will let you pass $PACKAGE to them and it will be expanded into
+the package name they are operating on. For example:
+
+       dh_installdirs -a 'usr/doc/$PACKAGE'
+
 -- Joey Hess <joeyh@master.debian.org>

diff --git a/debian/changelog b/debian/changelog
index 8d8f7e2971f2a716bce0790ff1f4cdd69c7888af..053ed04704417f68c594ae74045e66b1b94c3ec5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (0.26) unstable; urgency=low
+
+  * dh_installdirs: Do not create usr/doc/$PACKAGE directory. Bug #15498
+  * README: documented that $PACKAGE can be used in the arguments to some of
+    the dh_* programs (#15497).
+  * dh_du.1: no, this is not really the dh_md5sums man page (#15499).
+
+ -- Joey Hess <joeyh@master.debian.org>  Sun, 30 Nov 1997 13:01:40 -0500
+
 debhelper (0.25) unstable; urgency=low
 
   * dh_compress: was not reading debian/compress file - fixed.

diff --git a/dh_du.1 b/dh_du.1
index 42509a504e4d52b99c87e57a95d3df7bbaaeb3db..d7d5061ced0421ac8085b84c7d8e53713d811f43 100644 (file)
--- a/dh_du.1
+++ b/dh_du.1
@@ -2,7 +2,7 @@
 .SH NAME
 dh_du \- generate DEBIAN/du file
 .SH SYNOPSIS
-.B dh_md5sums
+.B dh_du
 .I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir]"
 .SH "DESCRIPTION"
 dh_du is a debhelper program that is responsible for generating

diff --git a/dh_installdirs b/dh_installdirs
index a44de9ab85974ab151e6c574f9d4fa1103a39ece..dbe1a0a8fda652a036626606eee8ac8d52965a29 100755 (executable)
--- a/dh_installdirs
+++ b/dh_installdirs
@@ -9,8 +9,8 @@ for PACKAGE in $DH_DOPACKAGES; do
        TMP=`tmpdir $PACKAGE`
        EXT=`pkgext $PACKAGE`
 
-       if [ ! -d $TMP/usr/doc/$PACKAGE ]; then
-               doit "install -d $TMP/usr/doc/$PACKAGE"
+       if [ ! -d $TMP ]; then
+               doit "install -d $TMP"
        fi
 
        dirs=""

diff --git a/dh_installdirs.1 b/dh_installdirs.1
index 41dd0fd8d14c8092d0ac05e793889a8810bbeec6..9f5bc351f6f62c362c74dc85affa9d95580627cb 100644 (file)
--- a/dh_installdirs.1
+++ b/dh_installdirs.1
@@ -14,7 +14,7 @@ dh_installdirs is acting on that package.
 .P
 A file named debian/dirs (for the first binary package in debian/control),
 or debian/package.dirs (for each additional package in debian/control) can
-list other directories to be created. Seperate the directory names with
+list other directories to be created. Separate the directory names with
 whitespace.
 .P
 Be sure to only use directory names relative to the package build