[SCM] Debian package checker branch, master, updated. 2.1.3-53-g020d7aa
The following commit has been merged in the master branch:
commit 020d7aa59ad6e548d0a3d49fb6b158447a88a088
Author: Russ Allbery <rra@debian.org>
Date: Thu Jan 1 08:39:07 2009 -0800
Recognize additional SourceForge URLs in watch files
* checks/watch-file:
+ [RA] Recognize additional SourceForge URLs and recommend the
redirector. Thanks, Riccardo Stagni. (Closes: #510398)
diff --git a/checks/watch-file b/checks/watch-file
index 0195841..088640f 100644
--- a/checks/watch-file
+++ b/checks/watch-file
@@ -101,7 +101,9 @@ while (<WATCH>) {
"line $.";
}
- if (m%(https?|ftp)://((.+\.)?dl|(pr)?downloads?|ftp\d?)\.(sourceforge|sf)\.net%) {
+ if (m%(https?|ftp)://((.+\.)?dl|(pr)?downloads?|ftp\d?|upload)\.(sourceforge|sf)\.net%
+ or m%https?://(www\.)?(sourceforge|sf)\.net/project/showfiles\.php%
+ or m%https?://(www\.)?(sourceforge|sf)\.net/projects/.+/files%) {
tag 'debian-watch-file-should-use-sf-redirector', "line $.";
}
diff --git a/debian/changelog b/debian/changelog
index 67c6331..9669365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,9 @@ lintian (2.1.4) UNRELEASED; urgency=low
without using invoke-rc.d. Based on a patch by Raphael Geissert.
(Closes: #381485)
+ [RA] Allow dpkg-dev to satisfy a make dependency. (Closes: #510190)
+ * checks/watch-file:
+ + [RA] Recognize additional SourceForge URLs and recommend the
+ redirector. Thanks, Riccardo Stagni. (Closes: #510398)
* collection/copyright-file:
+ [RA] Copy copyright files that are relative links, provided that the
diff --git a/t/tests/6000_watch-file-general.desc b/t/tests/6000_watch-file-general.desc
new file mode 100644
index 0000000..4bbe161
--- /dev/null
+++ b/t/tests/6000_watch-file-general.desc
@@ -0,0 +1,11 @@
+Testname: watch-file-general
+Type: non-native
+Version: 2.0-1
+Description: General watch file checks
+Test-For:
+ debian-watch-file-declares-multiple-versions
+ debian-watch-file-should-dversionmangle-not-uversionmangle
+ debian-watch-file-should-use-sf-redirector
+ debian-watch-file-unknown-version
+ debian-watch-file-uses-deprecated-sf-redirector-method
+References: Debian Bug#510398
diff --git a/t/tests/basic-non-native/upstream/README b/t/tests/watch-file-general/debian/README
similarity index 100%
copy from t/tests/basic-non-native/upstream/README
copy to t/tests/watch-file-general/debian/README
diff --git a/t/tests/watch-file-general/debian/debian/changelog.in b/t/tests/watch-file-general/debian/debian/changelog.in
new file mode 100644
index 0000000..bbc583e
--- /dev/null
+++ b/t/tests/watch-file-general/debian/debian/changelog.in
@@ -0,0 +1,14 @@
+{$srcpkg} ({$version}) unstable; urgency=low
+
+ * Lintian Test Suite.
+ * Test: {$testname}
+
+ * Suppress "should close ITP bug" messages. (Closes: #123456)
+
+ -- {$author} {$date}
+
+{$srcpkg} (1.0-1) unstable; urgency=low
+
+ * Provoke debian-watch-file-specifies-old-upstream-version.
+
+ -- {$author} Thu, 01 Jan 2009 08:34:20 -0800
diff --git a/t/tests/watch-file-general/debian/debian/watch b/t/tests/watch-file-general/debian/debian/watch
new file mode 100644
index 0000000..0d82b8e
--- /dev/null
+++ b/t/tests/watch-file-general/debian/debian/watch
@@ -0,0 +1,18 @@
+# watch file with upstream version mangling
+
+version=2
+opts="uversionmangle=s/$/ds/" \
+http://qa.debian.org/watch/sf.php?project=foo scripts\.([\d.]+)\.tar\.gz debian uupdate
+
+version=3
+http://ftp.sf.net/foo/foo_bar(.+)\.Z 5 uupdate
+
+# Test additional Sourceforge patterns. (See Bug#510398)
+ftp://upload.sourceforge.net/pub/sourceforge/s/so/soprano/ \
+ soprano-(.*)\.tar\.bz2
+http://sourceforge.net/project/showfiles.php?group_id=100501 \
+ .*/octaviz/octaviz-([\d\.]+).tar.gz.*
+http://sourceforge.net/projects/synce/files http://downloads.sourceforge.net/.+/kcemirror-(.+).tar.gz.*
+
+# Unknown version number.
+version=42
diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags
new file mode 100644
index 0000000..10f7455
--- /dev/null
+++ b/t/tests/watch-file-general/tags
@@ -0,0 +1,8 @@
+W: watch-file-general source: debian-watch-file-declares-multiple-versions line 18
+W: watch-file-general source: debian-watch-file-declares-multiple-versions line 7
+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
+W: watch-file-general source: debian-watch-file-should-use-sf-redirector line 8
+W: watch-file-general source: debian-watch-file-unknown-version 42
+W: watch-file-general source: debian-watch-file-uses-deprecated-sf-redirector-method line 5
diff --git a/t/tests/basic-non-native/upstream/README b/t/tests/watch-file-general/upstream/README
similarity index 100%
copy from t/tests/basic-non-native/upstream/README
copy to t/tests/watch-file-general/upstream/README
--
Debian package checker
Reply to: