The following commit has been merged in the master branch: commit bf7ed636a36a4d8dfbeef567ae66c3326ff91e68 Author: Russ Allbery <r...@debian.org> Date: Fri Jan 30 22:25:37 2009 -0800
Add a new pedantic test package template * t/templates/pedantic{,.upstream}: + [RA] New template that passes all pedantic checks. Modify the existing pedantic tests to use it. diff --git a/debian/changelog b/debian/changelog index 2ecfe46..00f5ae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ lintian (2.2.1) UNRELEASED; urgency=low * t/runtests: + [RA] Add support for selecting a different test package skeleton. + * t/templates/pedantic{,.upstream}: + + [RA] New template that passes all pedantic checks. -- Russ Allbery <r...@debian.org> Sun, 25 Jan 2009 12:51:40 -0800 diff --git a/t/templates/pedantic.upstream/Changes b/t/templates/pedantic.upstream/Changes new file mode 100644 index 0000000..86fdd55 --- /dev/null +++ b/t/templates/pedantic.upstream/Changes @@ -0,0 +1 @@ +This is a dummy upstream changelog file for dh_installchangelogs. diff --git a/t/templates/skel/debian/changelog b/t/templates/pedantic/debian/changelog similarity index 69% copy from t/templates/skel/debian/changelog copy to t/templates/pedantic/debian/changelog index 583eae2..005e963 100644 --- a/t/templates/skel/debian/changelog +++ b/t/templates/pedantic/debian/changelog @@ -1,3 +1,12 @@ +pedantic (1.2) unstable; urgency=low + + * New template based on the default skel template. + * Add Homepage to the default control file. + * Remove ${shlibs:Depends} from the default control file to avoid + triggering warnings about ${shlibs:Depends} in arch: all packages. + + -- Russ Allbery <r...@debian.org> Fri, 30 Jan 2009 22:09:43 -0800 + skel (1.1) unstable; urgency=low * Parameterize the package section to make it easier to avoid spurious diff --git a/t/templates/skel/debian/changelog.in b/t/templates/pedantic/debian/changelog.in similarity index 100% copy from t/templates/skel/debian/changelog.in copy to t/templates/pedantic/debian/changelog.in diff --git a/t/templates/skel/debian/compat b/t/templates/pedantic/debian/compat similarity index 100% copy from t/templates/skel/debian/compat copy to t/templates/pedantic/debian/compat diff --git a/t/tests/patch-systems-no-patch-system/debian/debian/control.in b/t/templates/pedantic/debian/control.in similarity index 100% rename from t/tests/patch-systems-no-patch-system/debian/debian/control.in rename to t/templates/pedantic/debian/control.in diff --git a/t/templates/skel/debian/copyright b/t/templates/pedantic/debian/copyright similarity index 100% copy from t/templates/skel/debian/copyright copy to t/templates/pedantic/debian/copyright diff --git a/t/templates/skel/debian/rules b/t/templates/pedantic/debian/rules similarity index 100% copy from t/templates/skel/debian/rules copy to t/templates/pedantic/debian/rules diff --git a/t/tests/debhelper-dh-clean-k-deprecated/debian/debian/control.in b/t/tests/fields-no-homepage/debian/debian/control.in similarity index 100% copy from t/tests/debhelper-dh-clean-k-deprecated/debian/debian/control.in copy to t/tests/fields-no-homepage/debian/debian/control.in diff --git a/t/tests/fields-no-homepage/desc b/t/tests/fields-no-homepage/desc index bd76ab6..bf188af 100644 --- a/t/tests/fields-no-homepage/desc +++ b/t/tests/fields-no-homepage/desc @@ -4,4 +4,5 @@ Type: non-native Description: Test pedantic check for no Homepage field Version: 1.0-1 Options: -I -E --pedantic +Skeleton: pedantic Test-For: no-homepage-field diff --git a/t/tests/fields-no-homepage/upstream/ChangeLog b/t/tests/fields-no-homepage/upstream/ChangeLog deleted file mode 100644 index 2d85e10..0000000 --- a/t/tests/fields-no-homepage/upstream/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -This is some upstream changelog file. diff --git a/t/tests/patch-systems-no-patch-system/desc b/t/tests/patch-systems-no-patch-system/desc index d50e41e..ba45e66 100644 --- a/t/tests/patch-systems-no-patch-system/desc +++ b/t/tests/patch-systems-no-patch-system/desc @@ -4,4 +4,5 @@ Type: non-native Version: 1.0-1 Description: Diagnose lack of a patch system Options: -I -E --pedantic +Skeleton: pedantic Test-For: direct-changes-in-diff-but-no-patch-system diff --git a/t/tests/patch-systems-no-patch-system/upstream/ChangeLog b/t/tests/patch-systems-no-patch-system/upstream/ChangeLog deleted file mode 100644 index 2d85e10..0000000 --- a/t/tests/patch-systems-no-patch-system/upstream/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -This is some upstream changelog file. -- Debian package checker -- To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org