[debhelper-devel] [debhelper] 01/01: Remove support for named compat levels

[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 4306a33206d62d1d058901657ca4e43173f772ea
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 28 11:14:28 2017 +0000

    Remove support for named compat levels
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod                  | 60 ------------------------------------------
 debian/changelog               |  1 +
 debian/compat                  |  2 +-
 lib/Debian/Debhelper/Dh_Lib.pm | 14 +---------
 4 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index 068eadb..1e2d980 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -764,66 +764,6 @@ conffiles shipped in previous versions of the package (if any).
 
 =back
 
-=head2 Participating in the open beta testing of new compat levels
-
-It is possible to opt-in to the open beta testing of new compat
-levels.  This is done by setting the compat level to the string
-"beta-tester".
-
-Packages using this compat level will automatically be upgraded to the
-highest compatibility level in open beta.  In periods without any open
-beta versions, the compat level will be the highest stable
-compatibility level.
-
-Please consider the following before opting in:
-
-=over 4
-
-=item *
-
-The automatic upgrade in compatibility level may cause the package (or
-a feature in it) to stop functioning.
-
-=item *
-
-Compatibility levels in open beta are still subject to change.  We
-will try to keep the changes to a minimal once the beta starts.
-However, there are no guarantees that the compat will not change
-during the beta.
-
-=item *
-
-We will notify you via debian-devel-announce at lists.debian.org or
-debian-devel at lists.debian.org before we start a
-new open beta compat level.  However, once the beta starts we expect
-that you keep yourself up to date on changes to debhelper for that
-compat level.
-
-=item *
-
-The "beta-tester" compatibility version in unstable and testing will
-often be different than the one in stable.  Accordingly, it is not
-recommended for packages being backported regularly.  Alternatively,
-please be sure to add explicit versioned Build-Depends on debhelper,
-so you get exactly the compatibility version you expect.
-
-=item *
-
-You can always opt-out of the beta by resetting the compatibility
-level of your package to a stable version.
-
-=back
-
-Should you still be interested in the open beta testing, please run:
-
-  % echo beta-tester > debian/compat
-
-You will also need to ensure that debian/control contains:
-
-  Build-Depends: debhelper (>= 9.20160815~)
-
-To ensure that debhelper knows about the "beta-tester" compat level.
-
 =head1 NOTES
 
 =head2 Multiple binary package support
diff --git a/debian/changelog b/debian/changelog
index 13880de..3276604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ debhelper (10.10.6) UNRELEASED; urgency=medium
   * Fix typo "belive" in debian/copyright and ancient debian/changelog
     entries.
   * Use HTTPS in debian/copyright format URL.
+  * Remove support for named compat levels.
 
  -- Axel Beckert <abe at debian.org>  Fri, 27 Oct 2017 23:48:44 +0200
 
diff --git a/debian/compat b/debian/compat
index 1f3ada6..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-bleeding-edge-tester
+12
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index 190d376..b92e5fa 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -28,16 +28,6 @@ use constant {
 	'DH_ENABLE_RRR_SUPPORT' => 1,
 };
 
-my %NAMED_COMPAT_LEVELS = (
-	# The bleeding-edge compat level is deliberately not documented.
-	# You are welcome to use it, but please subscribe to the git
-	# commit mails if you do.  There is no heads up on changes for
-	# bleeding-edge testers as it is mainly intended for debhelper
-	# developers.
-	'bleeding-edge-tester' => MAX_COMPAT_LEVEL,
-	'beta-tester'          => BETA_TESTER_COMPAT,
-);
-
 use Errno qw(ENOENT);
 use Exporter qw(import);
 use File::Glob qw(bsd_glob GLOB_CSH GLOB_NOMAGIC GLOB_TILDE);
@@ -666,9 +656,7 @@ sub dirname {
 					$c=$l;
 					$c =~ s/^\s*+//;
 					$c =~ s/\s*+$//;
-					if (exists($NAMED_COMPAT_LEVELS{$c})) {
-						$c = $NAMED_COMPAT_LEVELS{$c};
-					} elsif ($c !~ m/^\d+$/) {
+					if ($c !~ m/^\d+$/) {
 						error("debian/compat must contain a positive number (found: \"$c\")");
 					}
 				}

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