[debhelper-devel] [debhelper] 02/02: Dh_Lib.pm: first line of d/compat must be a number

[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 e54b8679b09bf0e915b7901cc0326008dd5f5205
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Nov 7 10:40:54 2015 +0100

    Dh_Lib.pm: first line of d/compat must be a number
    
    This replaces a warning about the contents not being a number and then
    debhelper erroring out on compat 1 not being supported.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 5 +++++
 debian/changelog           | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index cac077f..53c570f 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -422,6 +422,11 @@ sub dirname {
 				else {
 					chomp $l;
 					$c=$l;
+					$c =~ s/^\s*+//;
+					$c =~ s/\s*+$//;
+					if ($c !~ m/^\d+$/) {
+						error("debian/compat must contain a postive number (found: \"$c\")");
+					}
 				}
 			}
 			else {
diff --git a/debian/changelog b/debian/changelog
index aecfdf4..d620de3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (9.20151005+unreleased) UNRELEASED; urgency=medium
+debhelper (9.20151101+unreleased) UNRELEASED; urgency=medium
 
   [ Niels Thykier ]
   * dh_strip: Sort build-ids to make the Build-Ids header
@@ -28,6 +28,8 @@ debhelper (9.20151005+unreleased) UNRELEASED; urgency=medium
     (Closes: #800738)
   * dh_installinit: Disable initscripts when a package is
     removed (but not yet purged).  (Closes: #749400)
+  * Dh_Lib.pm: Reject debian/compat files where the first
+    line is not entirely a positive number.
 
   [ Translations ]
   * Update German translation (Chris Leick)

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