r240: Initial Import

diff --git a/Dh_Lib.pm b/Dh_Lib.pm
index c5146b914d525c2c518fca984e5b0b5f1207afbb..e74e8ccbcbb6a5ae06bd924e061b494970ab9f4b 100644 (file)
--- a/Dh_Lib.pm
+++ b/Dh_Lib.pm
@@ -228,10 +228,10 @@ sub tmpdir { my $package=shift;
 # the main package, it will look for debian/foo, and if found, return that.
 # Failing that, it will return nothing.
 sub pkgfile { my $package=shift; my $filename=shift;
-       if (-e "debian/$package.$filename") {
+       if (-f "debian/$package.$filename") {
                return "debian/$package.$filename";
        }
-       elsif ($package eq $dh{MAINPACKAGE} && -e "debian/$filename") {
+       elsif ($package eq $dh{MAINPACKAGE} && -f "debian/$filename") {
                return "debian/$filename";
        }
        return "";

diff --git a/debian/changelog b/debian/changelog
index b9f9ba52934039057dc79319701da3266da34351..cfe8937bec44da81b055d485f6c7f4c90f40a209 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (2.0.15) unstable; urgency=low
+
+  * dh_clean: only force-remove debian/tmp if in v2 mode. In v1 mode, we
+    shouldn't remove it because we may only be acting on a single package.
+    (Closes: #41689)
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 20 Jul 1999 19:00:15 -0700
+
 debhelper (2.0.14) unstable; urgency=low
 
   * Moved /usr/lib/debhelper to /usr/share/debhelper for FHS compliance