diff options
| author | joey <joey> | 2001-05-24 20:33:49 +0000 |
|---|---|---|
| committer | joey <joey> | 2001-05-24 20:33:49 +0000 |
| commit | c9c53916d94447ed7b33a6c1956142081071c206 (patch) | |
| tree | 71f1013a6f7117bc64850a15a3e6e87386eb0742 | |
| parent | 2e8f5be5cf644bcc85d902b71c951de01a2cb200 (diff) | |
| download | debhelper-c9c53916d94447ed7b33a6c1956142081071c206.tar.gz | |
r471: * Always include package name in maintainer script fragment filenames
and generated shlibs files (except for in DH_COMPAT=1 mode). This is a
purely cosmetic change, and if it breaks anything, you were using an
undocumented interface. Closes: #95387
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 5ed9d163..6185e19c 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -260,10 +260,10 @@ sub pkgfile { sub pkgext { my $package=shift; - if ($package ne $dh{MAINPACKAGE}) { - return "$package."; + if (compat(1) and $package eq $dh{MAINPACKAGE}) { + return ""; } - return ""; + return "$package."; } # Returns 1 if the package is a native debian package, null otherwise. diff --git a/debian/changelog b/debian/changelog index e0a61241..915a8dd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +debhelper (3.0.26) unstable; urgency=low + + * Always include package name in maintainer script fragment filenames + and generated shlibs files (except for in DH_COMPAT=1 mode). This is a + purely cosmetic change, and if it breaks anything, you were using an + undocumented interface. Closes: #95387 + + -- Joey Hess <joeyh@debian.org> Thu, 24 May 2001 16:31:46 -0400 + debhelper (3.0.25) unstable; urgency=low * dh_makeshlins: append to LD_LIBRARY_PATH at start, not each time |