diff options
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | dh_fixperms | 13 | ||||
| -rwxr-xr-x | dh_link | 4 | ||||
| -rwxr-xr-x | dh_makeshlibs | 6 |
5 files changed, 11 insertions, 15 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 732f5399..09e97bb1 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -10,7 +10,7 @@ use warnings; use constant { # Lowest compat level supported - 'MIN_COMPAT_LEVEL' => 3, + 'MIN_COMPAT_LEVEL' => 4, # Lowest compat level that does *not* cause deprecation # warnings 'LOWEST_NON_DEPRECATED_COMPAT_LEVEL' => 5, diff --git a/debian/changelog b/debian/changelog index 15268b3a..bfccb6b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ debhelper (9.20151225+unreleased) UNRELEASED; urgency=medium * Dh_Lib.pm: Pass "-S" to dpkg-parsechangelog when requesting the Version field. + * Drop compat level 3. -- Niels Thykier <niels@thykier.net> Sat, 26 Dec 2015 20:13:36 +0000 diff --git a/dh_fixperms b/dh_fixperms index f4dd5bf9..214a0914 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -106,14 +106,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { "${find_options} -print0 2>/dev/null", "| xargs -0r chmod 0644"); - # v4 and up - if (! compat(3)) { - # Programs in the bin and init.d dirs should be executable.. - for my $dir (qw{usr/bin bin usr/sbin sbin usr/games etc/init.d}) { - if (-d "$tmp/$dir") { - complex_doit("find $tmp/$dir -type f $find_options -print0 2>/dev/null", - "| xargs -0r chmod a+x"); - } + # Programs in the bin and init.d dirs should be executable.. + for my $dir (qw{usr/bin bin usr/sbin sbin usr/games etc/init.d}) { + if (-d "$tmp/$dir") { + complex_doit("find $tmp/$dir -type f $find_options -print0 2>/dev/null", + "| xargs -0r chmod a+x"); } } @@ -113,8 +113,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { error("parameters list a link without a destination."); } - # v4 or later and only if there is a temp dir already - if (! compat(3) && -e $tmp) { + # If there is a temp dir already + if (-e $tmp) { # Scan for existing links and add them to @links, so they # are recreated policy conformant. find( diff --git a/dh_makeshlibs b/dh_makeshlibs index a5ba10e8..6aa6e558 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -202,10 +202,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $version = $dh{VERSION}; # Old compatibility levels include the # debian revision, while new do not. - if (! compat(3)) { - # Remove debian version, if any. - $version =~ s/-[^-]+$//; - } + # Remove debian version, if any. + $version =~ s/-[^-]+$//; $deps="$package (>= $version)"; } } |