[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.12-44-ga2a402c



The following commit has been merged in the master branch:
commit 041bda346bc575980336110f630d6d2f1cbacdd1
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 5 01:44:24 2009 -0700

    Add new-style tests for the remaining tags in dh7-test
    
    Add new-style tests for the two tags revealed by dh7-test that weren't
    otherwise covered and remove the legacy test case.

diff --git a/t/COVERAGE b/t/COVERAGE
index c7a50e5..50eb239 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -564,9 +564,7 @@ version-substvars substvar-source-version-is-deprecated
 version-substvars version-substvar-for-external-package
 
 watch-file debian-watch-file-in-native-package
-watch-file debian-watch-file-should-mangle-version
 watch-file debian-watch-file-specifies-old-upstream-version
-watch-file debian-watch-file-specifies-wrong-upstream-version
 
 Breakdown of remaining tags in legacy test suite by test case:
 
@@ -715,8 +713,6 @@ debug
   version-substvar-for-external-package
 
 dh7-test
-  debian-watch-file-should-mangle-version
-  debian-watch-file-specifies-wrong-upstream-version
 
 diffs
   arch-independent-package-contains-binary-or-object
diff --git a/t/tests/watch-file-general/debian/debian/watch b/t/tests/watch-file-general/debian/debian/watch
index 0d82b8e..a39a05b 100644
--- a/t/tests/watch-file-general/debian/debian/watch
+++ b/t/tests/watch-file-general/debian/debian/watch
@@ -16,3 +16,6 @@ http://sourceforge.net/projects/synce/files http://downloads.sourceforge.net/.+/
 
 # Unknown version number.
 version=42
+
+# Specifies the same version number as the package.
+http://example.com/ foo([\d.]+)\.tar\.gz 2.0.ds1-1 uupdate
diff --git a/t/tests/watch-file-general/desc b/t/tests/watch-file-general/desc
index b30e808..d00a66f 100644
--- a/t/tests/watch-file-general/desc
+++ b/t/tests/watch-file-general/desc
@@ -7,6 +7,7 @@ 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-specifies-wrong-upstream-version
  debian-watch-file-unknown-version
  debian-watch-file-uses-deprecated-sf-redirector-method
 References: Debian Bug#510398
diff --git a/t/tests/watch-file-general/tags b/t/tests/watch-file-general/tags
index 46735d0..55c62ea 100644
--- a/t/tests/watch-file-general/tags
+++ b/t/tests/watch-file-general/tags
@@ -5,5 +5,6 @@ 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-specifies-wrong-upstream-version 2.0.ds1-1 line 21
 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-with-epoch/upstream/README b/t/tests/watch-file-should-mangle/debian/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/watch-file-should-mangle/debian/README
diff --git a/testset/dh7-test/debian/watch b/t/tests/watch-file-should-mangle/debian/debian/watch
similarity index 59%
rename from testset/dh7-test/debian/watch
rename to t/tests/watch-file-should-mangle/debian/debian/watch
index d7fea6a..92203ca 100644
--- a/testset/dh7-test/debian/watch
+++ b/t/tests/watch-file-should-mangle/debian/debian/watch
@@ -2,4 +2,4 @@
 # package version number.
 
 version=2
-http://www.example.com/dist/ dh7-test\.([\d.]+)\.tar\.gz 1.dfsg-1 uupdate
+http://www.example.com/dist/ dh7-test\.([\d.]+)\.tar\.gz debian uupdate
diff --git a/t/tests/watch-file-should-mangle/desc b/t/tests/watch-file-should-mangle/desc
new file mode 100644
index 0000000..9a6fe53
--- /dev/null
+++ b/t/tests/watch-file-should-mangle/desc
@@ -0,0 +1,6 @@
+Testname: watch-file-should-mangle
+Sequence: 6000
+Type: non-native
+Version: 1+dfsg-1
+Description: Watch file should mangle version
+Test-For: debian-watch-file-should-mangle-version
diff --git a/t/tests/init.d-symlink/debian/debian/postinst b/t/tests/watch-file-should-mangle/tags
old mode 100755
new mode 100644
similarity index 52%
copy from t/tests/init.d-symlink/debian/debian/postinst
copy to t/tests/watch-file-should-mangle/tags
index ed6bc65..8e3a451
--- a/t/tests/init.d-symlink/debian/debian/postinst
+++ b/t/tests/watch-file-should-mangle/tags
@@ -1,4 +1 @@
-#!/bin/sh
-set -e
-update-rc.d lintian defaults >/dev/null
-#DEBHELPER#
+W: watch-file-should-mangle source: debian-watch-file-should-mangle-version
diff --git a/t/tests/basic-non-native-with-epoch/upstream/README b/t/tests/watch-file-should-mangle/upstream/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/watch-file-should-mangle/upstream/README
diff --git a/testset/dh7-test/debian/changelog b/testset/dh7-test/debian/changelog
deleted file mode 100644
index 0281294..0000000
--- a/testset/dh7-test/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-dh7-test (1.dfsg-1) unstable; urgency=low
-
-  * Initial release
-
- -- Frank Lichtenheld <djpig@debian.org>  Wed, 04 Jun 2008 15:53:27 -0700
-
diff --git a/testset/dh7-test/debian/compat b/testset/dh7-test/debian/compat
deleted file mode 100644
index 1e8b314..0000000
--- a/testset/dh7-test/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/testset/dh7-test/debian/control b/testset/dh7-test/debian/control
deleted file mode 100644
index 1bc46a7..0000000
--- a/testset/dh7-test/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: dh7-test
-Section: devel
-Priority: optional
-Maintainer: Lintian Maintainers <debian-lint-maint@lists.debian.org>
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.8.0
-
-Package: dh7-test
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Checks related to the dh build utility
- New in debhelper 7.
- .
- This is a test package designed to exercise some feature or tag of
- Lintian.  It is part of the Lintian test suite and may do very odd
- things.  It should not be installed like a regular package.
diff --git a/testset/dh7-test/debian/copyright b/testset/dh7-test/debian/copyright
deleted file mode 100644
index 355bfc1..0000000
--- a/testset/dh7-test/debian/copyright
+++ /dev/null
@@ -1,5 +0,0 @@
-This package was debianized by Frank Lichtenheld <djpig@debian.org> on
-Thu,  4 Aug 2005 23:09:00 +0200.
-
-Test copyright date handling:
-Copyright 2005, 2008 Frank Lichtenheld
diff --git a/testset/dh7-test/debian/foo.desktop b/testset/dh7-test/debian/foo.desktop
deleted file mode 100644
index 8b13789..0000000
--- a/testset/dh7-test/debian/foo.desktop
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/testset/dh7-test/debian/rules b/testset/dh7-test/debian/rules
deleted file mode 100755
index 14b3e4b..0000000
--- a/testset/dh7-test/debian/rules
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-export DH_VERBOSE = 1
-
-clean build binary-indep binary:
-	dh $@
-
-.PHONY: clean build binary-arch binary-indep binary
diff --git a/testset/dh7-test_1.dfsg.orig.tar.gz b/testset/dh7-test_1.dfsg.orig.tar.gz
deleted file mode 100644
index 1f69199..0000000
Binary files a/testset/dh7-test_1.dfsg.orig.tar.gz and /dev/null differ

-- 
Debian package checker


Reply to: