This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 8c7cbd27c1255d01c21a78e1ead89fe500c94201 Author: Chris Lamb <[email protected]> Date: Tue Dec 19 19:48:59 2017 +0000 Bump the recommended debehlper compat level to 11, emitting a pedantic warning when using lower level. (Closes: #884699) --- data/debhelper/compat-level | 2 +- debian/changelog | 2 ++ t/runtests | 2 +- t/tests/control-file-duplicate/tags | 2 +- t/tests/debhelper-compat-experimental/debian/debian/compat | 2 +- t/tests/debhelper-compat-experimental/tags | 4 ++-- t/tests/debhelper-dh-compat/tags | 2 +- t/tests/debhelper-lacks-versioned-deps/tags | 1 + t/tests/legacy-fields/tags | 1 + t/tests/python-build-depends-on-sphinx-unrel/debian/debian/control.in | 2 +- t/tests/python-build-depends-on-sphinx/debian/debian/control.in | 2 +- .../debian/debian/control.in | 2 +- t/tests/python-python2-no-python3-unrel/debian/debian/control.in | 2 +- t/tests/python-python2-no-python3/debian/debian/control.in | 2 +- .../debian/debian/compat | 0 t/tests/systemd-complex-service-file/debian/debian/compat | 1 + 16 files changed, 17 insertions(+), 12 deletions(-) diff --git a/data/debhelper/compat-level b/data/debhelper/compat-level index 759ed29..4762ae0 100644 --- a/data/debhelper/compat-level +++ b/data/debhelper/compat-level @@ -1,7 +1,7 @@ # warn if no versioned depend below this level pedantic=9 # warn (pedantic) if does not depend on this debhelper level -recommended=9 +recommended=11 # warn if below this level deprecated=9 # warn if equal or above diff --git a/debian/changelog b/debian/changelog index 4bc3205..c58b157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ lintian (2.5.66) UNRELEASED; urgency=medium * data/debhelper/compat-level: + [MR] Bump the experimental debhelper compat level to 12. (Closes: #884678) + + [CL] Bump the recommended debehlper compat level to 11, emitting a + pedantic warning when using lower level. (Closes: #884699) * data/files/js-libraries: + [CL] Detect embedded jQuery libraries with version number in their filenames (eg. jquery-1.10.2.min.js). (Closes: #833613) diff --git a/t/runtests b/t/runtests index ece4a3f..ff0dfb2 100755 --- a/t/runtests +++ b/t/runtests @@ -1074,7 +1074,7 @@ sub check_test_is_sane { $data->{options} ||= '-I -E'; $data->{todo} ||= 'no'; $data->{'test-depends'} //= ''; - $data->{'dh_compat_level'} //= '9'; + $data->{'dh_compat_level'} //= '11'; $data->{'default-build-depends'} //= "debhelper (>= $data->{dh_compat_level}~)"; $data->{'extra-build-depends'} //= ''; diff --git a/t/tests/control-file-duplicate/tags b/t/tests/control-file-duplicate/tags index 2e7ba30..757adc5 100644 --- a/t/tests/control-file-duplicate/tags +++ b/t/tests/control-file-duplicate/tags @@ -2,4 +2,4 @@ P: control-file-duplicate source: duplicate-in-relation-field in control-file-du P: control-file-duplicate source: duplicate-in-relation-field in control-file-duplicate suggests: baz (= 1.0), baz, baz (>= 2.0) P: control-file-duplicate source: duplicate-in-relation-field in source build-conflicts: bar, bar [i386] P: control-file-duplicate source: duplicate-in-relation-field in source build-depends-indep: foobar, foobar -P: control-file-duplicate source: duplicate-in-relation-field in source build-depends: debhelper (>= 9~), debhelper +P: control-file-duplicate source: duplicate-in-relation-field in source build-depends: debhelper (>= 11~), debhelper diff --git a/t/tests/debhelper-compat-experimental/debian/debian/compat b/t/tests/debhelper-compat-experimental/debian/debian/compat index f599e28..48082f7 100644 --- a/t/tests/debhelper-compat-experimental/debian/debian/compat +++ b/t/tests/debhelper-compat-experimental/debian/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/t/tests/debhelper-compat-experimental/tags b/t/tests/debhelper-compat-experimental/tags index 6cd674d..99f075f 100644 --- a/t/tests/debhelper-compat-experimental/tags +++ b/t/tests/debhelper-compat-experimental/tags @@ -1,2 +1,2 @@ -P: debhelper-compat-experimental source: package-uses-experimental-debhelper-compat-version 10 -W: debhelper-compat-experimental source: package-needs-versioned-debhelper-build-depends 10 +P: debhelper-compat-experimental source: package-uses-experimental-debhelper-compat-version 12 +W: debhelper-compat-experimental source: package-needs-versioned-debhelper-build-depends 12 diff --git a/t/tests/debhelper-dh-compat/tags b/t/tests/debhelper-dh-compat/tags index 3256995..13e5bd1 100644 --- a/t/tests/debhelper-dh-compat/tags +++ b/t/tests/debhelper-dh-compat/tags @@ -1,2 +1,2 @@ -E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules=8 compat=9 +E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules=8 compat=11 W: debhelper-dh-compat source: debian-rules-sets-DH_COMPAT line 3 diff --git a/t/tests/debhelper-lacks-versioned-deps/tags b/t/tests/debhelper-lacks-versioned-deps/tags index be16bc9..ec474d4 100644 --- a/t/tests/debhelper-lacks-versioned-deps/tags +++ b/t/tests/debhelper-lacks-versioned-deps/tags @@ -1 +1,2 @@ P: debhelper-lacks-versioned-deps source: package-lacks-versioned-build-depends-on-debhelper 9 +P: debhelper-lacks-versioned-deps source: package-uses-old-debhelper-compat-version 9 diff --git a/t/tests/legacy-fields/tags b/t/tests/legacy-fields/tags index e6b4075..fd9942f 100644 --- a/t/tests/legacy-fields/tags +++ b/t/tests/legacy-fields/tags @@ -13,6 +13,7 @@ W: fields source: debhelper-but-no-misc-depends another-version W: fields source: debhelper-but-no-misc-depends fields W: fields source: debian-revision-not-well-formed 1.5-.3 W: fields source: native-package-with-dash-version +W: fields source: package-needs-versioned-debhelper-build-depends 11 W: fields source: source-nmu-has-incorrect-version-number 1.5-.3 W: fields: debian-revision-not-well-formed 1.5-.3 W: fields: essential-no-not-needed diff --git a/t/tests/python-build-depends-on-sphinx-unrel/debian/debian/control.in b/t/tests/python-build-depends-on-sphinx-unrel/debian/debian/control.in index 9d27c87..06cd8ba 100644 --- a/t/tests/python-build-depends-on-sphinx-unrel/debian/debian/control.in +++ b/t/tests/python-build-depends-on-sphinx-unrel/debian/debian/control.in @@ -3,7 +3,7 @@ Priority: optional Section: python Maintainer: {$author} Standards-Version: {$standards_version} -Build-Depends: debhelper (>= 9), python-sphinx, python3-sphinx +Build-Depends: {$build_depends}, python-sphinx, python3-sphinx Rules-Requires-Root: no Package: python-{$source} diff --git a/t/tests/python-build-depends-on-sphinx/debian/debian/control.in b/t/tests/python-build-depends-on-sphinx/debian/debian/control.in index 1c8084c..bbad708 100644 --- a/t/tests/python-build-depends-on-sphinx/debian/debian/control.in +++ b/t/tests/python-build-depends-on-sphinx/debian/debian/control.in @@ -3,7 +3,7 @@ Priority: optional Section: python Maintainer: {$author} Standards-Version: {$standards_version} -Build-Depends: debhelper (>= 9), python-sphinx +Build-Depends: {$build_depends}, python-sphinx Rules-Requires-Root: no Package: python-{$source} diff --git a/t/tests/python-django-package-does-not-depend-on-django/debian/debian/control.in b/t/tests/python-django-package-does-not-depend-on-django/debian/debian/control.in index b8af0e4..ffd6462 100644 --- a/t/tests/python-django-package-does-not-depend-on-django/debian/debian/control.in +++ b/t/tests/python-django-package-does-not-depend-on-django/debian/debian/control.in @@ -3,7 +3,7 @@ Priority: optional Section: python Maintainer: {$author} Standards-Version: {$standards_version} -Build-Depends: debhelper (>= 9) +Build-Depends: {$build_depends} Rules-Requires-Root: no Package: python-django-positive diff --git a/t/tests/python-python2-no-python3-unrel/debian/debian/control.in b/t/tests/python-python2-no-python3-unrel/debian/debian/control.in index b2d9fbe..5656618 100644 --- a/t/tests/python-python2-no-python3-unrel/debian/debian/control.in +++ b/t/tests/python-python2-no-python3-unrel/debian/debian/control.in @@ -3,7 +3,7 @@ Priority: optional Section: python Maintainer: {$author} Standards-Version: {$standards_version} -Build-Depends: debhelper (>= 9) +Build-Depends: {$build_depends} Rules-Requires-Root: no Package: python-{$source} diff --git a/t/tests/python-python2-no-python3/debian/debian/control.in b/t/tests/python-python2-no-python3/debian/debian/control.in index c01c2be..406edb3 100644 --- a/t/tests/python-python2-no-python3/debian/debian/control.in +++ b/t/tests/python-python2-no-python3/debian/debian/control.in @@ -3,7 +3,7 @@ Priority: optional Section: python Maintainer: {$author} Standards-Version: {$standards_version} -Build-Depends: debhelper (>= 9) +Build-Depends: {$build_depends} Rules-Requires-Root: no Package: python-{$source} diff --git a/t/tests/debhelper-compat-experimental/debian/debian/compat b/t/tests/rules-including-deprecated-makefiles/debian/debian/compat similarity index 100% copy from t/tests/debhelper-compat-experimental/debian/debian/compat copy to t/tests/rules-including-deprecated-makefiles/debian/debian/compat diff --git a/t/tests/systemd-complex-service-file/debian/debian/compat b/t/tests/systemd-complex-service-file/debian/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/t/tests/systemd-complex-service-file/debian/debian/compat @@ -0,0 +1 @@ +9 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
