r39: Initial Import

4 files changed, 25 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index f739f89b..506a35e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (0.33) unstable; urgency=low
+
+  * examples/*: use prefix, instead of PREFIX, becuase autoconf uses that.
+    Also, use `pwd`/debian/tmp, instead of debian/tmp.
+  * Always substitute #DEBHELPER# in maintainer scripts, even if it expands
+    to nothing, for neatness and to save a few bytes. #15863
+  * dh_clean: added -k parameter to not delete debian/files. #15789
+  * examples/*: use dh_clean -k in the binary targets of all rules files,
+    for safety.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 11 Dec 1997 19:05:41 -0500
+
 debhelper (0.32) unstable; urgency=low
 
   * Split dh_installdebfiles into 3 programs (dh_installdeb, dh_shlibdeps,
diff --git a/debian/rules b/debian/rules
index 8a240f9b..b236fb1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ binary-arch: build
 binary-indep: build
 	./dh_testdir $(test_files)
 	./dh_testroot
-	./dh_clean
+	./dh_clean -k
 	./dh_installdirs usr/bin usr/lib/debhelper
 
 	find . -perm +111 -maxdepth 1 -type f \
@@ -44,7 +44,6 @@ binary-indep: build
 	./dh_fixperms
 	./dh_suidregister
 	./dh_installdeb
-	./dh_shlibdeps
 	./dh_gencontrol
 	./dh_du
 	./dh_md5sums
diff --git a/dh_clean.1 b/dh_clean.1
index a9f0bdfd..5d9180a9 100644
--- a/dh_clean.1
+++ b/dh_clean.1
@@ -3,7 +3,7 @@
 dh_clean \- clean up package build directories
 .SH SYNOPSIS
 .B dh_clean
-.I "[-v] [-a] [-i] [-ppackage] [-Ptmpdir] [file ...]"
+.I "[-v] [-a] [-i] [-k] [-ppackage] [-Ptmpdir] [file ...]"
 .SH "DESCRIPTION"
 dh_clean is a debhelper program that is responsible for cleaning up after a
 package is built. It removes the package build directories, and removes some
@@ -26,6 +26,15 @@ Clean up the package build directory for the package named "package".
 .B \-Ptmpdir
 Use "tmpdir" for package build directory.
 .TP
+.B \-k
+Do not delete debian/files. When do you want to use this? Anytime you have a
+debian/rules that has 2 binary targets that build different .deb packages;
+for example, one target is binary-arch, and the other is binary-indep, or
+one target builds the shared library, and the other the -dev package. If you
+didn't use -k in these cases, then debian/files would be deleted in the
+middle, and your changes file will only contain the last binary package that
+was built.
+.TP
 .B file ...
 Delete these files too.
 .SH NOTES
diff --git a/dh_installdebfiles b/dh_installdebfiles
index 8b1e0962..6afdf548 100755
--- a/dh_installdebfiles
+++ b/dh_installdebfiles
@@ -1,11 +1,11 @@
 #!/bin/sh -e
 #
-# This program is depricated, but left in the package for backwards
+# This program is deprecated, but left in the package for backwards
 # compatability. It simply calls the 3 programs that replaced it.
 
 PATH=debian:$PATH:/usr/lib/debhelper
 
-echo "* Note: dh_installdebfiles is depricated." >&2
+echo "* Note: dh_installdebfiles is deprecated." >&2
 
 dh_installdeb $*
 dh_shlibdeps $*