This is an automated email from the git hooks/post-receive script. broucaries-guest pushed a commit to branch master in repository lintian.
commit 2da9916c066849173dd474111cc3b3e136e25ed5 Author: Bastien ROUCARIÈS <[email protected]> Date: Sun Jan 3 14:35:49 2016 +0100 Revert "Fix jenkins build failure" I have commited by error a Chris lamb patch This reverts commit 51d239508edb64b92102f772e7785c6f583bcff5. --- checks/watch-file.desc | 13 ------------- checks/watch-file.pm | 4 ---- debian/changelog | 2 +- t/tests/watch-file-general/debian/debian/watch | 5 +---- t/tests/watch-file-general/desc | 1 - t/tests/watch-file-general/tags | 2 -- 6 files changed, 2 insertions(+), 25 deletions(-) diff --git a/checks/watch-file.desc b/checks/watch-file.desc index 1ae2a8a..1b66da7 100644 --- a/checks/watch-file.desc +++ b/checks/watch-file.desc @@ -116,19 +116,6 @@ Info: The watch file specifies a SourceForge page or download server project and <tt><tar-name></tt> with the name of the tarball distributed within that project. Adjust the filename regex as necessary. -Tag: debian-watch-file-uses-deprecated-githubredir -Severity: important -Certainty: certain -Ref: https://lists.debian.org/debian-devel-announce/2014/10/msg00000.html -Info: The watch file specifies a githubredir.debia.net URL, which is deprecated - Instead, use direct links to the tags page: - . - version=3 - https://github.com/<user>/<project>/tags .*/(.*)\.tar\.gz - . - replacing <tt><user></tt> and <tt><project></tt> with the Github - username and project respectfully. - Tag: debian-watch-file-specifies-wrong-upstream-version Severity: normal Certainty: certain diff --git a/checks/watch-file.pm b/checks/watch-file.pm index 737c25b..46ab633 100644 --- a/checks/watch-file.pm +++ b/checks/watch-file.pm @@ -122,10 +122,6 @@ sub run { if (m,\b\Qhttp://pypi.python.org/\E,) { tag 'debian-watch-file-accesses-pypi-over-http', "line $."; } - if (m%githubredir\.debian\.net%) { - tag 'debian-watch-file-uses-deprecated-githubredir', - "line $."; - } if ( m{ (?:https?|ftp):// diff --git a/debian/changelog b/debian/changelog index 15bf199..60eafe9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ lintian (2.5.40) UNRELEASED; urgency=medium + [JW] Apply patch from Mattia Rizzolo to update the machine-readable copyright format specification URL. (Closes: #809248) + [BR] Improve description text of tag - dep5-copyright-license-name-not-unique. + dep5-copyright-license-name-not-unique. (Closes: #809651). * data/spelling/corrections*: diff --git a/t/tests/watch-file-general/debian/debian/watch b/t/tests/watch-file-general/debian/debian/watch index e322710..71b4717 100644 --- a/t/tests/watch-file-general/debian/debian/watch +++ b/t/tests/watch-file-general/debian/debian/watch @@ -26,7 +26,4 @@ http://pypi.python.org/foo scripts\.([\d.]+)\.tar\.gz debian uupdate # Unsupported PyPI URL. https://pypi.python.org/packages/source/p/pip/ pip-(\S+)\.tar\.gz -# Deprecated githubredir -http://githubredir.debian.net/github/username/project /(.*).tar.gz - -# without any pgpsigurlmangle +# without any pgpsigurlmangle \ No newline at end of file diff --git a/t/tests/watch-file-general/desc b/t/tests/watch-file-general/desc index 0e7a20e..64d09c9 100644 --- a/t/tests/watch-file-general/desc +++ b/t/tests/watch-file-general/desc @@ -15,6 +15,5 @@ Test-For: debian-watch-file-unknown-version debian-watch-file-unsupported-pypi-url debian-watch-file-uses-deprecated-sf-redirector-method - debian-watch-file-uses-deprecated-githubredir debian-watch-may-check-gpg-signature References: Debian Bug#510398 diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags index 1c54f22..a80f45b 100644 --- a/t/tests/watch-file-general/tags +++ b/t/tests/watch-file-general/tags @@ -1,5 +1,4 @@ E: watch-file-general source: debian-watch-file-unsupported-pypi-url line 27 -E: watch-file-general source: debian-watch-file-uses-deprecated-githubredir line 30 I: watch-file-general source: debian-watch-file-accesses-pypi-over-http line 24 I: watch-file-general source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5 P: watch-file-general source: debian-watch-may-check-gpg-signature @@ -9,7 +8,6 @@ W: watch-file-general source: debian-watch-file-should-mangle-version line 12 W: watch-file-general source: debian-watch-file-should-mangle-version line 14 W: watch-file-general source: debian-watch-file-should-mangle-version line 15 W: watch-file-general source: debian-watch-file-should-mangle-version line 27 -W: watch-file-general source: debian-watch-file-should-mangle-version line 30 W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 12 W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 14 W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 15 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
