debian/changelog

@@ -17,6 +17,8 @@ lintian (2.5.116) UNRELEASED; urgency=medium
       when only the test runner itself has changed.  (MR: !80)
   * t/*:
+    + [CL] Apply a patch series from Felix Lechner to make "pedantic"
+      templates the default for all tests.  (MR: !87)
     + [CL] Apply a patch from Felix Lechner to allow debian/rules to be
       generated from templates in tests.  (MR: !81)
     + [CL] Apply a patch from Felix Lechner to remove pre-existing metadata

lib/Test/Lintian/Helper.pm

@@ -55,6 +55,8 @@ BEGIN {
 }
 
 use Carp;
+use File::Spec::Functions qw(abs2rel rel2abs);
+use File::Path qw(remove_tree);
 use Path::Tiny;
 use POSIX qw(locale_h strftime);
 
@@ -155,7 +157,26 @@ dereferencing links. For an empty directory, no dummy file is required.
 
 sub copy_dir_contents {
     my ($source, $destination) = @_;
+
+    # 'cp -r' cannot overwrite directories with files or vice versa
+    my @paths = File::Find::Rule->in($source);
+    foreach my $path (@paths) {
+
+        my $relative = abs2rel($path, $source);
+        my $prospective = rel2abs($relative, $destination);
+
+        # recursively delete directories to be replaced by a file
+        remove_tree($prospective)
+          if -d $prospective && -f $path;
+
+        # remove files to be replaced by a directory
+        unlink($prospective)
+          if -f $prospective && -d $path;
+    }
+
+    # 'cp -r' with a dot will error without files present
     if (scalar path($source)->children) {
+
         system('cp', '-rp', "$source/.", '-t', $destination)== 0
           or croak("Could not copy $source to $destination: $!");
     }

t/skeletons/tests/default

 Template-Sets:
- debian (default),
+ debian (pedantic),
  . (make-builder)
 Fill-Targets:
  debian (debian-packaging),

t/skeletons/tests/pedantic

-Template-Sets:
- debian (pedantic),
- orig (pedantic.upstream),
- . (make-builder)
-Fill-Targets:
- debian (debian-packaging),
- orig/debian (debian-packaging),
- . (make-builder)

t/templates/tests/changelog.default.old

-skel (1.2) unstable; urgency=low
-
-  * Raise the default dependency on debhelper to 7.0.50~ so that tests can
-    freely use overrides without a modified control.in.
-
- -- Russ Allbery <rra@debian.org>  Sat, 15 Aug 2009 19:09:15 -0700
-
-skel (1.1) unstable; urgency=low
-
-  * Parameterize the package section to make it easier to avoid spurious
-    tags for section mismatches when testing some types of packages.
-  * ${shlibs:Depends}, not ${shlib:Depends}, in the control template.
-  * Expand the default long description to three lines to not trigger
-    extended-description-is-probably-too-short.  Tell anyone looking at a
-    test package that it shouldn't be installed like a normal package.
-
- -- Russ Allbery <rra@debian.org>  Sat, 27 Dec 2008 13:16:40 -0800
-
-skel (1.0) unstable; urgency=low
-
-  * Initial design.
-    Please see changelog.in for the actual changelog
-    that will be used unless it is overwritten in the
-    individual test.
-
- -- Frank Lichtenheld <djpig@debian.org>  Sun, 03 Aug 2008 16:46:13 +0200
-

t/templates/tests/changelog.pedantic.old

-pedantic (1.3) unstable; urgency=low
-
-  * Raise the default dependency on debhelper to 7.0.50~ so that tests can
-    freely use overrides without a modified control.in.
-
- -- Russ Allbery <rra@debian.org>  Sat, 15 Aug 2009 19:09:44 -0700
-
-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 <rra@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
-    tags for section mismatches when testing some types of packages.
-  * ${shlibs:Depends}, not ${shlib:Depends}, in the control template.
-  * Expand the default long description to three lines to not trigger
-    extended-description-is-probably-too-short.  Tell anyone looking at a
-    test package that it shouldn't be installed like a normal package.
-
- -- Russ Allbery <rra@debian.org>  Sat, 27 Dec 2008 13:16:40 -0800
-
-skel (1.0) unstable; urgency=low
-
-  * Initial design.
-    Please see changelog.in for the actual changelog
-    that will be used unless it is overwritten in the
-    individual test.
-
- -- Frank Lichtenheld <djpig@debian.org>  Sun, 03 Aug 2008 16:46:13 +0200
-

t/templates/tests/default/changelog.in

-{$source} ({$version}) {$distribution}; urgency=low
-
-  * Lintian Test Suite.
-  * Test: {$testname}
-
- -- {$author}  {$date}
-
-{$source} ({$prev_version}) {$distribution}; urgency=low
-
-  * Lintian Test Suite.
-  * Test: {$testname}
-
-  * Suppress "should close ITP bug" messages.  (Closes: #123456)
-
- -- {$author}  {$prev_date}

t/templates/tests/default/compat.in

-{$dh_compat_level}

t/templates/tests/default/control.in

-Source: {$source}
-Priority: optional
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: {$build_depends}
-Rules-Requires-Root: no
-Homepage: https://lintian.debian.org/
-
-Package: {$source}
-Architecture: {$package_architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-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.

t/templates/tests/default/copyright

-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Lintian
-Upstream-Contact: <debian-lint-maint@lists.debian.org>
-Source: http://lintian.debian.org
-Comment: This is part of the testsuite of lintian.
- See the file debian/copyright
- in the lintian source directory for more details.
-
-Files: *
-Copyright: 2008 Frank Lichtenheld <djpig@debian.org>
-License: GPL-2+
- 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.

t/templates/tests/default/rules

-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-%:
-	dh $@

t/templates/tests/default/source/format.in

-{$source_format}

t/templates/tests/default/tests/control

-Tests: test

t/templates/tests/default/tests/test

-#!/bin/sh
-exit 0

t/templates/tests/default/watch

-# Empty watch file

t/templates/tests/pedantic.upstream/Changes

-This is a dummy upstream changelog file for dh_installchangelogs.

t/templates/tests/pedantic/changelog.in

-{$source} ({$version}) unstable; urgency=low
+{$source} ({$version}) {$distribution}; urgency=low
 
   * Lintian Test Suite.
   * Test: {$testname}

t/templates/tests/pedantic/control.in

@@ -9,7 +9,7 @@ Homepage: https://lintian.debian.org/
 
 Package: {$source}
 Architecture: {$package_architecture}
-Depends: $\{misc:Depends\}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
 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

t/templates/tests/pedantic/copyright

@@ -7,7 +7,10 @@ Comment: This is part of the testsuite of lintian.
  in the lintian source directory for more details.
 
 Files: *
-Copyright: 2009, Russ Allbery <rra@debian.org>
+Copyright:
+ 2008 Frank Lichtenheld <djpig@debian.org>
+ 2009 Russ Allbery <rra@debian.org>
+ 2018 Felix Lechner <felix.lechner@lease-up.com>
 License: GPL-2+
  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

t/tests/changelog-file-backport/desc

 Testname: changelog-file-backport
 Version: 1.0
 Description: Check backport
-Skeleton: pedantic
 Options: --pedantic -I -E
 # Overrides the "data/changes-file/known-dists"
 # data file to avoid updating the test every release