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

[SCM] Debian package checker branch, master, updated. 2.5.1-208-g8584996



The following commit has been merged in the master branch:
commit 85849967418ababd4a206431ddbf0deafd29a72b
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Aug 8 00:39:29 2011 +0200

    t/runtests: Added support for skel and templates for all suites
    
    The debs and source test suites now also supports skeletons and
    templates.  With this a lot of cruft (copy/waste) have also been
    removed from the test suites.

diff --git a/t/debs/README b/t/debs/README
index 3621c8b..4d01906 100644
--- a/t/debs/README
+++ b/t/debs/README
@@ -42,6 +42,12 @@ before creating the deb.
 Note that t/helper/bin/create-deb can handle most of the common deb
 creation cases;  the Makefile can assume this script is in PATH.
 
+The desc file
+-------------
+
+Please refer to t/tests/README for the full description of the desc
+file.
+
 Skipping tests
 --------------
 
diff --git a/t/debs/control-field-traversal-4/changelog b/t/debs/control-field-traversal-4/changelog
deleted file mode 100644
index 1de8162..0000000
--- a/t/debs/control-field-traversal-4/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-control-field-traversal-4 (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/control-files-bad/changelog b/t/debs/control-files-bad/changelog
deleted file mode 100644
index 23d3783..0000000
--- a/t/debs/control-files-bad/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-control-files-bad (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/control-files-weird-files/changelog b/t/debs/control-files-weird-files/changelog
deleted file mode 100644
index 2e50ecf..0000000
--- a/t/debs/control-files-weird-files/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-control-files-weird-files (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/control-files-weird-files/copyright b/t/debs/control-files-weird-files/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/control-files-weird-files/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/copyright-file-foreign-package/changelog b/t/debs/copyright-file-foreign-package/changelog
deleted file mode 100644
index 52ae309..0000000
--- a/t/debs/copyright-file-foreign-package/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-copyright-file-foreign-package (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/deb-format-ancient-file/changelog b/t/debs/deb-format-ancient-file/changelog
deleted file mode 100644
index 4235564..0000000
--- a/t/debs/deb-format-ancient-file/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-deb-format-ancient-file (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/deb-format-ancient-file/copyright b/t/debs/deb-format-ancient-file/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/deb-format-ancient-file/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/deb-format-extra-member/changelog b/t/debs/deb-format-extra-member/changelog
deleted file mode 100644
index 00205ac..0000000
--- a/t/debs/deb-format-extra-member/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-deb-format-wrong-order (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Thu, 01 Jan 2009 08:34:20 -0800
diff --git a/t/debs/deb-format-extra-member/copyright b/t/debs/deb-format-extra-member/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/deb-format-extra-member/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/deb-format-lzma/changelog b/t/debs/deb-format-lzma/changelog
deleted file mode 100644
index 2fbdc04..0000000
--- a/t/debs/deb-format-lzma/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-deb-format-lzma (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/deb-format-lzma/copyright b/t/debs/deb-format-lzma/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/deb-format-lzma/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/deb-format-record-size/changelog b/t/debs/deb-format-record-size/changelog
deleted file mode 100644
index b28456d..0000000
--- a/t/debs/deb-format-record-size/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-deb-format-record-size (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/deb-format-record-size/copyright b/t/debs/deb-format-record-size/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/deb-format-record-size/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/deb-format-wrong-order/changelog b/t/debs/deb-format-wrong-order/changelog
deleted file mode 100644
index 00205ac..0000000
--- a/t/debs/deb-format-wrong-order/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-deb-format-wrong-order (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Thu, 01 Jan 2009 08:34:20 -0800
diff --git a/t/debs/deb-format-wrong-order/copyright b/t/debs/deb-format-wrong-order/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/deb-format-wrong-order/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/description-synopsis-spaces/changelog b/t/debs/description-synopsis-spaces/changelog
deleted file mode 100644
index 49c4457..0000000
--- a/t/debs/description-synopsis-spaces/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-description-synopsis-spaces (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/description-synopsis-spaces/copyright b/t/debs/description-synopsis-spaces/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/description-synopsis-spaces/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-general-bad/changelog b/t/debs/fields-general-bad/changelog
deleted file mode 100644
index 0f7dfa9..0000000
--- a/t/debs/fields-general-bad/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-fields-general-bad (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/fields-general-bad/copyright b/t/debs/fields-general-bad/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/fields-general-bad/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-general-missing/changelog b/t/debs/fields-general-missing/changelog
deleted file mode 100644
index 52d2eaa..0000000
--- a/t/debs/fields-general-missing/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-fields-general-missing (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/fields-general-missing/copyright b/t/debs/fields-general-missing/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/fields-general-missing/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-malformed-source/changelog b/t/debs/fields-malformed-source/changelog
deleted file mode 100644
index 8eceb4d..0000000
--- a/t/debs/fields-malformed-source/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-fields-malformed-source (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/fields-malformed-source/copyright b/t/debs/fields-malformed-source/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/fields-malformed-source/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-multi-arch-illegal/changelog b/t/debs/fields-multi-arch-illegal/changelog
deleted file mode 100644
index 31ae166..0000000
--- a/t/debs/fields-multi-arch-illegal/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-fields-multi-arch-illegal (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/fields-multi-arch-illegal/copyright b/t/debs/fields-multi-arch-illegal/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/fields-multi-arch-illegal/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-multi-arch-unknown/changelog b/t/debs/fields-multi-arch-unknown/changelog
deleted file mode 100644
index c8bfe34..0000000
--- a/t/debs/fields-multi-arch-unknown/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-fields-multi-arch-unknown (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:34:21 -0800
diff --git a/t/debs/fields-multi-arch-unknown/copyright b/t/debs/fields-multi-arch-unknown/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/fields-multi-arch-unknown/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-obsolete-relation/changelog b/t/debs/fields-obsolete-relation/changelog
deleted file mode 100644
index b30cd3b..0000000
--- a/t/debs/fields-obsolete-relation/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-fields-obsolete-relation (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Thu, 24 Dec 2009 15:23:13 -0800
-
diff --git a/t/debs/fields-obsolete-relation/copyright b/t/debs/fields-obsolete-relation/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/debs/fields-obsolete-relation/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/debs/fields-wildcard-binary/changelog b/t/debs/fields-wildcard-binary/changelog
deleted file mode 100644
index 5bd2d73..0000000
--- a/t/debs/fields-wildcard-binary/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-fields-wildcard-binary (1.0) unstable; urgency=low
-
-  * A Lintian test case.
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Thu, 24 Dec 2009 15:23:13 -0800
-
diff --git a/t/debs/fields-wildcard-binary/copyright b/t/debs/fields-wildcard-binary/copyright
deleted file mode 100644
index 96dde6f..0000000
--- a/t/debs/fields-wildcard-binary/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009, 2010 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/runtests b/t/runtests
index a7d3f21..d45812c 100755
--- a/t/runtests
+++ b/t/runtests
@@ -71,7 +71,9 @@ our $ARCHITECTURE = `dpkg-architecture -qDEB_HOST_ARCH`;
 chomp $ARCHITECTURE;
 
 my %TEMPLATES = (
-    'tests' => ['debian/changelog', 'debian/control'],
+    'tests'  => ['debian/changelog', 'debian/control'],
+    'debs'   => ['changelog', 'control'],
+    'source' => ['changelog', 'control'],
 );
 my $DATE = `date -R`;
 chomp $DATE;
@@ -251,7 +253,7 @@ foreach my $tsi (['debs', "$TESTSET/debs/*/desc", sub { generic_test_runner('deb
     if ($singletest) {
 	my $test = $singletest;
 	if (-d "$TESTSET/$tdir/$test") {
-	    @tests = ($test);
+	    @tests = read_dpkg_control("$TESTSET/$tdir/$test/desc");
 	} elsif (-f "$LINTIAN_ROOT/checks/$singletest.desc"){
 	    @tests = map { read_dpkg_control($_) } <$TESTSET/tests/$singletest-*/desc>;
 	}
@@ -314,11 +316,13 @@ sub find_tests_for_tag {
 
 
 sub copy_template_dir {
-    my ($skel, $tsrc, $targetdir, $exskel) = @_;
+    my ($skel, $tsrc, $targetdir, $exskel, $extsrc) = @_;
     my @exs = ();
+    my @ext = ();
     @exs = @$exskel if $exskel;
+    @ext = @$extsrc if $extsrc;
     runsystem('rsync', '-rpc', "$skel/", "$targetdir/", @exs);
-    runsystem('rsync', '-rpc', "$tsrc/", "$targetdir/")
+    runsystem('rsync', '-rpc', "$tsrc/", "$targetdir/", @ext)
 	if -d "$tsrc/";
 }
 
@@ -521,7 +525,7 @@ sub generic_find_test_for_tag {
 # Returns a truth value on success, undef on test failure.  May call die/fail
 # if the test is broken.
 sub generic_test_runner {
-    my ($dir, $ext, $testdata) = @_;
+    my ($suite, $ext, $testdata) = @_;
 
     if (!check_test_is_sane($TESTSET, $testdata)) {
 	msg_print "Skipping test $testdata->{testname} $testdata->{version}... architecture mismatch\n";
@@ -532,8 +536,9 @@ sub generic_test_runner {
 
     msg_print "Running $test... ";
 
-    my $testdir = "$TESTSET/$dir/$test";
+    my $testdir = "$TESTSET/$suite/$test";
     my $targetdir = "$RUNDIR/$test";
+    my $tmpldir = "$TESTSET/templates/$suite/";
     if (-f "$testdir/skip") {
 	msg_print "skipped.\n";
 	return 1;
@@ -543,6 +548,17 @@ sub generic_test_runner {
     runsystem_ok('rm', '-rf', $targetdir);
     runsystem('cp', '-rp', $testdir, $targetdir);
 
+    my $skel = $testdata->{skeleton};
+
+    copy_template_dir("$tmpldir/$skel", "$testdir/", $targetdir,
+		      ['--exclude=changelog'], ['--exclude=desc']);
+
+    foreach my $tfile (@{ $TEMPLATES{$suite} }) {
+	unless (-e "$targetdir/$tfile") {
+	    fill_in_tmpl("$targetdir/$tfile", $testdata);
+	}
+    }
+
     msg_print 'building... ';
     my $res = system("cd $targetdir && fakeroot make >../build.$test 2>&1");
     if ($res){
diff --git a/t/source/README b/t/source/README
index 54df98b..a268f4c 100644
--- a/t/source/README
+++ b/t/source/README
@@ -35,6 +35,12 @@ file, such as running dpkg-source.
 The Makefile does not have to clean up after itself.  It can assume
 that the directory is deleted and recreated between test runs.
 
+The desc file
+-------------
+
+Please refer to t/tests/README for the full description of the desc
+file.
+
 Skipping tests
 --------------
 
diff --git a/t/source/changelog-file-symlink/copyright b/t/source/changelog-file-symlink/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/changelog-file-symlink/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/control-field-traversal-1/changelog b/t/source/control-field-traversal-1/changelog
deleted file mode 100644
index 6a99b6e..0000000
--- a/t/source/control-field-traversal-1/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-control-field-traversal-1 (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: control-field-traversal-1
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Mon, 28 Jun 2010 01:01:01 -0001
diff --git a/t/source/control-field-traversal-1/control b/t/source/control-field-traversal-1/control
deleted file mode 100644
index 2080301..0000000
--- a/t/source/control-field-traversal-1/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: control-field-traversal-1
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: control-field-traversal-1
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Test for directory traversal issues via field names or values
- 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/t/source/control-field-traversal-1/copyright b/t/source/control-field-traversal-1/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/control-field-traversal-1/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/control-field-traversal-1/rules b/t/source/control-field-traversal-1/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/control-field-traversal-1/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/control-field-traversal-2/changelog b/t/source/control-field-traversal-2/changelog
deleted file mode 100644
index f7155d5..0000000
--- a/t/source/control-field-traversal-2/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-control-field-traversal-2 (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: control-field-traversal-2
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 25 Jul 2010 20:02:21 -0700
diff --git a/t/source/control-field-traversal-2/control b/t/source/control-field-traversal-2/control
deleted file mode 100644
index 211e0d1..0000000
--- a/t/source/control-field-traversal-2/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: control-field-traversal-2
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: control-field-traversal-2
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Test for directory traversal issues via field names or values
- 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/t/source/control-field-traversal-2/copyright b/t/source/control-field-traversal-2/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/control-field-traversal-2/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/control-field-traversal-2/dsc.in b/t/source/control-field-traversal-2/dsc.in
index ffa2b76..01144a6 100644
--- a/t/source/control-field-traversal-2/dsc.in
+++ b/t/source/control-field-traversal-2/dsc.in
@@ -4,7 +4,7 @@ Binary: ../../control-field-traversal-2
 Architecture: all
 Version: 1
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7)
 Checksums-Sha1:
  @SHA1@ @SIZE@ control-field-traversal-2_1.tar.gz
diff --git a/t/source/control-field-traversal-2/rules b/t/source/control-field-traversal-2/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/control-field-traversal-2/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/control-field-traversal-3/changelog b/t/source/control-field-traversal-3/changelog
deleted file mode 100644
index a3c2c75..0000000
--- a/t/source/control-field-traversal-3/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-control-field-traversal-3 (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: control-field-traversal-3
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Mon, 28 Jun 2010 01:01:01 -0001
diff --git a/t/source/control-field-traversal-3/control b/t/source/control-field-traversal-3/control
deleted file mode 100644
index 22d427a..0000000
--- a/t/source/control-field-traversal-3/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: control-field-traversal-3
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: control-field-traversal-3
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Test for directory traversal issues via field names or values
- 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/t/source/control-field-traversal-3/copyright b/t/source/control-field-traversal-3/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/control-field-traversal-3/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/control-field-traversal-3/rules b/t/source/control-field-traversal-3/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/control-field-traversal-3/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/control-file-duplicate-field/changelog b/t/source/control-file-duplicate-field/changelog
deleted file mode 100644
index 90f25cb..0000000
--- a/t/source/control-file-duplicate-field/changelog
+++ /dev/null
@@ -1,10 +0,0 @@
-control-file-duplicate-field (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: control-file-duplicate-field
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Tue, 21 Jul 2009 12:47:16 -0700
-
-
diff --git a/t/source/control-file-duplicate-field/control b/t/source/control-file-duplicate-field/control.in
similarity index 69%
rename from t/source/control-file-duplicate-field/control
rename to t/source/control-file-duplicate-field/control.in
index 3d3ebaf..9d0daa8 100644
--- a/t/source/control-file-duplicate-field/control
+++ b/t/source/control-file-duplicate-field/control.in
@@ -1,14 +1,14 @@
 Source: control-file-duplicate-field
 Section: devel
 Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Maintainer: {$author}
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.2
+Standards-Version: {$standards_version}
 
 Package: control-file-duplicate-field
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 Description: Test for d/control containing duplicate fields
  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
diff --git a/t/source/control-file-duplicate-field/copyright b/t/source/control-file-duplicate-field/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/control-file-duplicate-field/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/control-file-duplicate-field/dsc.in b/t/source/control-file-duplicate-field/dsc.in
index 37e578d..95270b1 100644
--- a/t/source/control-file-duplicate-field/dsc.in
+++ b/t/source/control-file-duplicate-field/dsc.in
@@ -4,7 +4,7 @@ Binary: control-file-duplicate-field
 Architecture: all
 Version: 1
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7)
 Checksums-Sha1:
  @SHA1@ @SIZE@ control-file-duplicate-field_1.tar.gz
diff --git a/t/source/control-file-duplicate-field/rules b/t/source/control-file-duplicate-field/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/control-file-duplicate-field/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/control-file-missing-separator/changelog b/t/source/control-file-missing-separator/changelog
deleted file mode 100644
index 85ee953..0000000
--- a/t/source/control-file-missing-separator/changelog
+++ /dev/null
@@ -1,10 +0,0 @@
-control-file-missing-separator (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: control-file-missing-separator
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Tue, 21 Jul 2009 12:47:16 -0700
-
-
diff --git a/t/source/control-file-missing-separator/control b/t/source/control-file-missing-separator/control.in
similarity index 79%
rename from t/source/control-file-missing-separator/control
rename to t/source/control-file-missing-separator/control.in
index 38bb051..1e0b14c 100644
--- a/t/source/control-file-missing-separator/control
+++ b/t/source/control-file-missing-separator/control.in
@@ -1,7 +1,7 @@
 Source: control-file-missing-separator
 Section: devel
 Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Maintainer: {$author}
 Build-Depends: debhelper (>= 7),
  fiddle [amd64 powerpc
  mips mipsel
@@ -12,11 +12,11 @@ Build-Depends: debhelper (>= 7),
  2) [
  sparc i386 amd64
  ]
-Standards-Version: 3.8.2
+Standards-Version: {$standards_version}
 
 Package: control-file-missing-separator
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, foo (>= 1)
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foo (>= 1)
   baz (<< 2),
   fizz (= 2.0)
 Suggests: p1
diff --git a/t/source/control-file-missing-separator/copyright b/t/source/control-file-missing-separator/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/control-file-missing-separator/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/control-file-missing-separator/dsc.in b/t/source/control-file-missing-separator/dsc.in
index 1c59bff..43e8efe 100644
--- a/t/source/control-file-missing-separator/dsc.in
+++ b/t/source/control-file-missing-separator/dsc.in
@@ -4,7 +4,7 @@ Binary: control-file-missing-separator
 Architecture: all
 Version: 1
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7), fiddle [amd64 powerpc mips mipsel hppa s390], faddle (>> 2) [sparc i386 amd64]
 Checksums-Sha1:
  @SHA1@ @SIZE@ control-file-missing-separator_1.tar.gz
diff --git a/t/source/control-file-missing-separator/rules b/t/source/control-file-missing-separator/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/control-file-missing-separator/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/cruft-ancient-file/changelog b/t/source/cruft-ancient-file/changelog
deleted file mode 100644
index d6889a5..0000000
--- a/t/source/cruft-ancient-file/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-cruft-ancient-file (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: cruft-ancient-file
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 13 Mar 2011 14:30:00 +0100
-
diff --git a/t/source/cruft-ancient-file/control b/t/source/cruft-ancient-file/control
deleted file mode 100644
index b008d78..0000000
--- a/t/source/cruft-ancient-file/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: cruft-ancient-file
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: cruft-ancient-file
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for ancient files producing tar errors
- 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/t/source/cruft-ancient-file/copyright b/t/source/cruft-ancient-file/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/cruft-ancient-file/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/cruft-ancient-file/desc b/t/source/cruft-ancient-file/desc
index 7273972..8769d68 100644
--- a/t/source/cruft-ancient-file/desc
+++ b/t/source/cruft-ancient-file/desc
@@ -1,5 +1,6 @@
 Testname: cruft-ancient-file
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for ancient files producing tar errors
 Test-For: tar-errors-from-source
diff --git a/t/source/cruft-ancient-file/rules b/t/source/cruft-ancient-file/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/cruft-ancient-file/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/debian-source-dir-unknown-source-format/changelog b/t/source/debian-source-dir-unknown-source-format/changelog
deleted file mode 100644
index 90f25cb..0000000
--- a/t/source/debian-source-dir-unknown-source-format/changelog
+++ /dev/null
@@ -1,10 +0,0 @@
-control-file-duplicate-field (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: control-file-duplicate-field
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Tue, 21 Jul 2009 12:47:16 -0700
-
-
diff --git a/t/source/debian-source-dir-unknown-source-format/control b/t/source/debian-source-dir-unknown-source-format/control
deleted file mode 100644
index 1a13669..0000000
--- a/t/source/debian-source-dir-unknown-source-format/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: debian-source-dir-unknown-source-format
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.2
-
-Package: debian-source-dir-unknown-source-format
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Test for source package without a known source format
- 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/t/source/debian-source-dir-unknown-source-format/copyright b/t/source/debian-source-dir-unknown-source-format/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/debian-source-dir-unknown-source-format/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/debian-source-dir-unknown-source-format/dsc.in b/t/source/debian-source-dir-unknown-source-format/dsc.in
index e54572b..28636b4 100644
--- a/t/source/debian-source-dir-unknown-source-format/dsc.in
+++ b/t/source/debian-source-dir-unknown-source-format/dsc.in
@@ -4,7 +4,7 @@ Binary: debian-source-dir-unknown-source-format
 Architecture: all
 Version: 1
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7)
 Checksums-Sha1:
  @SHA1@ @SIZE@ debian-source-dir-unknown-source-format_1.tar.gz
diff --git a/t/source/debian-source-dir-unknown-source-format/rules b/t/source/debian-source-dir-unknown-source-format/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/debian-source-dir-unknown-source-format/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/debian-symlink/changelog b/t/source/debian-symlink/changelog
deleted file mode 100644
index 4b8f29d..0000000
--- a/t/source/debian-symlink/changelog
+++ /dev/null
@@ -1,10 +0,0 @@
-debian-symlink (1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: debian-symlink
-  * TODO: replace with a t/tests test once t/runtests is adapted to
-    allow symlinks
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 13 Mar 2011 14:30:00 +0100
diff --git a/t/source/debian-symlink/control b/t/source/debian-symlink/control
deleted file mode 100644
index aa19511..0000000
--- a/t/source/debian-symlink/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: debian-symlink
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.0
-
-Package: debian-symlink
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Test for directory traversal issues via field names or values
- 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/t/source/debian-symlink/copyright b/t/source/debian-symlink/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/debian-symlink/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/debian-symlink/dsc.in b/t/source/debian-symlink/dsc.in
index c84a9c7..667116c 100644
--- a/t/source/debian-symlink/dsc.in
+++ b/t/source/debian-symlink/dsc.in
@@ -4,7 +4,7 @@ Binary: debian-symlink
 Architecture: all
 Version: 1
 Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7)
 Checksums-Sha1:
  @SHA1@ @SIZE@ debian-symlink_1.tar.gz
diff --git a/t/source/debian-symlink/rules b/t/source/debian-symlink/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/debian-symlink/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/debian-symlink/tags b/t/source/debian-symlink/tags
index daf66ee..e69de29 100644
--- a/t/source/debian-symlink/tags
+++ b/t/source/debian-symlink/tags
@@ -1 +0,0 @@
-W: debian-symlink source: out-of-date-standards-version 3.9.0 (current is 3.9.2)
diff --git a/t/source/magic-architecture-srcpkg-ok/changelog b/t/source/magic-architecture-srcpkg-ok/changelog
deleted file mode 100644
index c62f06d..0000000
--- a/t/source/magic-architecture-srcpkg-ok/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-magic-architecture-srcpkg-ok (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: magic-architecture-srcpkg-ok
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 22 Jun 2011 18:30:00 +0100
-
diff --git a/t/source/magic-architecture-srcpkg-ok/control b/t/source/magic-architecture-srcpkg-ok/control.in
similarity index 79%
rename from t/source/magic-architecture-srcpkg-ok/control
rename to t/source/magic-architecture-srcpkg-ok/control.in
index b281aea..a0cc83f 100644
--- a/t/source/magic-architecture-srcpkg-ok/control
+++ b/t/source/magic-architecture-srcpkg-ok/control.in
@@ -1,13 +1,13 @@
-Source: magic-architecture-srcpkg-ok
-Section: devel
+Source: {$srcpkg}
+Section: {$section}
 Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Maintainer: {$author}
 Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.2
+Standards-Version: {$standards_version}
 
 Package: magic-architecture-srcpkg-ok-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends: $\{misc:Depends\}
 Description: Test package for "all" plus specific arch in .dscs
  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
@@ -15,7 +15,7 @@ Description: Test package for "all" plus specific arch in .dscs
 
 Package: magic-architecture-srcpkg-ok
 Architecture: amd64
-Depends: ${misc:Depends}
+Depends: $\{misc:Depends\}
 Description: Test package for "all" plus specific arch in .dscs (a)
  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
diff --git a/t/source/magic-architecture-srcpkg-ok/copyright b/t/source/magic-architecture-srcpkg-ok/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/magic-architecture-srcpkg-ok/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/magic-architecture-srcpkg-ok/desc b/t/source/magic-architecture-srcpkg-ok/desc
index a56ec60..1ae2258 100644
--- a/t/source/magic-architecture-srcpkg-ok/desc
+++ b/t/source/magic-architecture-srcpkg-ok/desc
@@ -1,5 +1,6 @@
 Testname: magic-architecture-srcpkg-ok
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for "all" plus specific arch in .dscs
 Test-Against: magic-arch-in-arch-list
diff --git a/t/source/magic-architecture-srcpkg-ok/rules b/t/source/magic-architecture-srcpkg-ok/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/magic-architecture-srcpkg-ok/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/magic-architecture-srcpkg-wrong/changelog b/t/source/magic-architecture-srcpkg-wrong/changelog
deleted file mode 100644
index de38d35..0000000
--- a/t/source/magic-architecture-srcpkg-wrong/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-magic-architecture-srcpkg-wrong (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: magic-architecture-srcpkg-wrong
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 22 Jun 2011 18:30:00 +0100
-
diff --git a/t/source/magic-architecture-srcpkg-wrong/control b/t/source/magic-architecture-srcpkg-wrong/control
deleted file mode 100644
index ddf5af4..0000000
--- a/t/source/magic-architecture-srcpkg-wrong/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: magic-architecture-srcpkg-wrong
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.2
-
-Package: magic-architecture-srcpkg-wrong
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for "any" plus specific architectures in .dscs
- 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/t/source/magic-architecture-srcpkg-wrong/copyright b/t/source/magic-architecture-srcpkg-wrong/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/magic-architecture-srcpkg-wrong/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/magic-architecture-srcpkg-wrong/desc b/t/source/magic-architecture-srcpkg-wrong/desc
index 6726bab..0c287fe 100644
--- a/t/source/magic-architecture-srcpkg-wrong/desc
+++ b/t/source/magic-architecture-srcpkg-wrong/desc
@@ -1,5 +1,6 @@
 Testname: magic-architecture-srcpkg-wrong
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for "any" plus specific arch in .dscs
 Test-For: magic-arch-in-arch-list
diff --git a/t/source/magic-architecture-srcpkg-wrong/rules b/t/source/magic-architecture-srcpkg-wrong/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/magic-architecture-srcpkg-wrong/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/package-version-0/changelog b/t/source/package-version-0/changelog
deleted file mode 100644
index c457882..0000000
--- a/t/source/package-version-0/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-package-version-0 (0) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: package-version-0
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Wed, 22 Jun 2011 18:30:00 +0100
-
diff --git a/t/source/package-version-0/control b/t/source/package-version-0/control
deleted file mode 100644
index ece4537..0000000
--- a/t/source/package-version-0/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: package-version-0
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.2
-
-Package: package-version-0
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test for package versions of "0"
- 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/t/source/package-version-0/copyright b/t/source/package-version-0/copyright
deleted file mode 100644
index 6afc448..0000000
--- a/t/source/package-version-0/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-   Copyright © 2009 Adam D. Barratt <adam@adam-barratt.org.uk>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/package-version-0/rules b/t/source/package-version-0/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/package-version-0/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/unpack-srcpkg-dot-dir/changelog b/t/source/unpack-srcpkg-dot-dir/changelog
deleted file mode 100644
index 901a9d6..0000000
--- a/t/source/unpack-srcpkg-dot-dir/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-unpack-srcpkg-dot-dir (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: unpack-srcpkg-dot-dir
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 13 Mar 2011 14:30:00 +0100
-
diff --git a/t/source/unpack-srcpkg-dot-dir/control b/t/source/unpack-srcpkg-dot-dir/control
deleted file mode 100644
index 6da4972..0000000
--- a/t/source/unpack-srcpkg-dot-dir/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: unpack-srcpkg-dot-dir
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: unpack-srcpkg-dot-dir
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for upstream tar files with a ./ prefix
- 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/t/source/unpack-srcpkg-dot-dir/copyright b/t/source/unpack-srcpkg-dot-dir/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/unpack-srcpkg-dot-dir/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/unpack-srcpkg-dot-dir/desc b/t/source/unpack-srcpkg-dot-dir/desc
index 3f9a2bc..5728a44 100644
--- a/t/source/unpack-srcpkg-dot-dir/desc
+++ b/t/source/unpack-srcpkg-dot-dir/desc
@@ -1,4 +1,5 @@
 Testname: unpack-srcpkg-dot-dir
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for upstream tar files with a ./ prefix
diff --git a/t/source/unpack-srcpkg-dot-dir/rules b/t/source/unpack-srcpkg-dot-dir/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/unpack-srcpkg-dot-dir/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/unpack-srcpkg-dot-subdir/changelog b/t/source/unpack-srcpkg-dot-subdir/changelog
deleted file mode 100644
index 2f443c5..0000000
--- a/t/source/unpack-srcpkg-dot-subdir/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-unpack-srcpkg-dot-subdir (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: unpack-srcpkg-dot-subdir
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 13 Mar 2011 14:30:00 +0100
-
diff --git a/t/source/unpack-srcpkg-dot-subdir/control b/t/source/unpack-srcpkg-dot-subdir/control
deleted file mode 100644
index 5a5aad0..0000000
--- a/t/source/unpack-srcpkg-dot-subdir/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: unpack-srcpkg-dot-subdir
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: unpack-srcpkg-dot-subdir
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for upstream tar files with a ./ prefix
- 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/t/source/unpack-srcpkg-dot-subdir/copyright b/t/source/unpack-srcpkg-dot-subdir/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/unpack-srcpkg-dot-subdir/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/unpack-srcpkg-dot-subdir/desc b/t/source/unpack-srcpkg-dot-subdir/desc
index b65343d..346ced7 100644
--- a/t/source/unpack-srcpkg-dot-subdir/desc
+++ b/t/source/unpack-srcpkg-dot-subdir/desc
@@ -1,4 +1,5 @@
 Testname: unpack-srcpkg-dot-subdir
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for upstream tar files with a ./ prefix
diff --git a/t/source/unpack-srcpkg-dot-subdir/rules b/t/source/unpack-srcpkg-dot-subdir/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/unpack-srcpkg-dot-subdir/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/unpack-srcpkg-lzma/changelog b/t/source/unpack-srcpkg-lzma/changelog
deleted file mode 100644
index dec3a7c..0000000
--- a/t/source/unpack-srcpkg-lzma/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-unpack-srcpkg-lzma (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: unpack-srcpkg-lzma
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sat, 21 Feb 2009 13:59:17 -0800
-
diff --git a/t/source/unpack-srcpkg-lzma/control b/t/source/unpack-srcpkg-lzma/control
deleted file mode 100644
index f976e57..0000000
--- a/t/source/unpack-srcpkg-lzma/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: unpack-srcpkg-lzma
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.0
-
-Package: unpack-srcpkg-lzma
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for lzma-compressed source packages
- 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/t/source/unpack-srcpkg-lzma/copyright b/t/source/unpack-srcpkg-lzma/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/unpack-srcpkg-lzma/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/unpack-srcpkg-lzma/desc b/t/source/unpack-srcpkg-lzma/desc
index bb3cb7a..f85715e 100644
--- a/t/source/unpack-srcpkg-lzma/desc
+++ b/t/source/unpack-srcpkg-lzma/desc
@@ -1,4 +1,5 @@
 Testname: unpack-srcpkg-lzma
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for lzma-compressed source packages
diff --git a/t/source/unpack-srcpkg-lzma/rules b/t/source/unpack-srcpkg-lzma/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/unpack-srcpkg-lzma/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/unpack-srcpkg-no-subdir/changelog b/t/source/unpack-srcpkg-no-subdir/changelog
deleted file mode 100644
index 0fbff66..0000000
--- a/t/source/unpack-srcpkg-no-subdir/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-unpack-srcpkg-no-subdir (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: unpack-srcpkg-no-subdir
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 13 Mar 2011 14:30:00 +0100
-
diff --git a/t/source/unpack-srcpkg-no-subdir/control b/t/source/unpack-srcpkg-no-subdir/control
deleted file mode 100644
index 2f4b96a..0000000
--- a/t/source/unpack-srcpkg-no-subdir/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: unpack-srcpkg-no-subdir
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: unpack-srcpkg-no-subdir
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for upstream tar files with no subdirectories
- 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/t/source/unpack-srcpkg-no-subdir/copyright b/t/source/unpack-srcpkg-no-subdir/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/unpack-srcpkg-no-subdir/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/unpack-srcpkg-no-subdir/desc b/t/source/unpack-srcpkg-no-subdir/desc
index f39046a..6df51ea 100644
--- a/t/source/unpack-srcpkg-no-subdir/desc
+++ b/t/source/unpack-srcpkg-no-subdir/desc
@@ -1,4 +1,5 @@
 Testname: unpack-srcpkg-no-subdir
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for upstream tar files with no subdirectories
diff --git a/t/source/unpack-srcpkg-no-subdir/rules b/t/source/unpack-srcpkg-no-subdir/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/unpack-srcpkg-no-subdir/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/source/unpack-srcpkg-xz/changelog b/t/source/unpack-srcpkg-xz/changelog
deleted file mode 100644
index 0766244..0000000
--- a/t/source/unpack-srcpkg-xz/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-unpack-srcpkg-xz (1.0-1) unstable; urgency=low
-
-  * Lintian Test Suite.
-  * Test: unpack-srcpkg-xz
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- Debian Lintian Maintainers <lintian-maint@debian.org>  Sun, 25 Jul 2010 20:02:37 -0700
diff --git a/t/source/unpack-srcpkg-xz/control b/t/source/unpack-srcpkg-xz/control
deleted file mode 100644
index c531980..0000000
--- a/t/source/unpack-srcpkg-xz/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: unpack-srcpkg-xz
-Section: devel
-Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
-
-Package: unpack-srcpkg-xz
-Architecture: all
-Depends: ${misc:Depends}
-Description: Test package for xz-compressed source packages
- 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/t/source/unpack-srcpkg-xz/copyright b/t/source/unpack-srcpkg-xz/copyright
deleted file mode 100644
index 98298fd..0000000
--- a/t/source/unpack-srcpkg-xz/copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
-   Copyright © 2009 Russ Allbery <rra@debian.org>
-
-This program is free software; you may redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This is distributed in the hope that it will be useful, but without
-any warranty; without even the implied warranty of merchantability or
-fitness for a particular purpose. See the GNU General Public License
-for more details.
-
-A copy of the GNU General Public License version 2 is available as
-/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
-or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/t/source/unpack-srcpkg-xz/desc b/t/source/unpack-srcpkg-xz/desc
index 1a05228..e1ad08e 100644
--- a/t/source/unpack-srcpkg-xz/desc
+++ b/t/source/unpack-srcpkg-xz/desc
@@ -1,4 +1,5 @@
 Testname: unpack-srcpkg-xz
 Sequence: 6000
-Version: 1.0
+Version: 1.0-1
+Type: non-native
 Description: Test package for xz-compressed source packages
diff --git a/t/source/unpack-srcpkg-xz/rules b/t/source/unpack-srcpkg-xz/rules
deleted file mode 100755
index cbe925d..0000000
--- a/t/source/unpack-srcpkg-xz/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
diff --git a/t/templates/tests/pedantic/debian/changelog.in b/t/templates/debs/skel/changelog.in
similarity index 100%
copy from t/templates/tests/pedantic/debian/changelog.in
copy to t/templates/debs/skel/changelog.in
diff --git a/t/tests/debhelper-lacks-versioned-deps/debian/debian/control.in b/t/templates/debs/skel/control.in
similarity index 76%
copy from t/tests/debhelper-lacks-versioned-deps/debian/debian/control.in
copy to t/templates/debs/skel/control.in
index e296972..b116354 100644
--- a/t/tests/debhelper-lacks-versioned-deps/debian/debian/control.in
+++ b/t/templates/debs/skel/control.in
@@ -1,15 +1,12 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper
-
 Package: {$srcpkg}
+Version: {$version}
 Architecture: {$architecture}
-Depends: $\{misc:Depends\}
+Maintainer: {$author}
+Section: {$section}
+Priority: extra
 Description: {$description}
  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.  It may
  be an empty package.
+
diff --git a/t/debs/control-field-traversal-4/copyright b/t/templates/debs/skel/copyright
similarity index 100%
rename from t/debs/control-field-traversal-4/copyright
rename to t/templates/debs/skel/copyright
diff --git a/t/templates/tests/pedantic/debian/changelog.in b/t/templates/source/skel/changelog.in
similarity index 100%
copy from t/templates/tests/pedantic/debian/changelog.in
copy to t/templates/source/skel/changelog.in
diff --git a/t/templates/tests/skel/debian/control.in b/t/templates/source/skel/control.in
similarity index 100%
copy from t/templates/tests/skel/debian/control.in
copy to t/templates/source/skel/control.in
diff --git a/t/debs/control-files-bad/copyright b/t/templates/source/skel/copyright
similarity index 100%
rename from t/debs/control-files-bad/copyright
rename to t/templates/source/skel/copyright
diff --git a/t/source/changelog-file-symlink/rules b/t/templates/source/skel/rules
similarity index 100%
rename from t/source/changelog-file-symlink/rules
rename to t/templates/source/skel/rules

-- 
Debian package checker


Reply to: