r23: Initial Import

diff --git a/debian/changelog b/debian/changelog
index b6a5a4960132555d7509c25d2c36765328babbfe..bbbdb2681213974fcdcf6fec2c697b774e055877 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (0.17) unstable; urgency=low
+
+  * Added dh_installdirs, automatically creates subdirectories (for
+    compatability with debstd's debian/dirs file.
+  * dh_lib: fixed problem with -P flag.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri,  7 Nov 1997 16:07:11 -0500
+
 debhelper (0.16) unstable; urgency=low
 
   * dh_compress: always compress changelog and upstream changelog, no 

diff --git a/debian/rules b/debian/rules
index eaaeb54dd8b3a251e15d910d8670fda73ac94f27..e2d4da03074aec910c6fc941b8e1dff4d0b178c9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,15 +28,14 @@ binary-indep: build
        ./dh_testdir $(test_files)
        ./dh_testroot
        ./dh_clean
+       ./dh_installdirs usr/bin usr/lib/debhelper
 
-       install -d debian/tmp/usr/bin
        find . -perm +111 -maxdepth 1 -type f \
                -exec install -p {} debian/tmp/usr/bin \;
-       install -d debian/tmp/usr/lib/debhelper
        cp dh_lib debian/tmp/usr/lib/debhelper
        cp -a autoscripts debian/tmp/usr/lib/debhelper
 
-       ./dh_installdocs TODO README
+       ./dh_installdocs TODO README BUGS
        ./dh_installexamples examples/*
        ./dh_installmenu
        ./dh_installmanpages

diff --git a/dh_lib b/dh_lib
index c2dd9777b8ee76d0ce53931429378bdf448e76c0..8dad88c5dbcb2dd6f8184efa21eddbbac8c535a7 100644 (file)
--- a/dh_lib
+++ b/dh_lib
@@ -182,6 +182,6 @@ fi
 
 # Check to see if -P was specified. If so, we can only act on a single
 # package.
-if [ "$DH_TMPDIR" ] && echo "$DH_DOPACKAGES" | grep -q " "; then
+if [ "$DH_TMPDIR" ] && echo "$DH_DOPACKAGES" | egrep -q '.+ .+' ; then
        error "-P was specified, but multiple packages would be acted on."
 fi

diff --git a/examples/rules.multi b/examples/rules.multi
index fbefadd313a1187e88cb3a19b4fe836b22bb6b98..6fd708893896594698ca493d5fd2a2fe1e5e4ac6 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -27,6 +27,7 @@ binary-indep: build
        dh_testdir -i
        dh_testroot -i
        dh_clean -i
+       dh_installdirs -i
         # Add here commands to install the files into debian/tmp
         #$(MAKE) PREFIX=debian/tmp install
        dh_installdocs -i
@@ -49,6 +50,7 @@ binary-arch: build
        dh_testdir -a
        dh_testroot -a
        dh_clean -a
+       dh_installdirs -a
        # Add here commands to install the files into debian/tmp
        #$(MAKE) PREFIX=debian/tmp install
        dh_installdocs -a