From 6acd7f22222118dc5f51c251bd0078edbe280e87 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 19 May 2002 03:06:41 +0000 Subject: 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 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. --- Debian/Debhelper/Dh_Getopt.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Debian/Debhelper/Dh_Getopt.pm') diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 81d20618..16851a04 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -177,13 +177,6 @@ sub parseopts { } @{$options{DOPACKAGES}}=@package_list; - # Generate EXCLUDE_FIND. - $options{EXCLUDE_FIND}=''; - foreach (@{$options{EXCLUDE}}) { - $options{EXCLUDE_FIND}.="-regex .*".quotemeta($_).".* -or "; - } - $options{EXCLUDE_FIND}=~s/ -or $//; - # If there are no packages to act on now, it's an error. if (! defined $options{DOPACKAGES} || ! @{$options{DOPACKAGES}}) { error("I have no package to build"); @@ -203,7 +196,7 @@ sub parseopts { @ARGV=@{$options{ARGV}} if exists $options{ARGV}; return %options; -} +} sub import { # Enable bundling of short command line options. -- cgit v1.2.3