r28: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 82e193f3e791ab0c610c5fcd09c3785e6e3c046c..ae73986f9b40e5cc48676502454fc9d16059cbff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.22) unstable; urgency=low
+
+  * dh_installdocs: Install README.debian as README.Debian (of course,
+    README.Debian is installed with the same name..)
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 18 Nov 1997 01:23:53 -0500
+
 debhelper (0.21) unstable; urgency=low
 
   * dh_installinit: on removal, fixed how update-rc.d is called.

diff --git a/dh_installdocs b/dh_installdocs
index bcc263421d283849a8939938402f4a77a849a241..153be9a2e9fcffb18c2ba464b15d11948e987c06 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -31,7 +31,8 @@ for PACKAGE in $DH_DOPACKAGES; do
        # Install these files only into the main package by default.
        if [ "$PACKAGE" = "$MAINPACKAGE" ]; then
                if [ -f debian/README.debian ]; then
-                       doit "install -m 644 -p debian/README.debian $TMP/usr/doc/$PACKAGE/"
+                       # .Debian is correct according to policy.
+                       doit "install -m 644 -p debian/README.debian $TMP/usr/doc/$PACKAGE/README.Debian"
                fi
                if [ -f debian/README.Debian ]; then
                        doit "install -m 644 -p debian/README.Debian $TMP/usr/doc/$PACKAGE/"

diff --git a/dh_installdocs.1 b/dh_installdocs.1
index fc001130e20f7698dd9a8b756ecfdf968656a782..68f3808c67a944a444d4a2675c9fc3c30ed2dd83 100644 (file)
--- a/dh_installdocs.1
+++ b/dh_installdocs.1
@@ -12,8 +12,8 @@ dh_installdocs automatically installs debian/copyright if it exists. If
 dh_installdocs is acting on multiple packages, debian/copyright files will be 
 installed into all packages.
 .P
-Any filenames specified as parameters, as well as debian/README.debian (or
-debian/README.Debian) and debian/TODO, if they exist, will be installed into
+Any filenames specified as parameters, as well as debian/README.Debian (or
+debian/README.debian) and debian/TODO, if they exist, will be installed into
 the first binary package listed in debian/control, if dh_installdocs is acting
 on that package. Note that debian/TODO will be installed named TODO.Debian,
 if the package is not a debian native package.