[lintian] 01/02: Update tests, etc. after 04f5f6facceb9.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit a2250a47931069e28013f0a72c0cffd91e38f80f
Author: Chris Lamb <lamby@debian.org>
Date: Sun Mar 18 22:19:04 2018 -0400
Update tests, etc. after 04f5f6facceb9.
---
checks/fields.desc | 18 +++---------------
.../debian/debian/control.in | 3 ++-
t/tests/fields-malformed-vcs-fields/tags | 2 ++
t/tests/fields-uncanonical-vcs-fields/tags | 5 +++++
.../debian/debian/control.in | 4 ++--
t/tests/fields-vcs-field-insecure-uri/tags | 4 ++--
t/tests/fields-vcs-fields/tags | 5 +++++
7 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/checks/fields.desc b/checks/fields.desc
index d9f3dba..a832039 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -1395,7 +1395,9 @@ Info: The specified Vcs-* field points to an area within the *.debian.org
After 1st May 2018, Debian will not offer hosting for any version
control system other than Git and the Alioth service will become
read-only in May 2018. Packages should migrate to Git hosting on
- https://salsa.debian.org.
+ .
+ For further information about salsa.debian.org, including how to add
+ HTTP redirects from alioth, please consult the Debian Wiki.
Ref: https://lists.debian.org/debian-devel-announce/2017/08/msg00008.html,
https://wiki.debian.org/Salsa
@@ -1495,17 +1497,3 @@ Info: This package has a relationship with a mail-transport-agent but
Please change the dependency to:
.
default-mta | pkgname | mail-transport-agent
-
-Tag: vcs-field-uses-deprecated-infrastructure
-Severity: normal
-Certainty: certain
-Info: The specified Vcs-* field contains a URL pointing to the
- deprecated alioth.debian.org infrastructure. This server will become
- read-only in May 2018.
- .
- Packages should migrate to Git hosting on https://salsa.debian.org/.
- .
- For further information about salsa.debian.org, including how to add
- HTTP redirects from alioth, please consult the Debian Wiki.
-Ref: https://lists.debian.org/debian-devel-announce/2017/08/msg00008.html,
- https://wiki.debian.org/Salsa
diff --git a/t/tests/fields-malformed-vcs-fields-unrel/debian/debian/control.in b/t/tests/fields-malformed-vcs-fields-unrel/debian/debian/control.in
index 8a89a48..ec2592c 100644
--- a/t/tests/fields-malformed-vcs-fields-unrel/debian/debian/control.in
+++ b/t/tests/fields-malformed-vcs-fields-unrel/debian/debian/control.in
@@ -5,7 +5,8 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
Rules-Requires-Root: no
-Vcs-Git: https://anonscm.debian.org/test/test.git -b valid/syntax
+Vcs-Git: https://salsa.debian.org/test/test.git -b valid/syntax
+Vcs-Browser: https://salsa.debian.org/test/test
Package: {$source}
Architecture: {$architecture}
diff --git a/t/tests/fields-malformed-vcs-fields/tags b/t/tests/fields-malformed-vcs-fields/tags
index c2075a3..9a5f36e 100644
--- a/t/tests/fields-malformed-vcs-fields/tags
+++ b/t/tests/fields-malformed-vcs-fields/tags
@@ -1,4 +1,6 @@
I: fields-malformed-vcs-fields source: vcs-fields-use-more-than-one-vcs git svn
+W: fields-malformed-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-git https://anonscm.debian.org/test/test.git --branch wrong
+W: fields-malformed-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-svn svn+ssh://svn.debian.org/svn/foobar/trunk
W: fields-malformed-vcs-fields source: vcs-field-has-unexpected-spaces vcs-git https://anonscm.debian.org/test/test.git --branch wrong
W: fields-malformed-vcs-fields source: vcs-field-uses-not-recommended-uri-format vcs-svn svn+ssh://svn.debian.org/svn/foobar/trunk
W: fields-malformed-vcs-fields source: vcs-field-uses-unknown-uri-format vcs-browser svn.debian.org/wsvn/foobar/trunk
diff --git a/t/tests/fields-uncanonical-vcs-fields/tags b/t/tests/fields-uncanonical-vcs-fields/tags
index 535f8e9..22f6f94 100644
--- a/t/tests/fields-uncanonical-vcs-fields/tags
+++ b/t/tests/fields-uncanonical-vcs-fields/tags
@@ -7,6 +7,11 @@ I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-git git
I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-hg http://hg.debian.org/hg/foobar/pkg/foobar
I: fields-uncanonical-vcs-fields source: vcs-field-uses-insecure-uri vcs-svn svn://svn.debian.org/svn/foobar/trunk
I: fields-uncanonical-vcs-fields source: vcs-fields-use-more-than-one-vcs bzr cvs git hg mtn svn
+W: fields-uncanonical-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-browser https://svn.debian.org/wsvn/foobar/trunk?foo=bar;op=log;something=else
+W: fields-uncanonical-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-bzr nosmart+http://bzr.debian.org/bzr/collab-maint/foobar
+W: fields-uncanonical-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-git git://git.debian.org/~djpig/foobar.git -b master
+W: fields-uncanonical-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-hg http://hg.debian.org/hg/foobar/pkg/foobar
+W: fields-uncanonical-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-svn svn://svn.debian.org/svn/foobar/trunk
W: fields-uncanonical-vcs-fields source: vcs-field-bitrotted :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/foobar :pserver:anonymous@anonscm.debian.org:/cvs/foobar
W: fields-uncanonical-vcs-fields source: vcs-field-bitrotted https://svn.debian.org/wsvn/foobar/trunk?foo=bar;op=log;something=else https://anonscm.debian.org/viewvc/foobar/trunk?foo=bar;something=else
W: fields-uncanonical-vcs-fields source: vcs-git-uses-invalid-user-uri git://git.debian.org/~djpig/foobar.git https://anonscm.debian.org/git/users/djpig/foobar.git
diff --git a/t/tests/fields-vcs-field-insecure-uri/debian/debian/control.in b/t/tests/fields-vcs-field-insecure-uri/debian/debian/control.in
index 1864b1e..9ac3ded 100644
--- a/t/tests/fields-vcs-field-insecure-uri/debian/debian/control.in
+++ b/t/tests/fields-vcs-field-insecure-uri/debian/debian/control.in
@@ -5,8 +5,8 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
Rules-Requires-Root: no
-Vcs-Browser: http://anonscm.debian.org/git/users/toddy/foobar.git
-Vcs-Git: git://anonscm.debian.org/users/toddy/foobar.git
+Vcs-Browser: http://salsa.debian.org/toddy/foobar
+Vcs-Git: git://salsa.debian.org/users/toddy/foobar.git
Package: {$source}
Architecture: {$architecture}
diff --git a/t/tests/fields-vcs-field-insecure-uri/tags b/t/tests/fields-vcs-field-insecure-uri/tags
index 1d4338b..35a716b 100644
--- a/t/tests/fields-vcs-field-insecure-uri/tags
+++ b/t/tests/fields-vcs-field-insecure-uri/tags
@@ -1,2 +1,2 @@
-I: fields-vcs-field-insecure-uri source: vcs-field-uses-insecure-uri vcs-browser http://anonscm.debian.org/git/users/toddy/foobar.git
-I: fields-vcs-field-insecure-uri source: vcs-field-uses-insecure-uri vcs-git git://anonscm.debian.org/users/toddy/foobar.git
+I: fields-vcs-field-insecure-uri source: vcs-field-uses-insecure-uri vcs-browser http://salsa.debian.org/toddy/foobar
+I: fields-vcs-field-insecure-uri source: vcs-field-uses-insecure-uri vcs-git git://salsa.debian.org/users/toddy/foobar.git
diff --git a/t/tests/fields-vcs-fields/tags b/t/tests/fields-vcs-fields/tags
index 248a083..3949cbf 100644
--- a/t/tests/fields-vcs-fields/tags
+++ b/t/tests/fields-vcs-fields/tags
@@ -3,4 +3,9 @@ I: fields-vcs-fields source: vcs-field-uses-insecure-uri vcs-cvs :pserver:anonym
I: fields-vcs-fields source: vcs-field-uses-insecure-uri vcs-svn svn://anonscm.debian.org/foobar/trunk
I: fields-vcs-fields source: vcs-fields-use-more-than-one-vcs bzr cvs git hg mtn svn
W: fields-vcs-fields source: vcs-browser-links-to-empty-view https://anonscm.debian.org/viewvc/foobar/trunk?rev=0&sc=0
+W: fields-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-browser https://anonscm.debian.org/viewvc/foobar/trunk?rev=0&sc=0
+W: fields-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-bzr nosmart+http://anonscm.debian.org/bzr/collab-maint/foobar
+W: fields-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-git https://anonscm.debian.org/users/djpig/foobar.git -b master
+W: fields-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-hg https://anonscm.debian.org/hg/foobar/pkg/foobar
+W: fields-vcs-fields source: vcs-deprecated-in-debian-infrastructure vcs-svn svn://anonscm.debian.org/foobar/trunk
W: fields-vcs-fields source: vcs-field-uses-not-recommended-uri-format vcs-mtn www.example.org org.debian.foobar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: