summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorjoey <joey>2002-05-19 03:06:41 +0000
committerjoey <joey>2002-05-19 03:06:41 +0000
commit6acd7f22222118dc5f51c251bd0078edbe280e87 (patch)
tree141f8d946118eb548ad6e19b6a62dd63bf398763 /debian
parent822faec6d81321d23b3e75c018f0308fd006d1b2 (diff)
r522: * Set DH_ALWAYS_EXCLUDE=CVS and debhelper will exclude CVS directories
from processing by any command that takes a -X option, and dh_builddeb will also go in and rm -rf any that still sneak into the build tree. * dh_install: A patch from Eric Dorland <eric@debian.org> adds support for --sourcedir, which allows debian/package.files files to be moved over to debian/package.install, and just work. Closes: #146847 * dh_movefiles: don't do file tests in no-act mode. Closes: #144573 * dh_installdebconf: pass --drop-old-templates to debconf-mergetemplate. Means debhelper has to depend on debconf-utils 1.1.1.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog14
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules4
3 files changed, 16 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 22328b3..72ccbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+debhelper (4.0.4) unstable; urgency=low
+
+ * Set DH_ALWAYS_EXCLUDE=CVS and debhelper will exclude CVS directories
+ from processing by any command that takes a -X option, and dh_builddeb
+ will also go in and rm -rf any that still sneak into the build tree.
+ * dh_install: A patch from Eric Dorland <eric@debian.org> adds support for
+ --sourcedir, which allows debian/package.files files to be moved over to
+ debian/package.install, and just work. Closes: #146847
+ * dh_movefiles: don't do file tests in no-act mode. Closes: #144573
+ * dh_installdebconf: pass --drop-old-templates to debconf-mergetemplate.
+ Means debhelper has to depend on debconf-utils 1.1.1.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 18 May 2002 21:38:03 -0400
+
debhelper (4.0.3) unstable; urgency=low
* Corrects misbuild with CVS dirs in deb. Closes: #146576
diff --git a/debian/control b/debian/control
index 24e9132..c97b8c6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debhelper
Section: devel
Priority: optional
Maintainer: Joey Hess <joeyh@debian.org>
-Build-Depends-Indep: perl (>= 5.6.1), fileutils (>= 4.0-2.1), file (>= 3.23-1), debconf-utils
+Build-Depends-Indep: perl (>= 5.6.1), fileutils (>= 4.0-2.1), file (>= 3.23-1), debconf-utils (>= 1.1.1)
Standards-Version: 3.5.6.1
Package: debhelper
diff --git a/debian/rules b/debian/rules
index a9b6bae..af24fb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,10 +83,8 @@ binary-indep: build
./dh_perl
./dh_installdeb
./dh_gencontrol
- # Clean up CVS directories copied in if I build from CVS tree.
- find debian/debhelper -type d -name CVS | xargs rm -rf
./dh_md5sums
- ./dh_builddeb
+ ./dh_builddeb -v
# Update the debhelper web page. Not intended for use by anyone except the
# author.