Bug#811175: lintian: version=4 in debian/watch is now possible
Package: lintian
Version: 2.5.39.1
Severity: normal
Dear Maintainer,
Since the implementation of bug #795804, version=4 is debian/watch is now a valid option.
The attached patch implements it.
Thanks,
Sylvestre
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (900, 'testing'), (600, 'unstable'), (500, 'stable'), (300, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.3.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages lintian depends on:
ii binutils 2.25.90.20160101-2
ii bzip2 1.0.6-8
ii diffstat 1.60-1
ii file 1:5.25-2
ii gettext 0.19.7-2
ii hardening-includes 2.8+nmu2
ii intltool-debian 0.35.0+20060710.4
ii libapt-pkg-perl 0.1.29+b5
ii libarchive-zip-perl 1.56-2
ii libclass-accessor-perl 0.34-1
ii libclone-perl 0.38-1+b1
ii libdpkg-perl 1.18.4
ii libemail-valid-perl 1.198-1
ii libfile-basedir-perl 0.07-1
ii libipc-run-perl 0.94-1
ii liblist-moreutils-perl 0.413-1+b1
ii libparse-debianchangelog-perl 1.2.0-8
ii libperl5.22 [libdigest-sha-perl] 5.22.1-3
ii libtext-levenshtein-perl 0.13-1
ii libtimedate-perl 2.3000-2
ii liburi-perl 1.69-1
ii man-db 2.7.5-1
ii patchutils 0.3.4-1
ii perl 5.22.1-3
ii t1utils 1.39-2
ii xz-utils 5.1.1alpha+20120614-2.1
Versions of packages lintian recommends:
ii dpkg 1.18.4
pn libperlio-gzip-perl <none>
ii perl 5.22.1-3
ii perl-modules-5.22 [libautodie-perl] 5.22.1-3
Versions of packages lintian suggests:
pn binutils-multiarch <none>
ii dpkg-dev 1.18.4
ii libhtml-parser-perl 3.71-2+b1
ii libtext-template-perl 1.46-1
pn libyaml-perl <none>
-- no debconf information
>From 3d89e279ccad5ba303b0b9072156b3800456258b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 16 Jan 2016 13:57:06 +0100
Subject: [PATCH] [SL] debian/watch can be version=4 now since #795804
---
checks/watch-file.desc | 2 +-
checks/watch-file.pm | 2 +-
debian/changelog | 1 +
t/tests/legacy-maintainer-scripts/debian/debian/watch | 2 +-
t/tests/legacy-maintainer-scripts/tags | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/checks/watch-file.desc b/checks/watch-file.desc
index 792c85a..c3860f6 100644
--- a/checks/watch-file.desc
+++ b/checks/watch-file.desc
@@ -36,7 +36,7 @@ Certainty: certain
Ref: uscan(1)
Info: The <tt>version=</tt> line in the <tt>debian/watch</tt> file in this
package declares an unknown version. The currently known watch file
- versions are 2 and 3.
+ versions are 2, 3 and 4
Tag: debian-watch-file-missing-version
Severity: normal
diff --git a/checks/watch-file.pm b/checks/watch-file.pm
index 05eab9c..92b6773 100644
--- a/checks/watch-file.pm
+++ b/checks/watch-file.pm
@@ -78,7 +78,7 @@ sub run {
tag 'debian-watch-file-declares-multiple-versions', "line $.";
}
$watchver = $1;
- if ($watchver ne '2' and $watchver ne '3') {
+ if ($watchver ne '2' and $watchver ne '4') {
tag 'debian-watch-file-unknown-version', $watchver;
}
} else {
diff --git a/debian/changelog b/debian/changelog
index 65a11c5..85388fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ lintian (2.5.40) UNRELEASED; urgency=medium
+ [BR] Apply patch from Chris Lamb <lamby@debian.org>,
warn if debian/watch uses deprecated
githubredir.debian.net scraper (Closes: #803106).
+ + [SL] debian/watch can be version=4 now since #795804
* data/spelling/corrections*:
+ [JW] Add more corrections.
diff --git a/t/tests/legacy-maintainer-scripts/debian/debian/watch b/t/tests/legacy-maintainer-scripts/debian/debian/watch
index 982696c..430eea3 100644
--- a/t/tests/legacy-maintainer-scripts/debian/debian/watch
+++ b/t/tests/legacy-maintainer-scripts/debian/debian/watch
@@ -1,5 +1,5 @@
# A whitespace is fine for uscan:
- version=4
+ version=5
# Following line should not be matched:
#opts=uversionmangle=s/$/+debian/,dversionmangle=s/foo/bar/ \
diff --git a/t/tests/legacy-maintainer-scripts/tags b/t/tests/legacy-maintainer-scripts/tags
index 48fbf15..c633187 100644
--- a/t/tests/legacy-maintainer-scripts/tags
+++ b/t/tests/legacy-maintainer-scripts/tags
@@ -47,7 +47,7 @@ W: maintainer-scripts source: debhelper-but-no-misc-depends maintainer-scripts
W: maintainer-scripts source: debian-watch-file-in-native-package
W: maintainer-scripts source: debian-watch-file-should-mangle-version line 11
W: maintainer-scripts source: debian-watch-file-should-mangle-version line 7
-W: maintainer-scripts source: debian-watch-file-unknown-version 4
+W: maintainer-scripts source: debian-watch-file-unknown-version 5
W: maintainer-scripts source: dfsg-version-in-native-package 7+dfsg-0.1
W: maintainer-scripts source: dm-upload-allowed-is-obsolete
W: maintainer-scripts source: qa-upload-has-incorrect-version-number 7+dfsg-0.1
--
2.6.4
Reply to: