r13: Initial Import

diff --git a/README b/README
index a13c77265914993674d9cf019e496664d44644d1..e43ee33625d8f5d7d995acf8505cf6dc8b3dfa26 100644 (file)
--- a/README
+++ b/README
@@ -4,7 +4,9 @@ dh_* commands.
 
 To help you get started, I've included an example of a debian/rules file
 that uses debhelper commands extensivly. See
-/usr/doc/debhelper/examples/rules .
+/usr/doc/debhelper/examples/rules . These files are also useful as they give
+one good order you can run the different debhelper scripts in (though other
+variations are possible).
 
 Automatic generation of debian install scripts:
 ----------------------------------------------

diff --git a/debian/changelog b/debian/changelog
index a4d47c4c725b7ba84629c0267bae09fb3298a0ce..e865dc67006b30b7029e47b41fda372612db6a29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+debhelper (0.7) unstable; urgency=low
+
+  * Sped up some things by removing unnecesary for loops.
+  * dh_installdocs: behavior modifcation: if there is a debian/TODO, it is
+    named like a debian/changelog file: if the package is a debian native
+    package, it is installed as TODO. If the package is not a native package,
+    it is installed as TODO.Debian.
+  * dh_installdocs: handle debian/README.Debian as well as
+    debian/README.debian.
+  * Added dh_undocumented program, which can set up undocumented.7 symlinks.
+  * Moved dh_installdebfiles to come after dh_fixperms in the example rules
+    files. (dh_installdebfiles makes sure it installs things with the proper
+    permissions, and this reorganization makes the file a bit more flexable
+    in a few situations.)
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 13 Oct 1997 20:08:05 -0400
+
 debhelper (0.6) unstable; urgency=low
 
   * Got rid of bashisms - this package should work now if /bin/sh is ash.

diff --git a/debian/rules b/debian/rules
index c6a4fa955a7796268a53322851c54974c8405b8f..55fd8e982642cd149d6b3976339cbabb48581dfe 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ binary-indep: build
        ./dh_compress
        ./dh_installdebfiles
        ./dh_fixperms
+       ./dh_md5sums
        ./dh_builddeb
 
 binary: binary-indep binary-arch

diff --git a/dh_installdocs b/dh_installdocs
index 90be53c75372dd837d14e1e77f2f4208e439487f..3859d34bed62c0290b3e74fafe6a63a521af9d3c 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -25,18 +25,24 @@ for PACKAGE in $DH_DOPACKAGES; do
        fi
 
        if [ "$docs" ]; then
-               for file in $docs; do
-                       doit "cp -a $file debian/$TMP/usr/doc/$PACKAGE/"
-               done
+               doit "cp -a $docs debian/$TMP/usr/doc/$PACKAGE/"
        fi
 
        # Install these files only into the main package by default.
        if [ "$PACKAGE" = "$MAINPACKAGE" ]; then
-               for file in README.debian TODO ; do
-                       if [ -f debian/$file ]; then
-                               doit "install -m 644 -p debian/$file debian/$TMP/usr/doc/$PACKAGE/"
+               if [ -f debian/README.debian ]; then
+                       doit "install -m 644 -p debian/README.debian debian/$TMP/usr/doc/$PACKAGE/"
+               fi
+               if [ -f debian/README.Debian ]; then
+                       doit "install -m 644 -p debian/README.Debian debian/$TMP/usr/doc/$PACKAGE/"
+               fi
+               if [ -f debian/TODO ]; then
+                       if [ "$NATIVE" ]; then
+                               doit "install -m 655 -p debian/TODO debian/$TMP/usr/doc/$PACKAGE/TODO"
+                       else
+                               doit "install -m 644 -p debian/TODO debian/$TMP/usr/doc/$PACKAGE/TODO.Debian"
                        fi
-               done
+               fi
        fi
 
        if [ -f debian/copyright ]; then

diff --git a/dh_installexamples b/dh_installexamples
index 23d11af86dd5929540c43cff0895eebd5c035cca..61ceae20992a775bbe5c34dc1eed073d16a554bf 100755 (executable)
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -25,8 +25,6 @@ for PACKAGE in $DH_DOPACKAGES; do
                        doit "install -d debian/$TMP/usr/doc/$PACKAGE/examples"
                fi
 
-               for file in $examples; do
-                       doit "cp -a $file debian/$TMP/usr/doc/$PACKAGE/examples/"
-               done
+               doit "cp -a $examples debian/$TMP/usr/doc/$PACKAGE/examples/"
        fi
 done

diff --git a/examples/rules b/examples/rules
index 65e6878e28923308a77481eefabbd4bc797be3fb..961ab45945b46f6dfd3aa2348f0f7484d6db177c 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -35,11 +35,12 @@ binary-arch: build
        dh_installmenu
        dh_installcron
        dh_installmanpages
+#      dh_undocumented
        dh_installchangelogs
        dh_strip
        dh_compress
-       dh_installdebfiles
        dh_fixperms
+       dh_installdebfiles
        dh_builddeb
 
 binary: binary-indep binary-arch

diff --git a/examples/rules.multi b/examples/rules.multi
index f5e825972dfa21dfb66ab096b964cb3920d106dd..fd9bf5de2c98eb9253430b448b0a6044c429193b 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -34,10 +34,11 @@ binary-indep: build
        dh_installmenu -i
        dh_installcron -i
 #      dh_installmanpages -i
+#      dh_undocumented
        dh_installchangelogs -i
        dh_compress -i
-       dh_installdebfiles -i
        dh_fixperms -i
+       dh_installdebfiles -i
        dh_builddeb -i
 
 # Build architecture-dependent files here.
@@ -52,11 +53,12 @@ binary-arch: build
        dh_installmenu -a
        dh_installcron -a
        dh_installmanpages -a
+#      dh_undocumented
        dh_installchangelogs -a
        dh_strip -a
        dh_compress -a
-       dh_installdebfiles -a
        dh_fixperms -a
+       dh_installdebfiles -a
        dh_builddeb -a
 
 binary: binary-indep binary-arch