[debhelper-devel] [debhelper] 01/01: Drop support for compat level 3

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit a6cd397f6942867e5054ac7197cf47f4a1ca4998
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 2 14:54:21 2016 +0000

    Drop support for compat level 3
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm |  2 +-
 debian/changelog           |  1 +
 dh_fixperms                | 13 +++++--------
 dh_link                    |  4 ++--
 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 732f539..09e97bb 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 15268b3..bfccb6b 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 at thykier.net>  Sat, 26 Dec 2015 20:13:36 +0000
 
diff --git a/dh_fixperms b/dh_fixperms
index f4dd5bf..214a091 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");
 		}
 	}
 	
diff --git a/dh_link b/dh_link
index f4ed64d..f207d40 100755
--- a/dh_link
+++ b/dh_link
@@ -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 a5ba10e..6aa6e55 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)";
 			}
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git