Chris Lamb pushed to branch master at lintian / lintian
Commits: 034254a9 by Felix Lechner at 2018-12-05T17:42:02Z Remove file/directory conflicts before copying templates. The test cruft-obsolete-upstream-metadata attempts to create a plain file in a place where modern Debian policy requires a directory (debian/upstream/metadata). The operation fails when a template set, such as the 'pedantic' Debian packaging files, have already installed a directory. This commit checks for such file/directory conflicts and removes offending paths before copying anything. Signed-off-by: Chris Lamb <[email protected]> - - - - - d91fcfc9 by Felix Lechner at 2018-12-05T17:42:06Z Parameterise the distribution in the 'pedantic' changelog template. The 'pedantic' template set had a hardcoded distribution. The changelog file from the 'default' set was instead imported for further use. Signed-off-by: Chris Lamb <[email protected]> - - - - - d04ae3db by Felix Lechner at 2018-12-05T17:42:14Z Add ${shlibs:Depends} to the "pedantic" control file template. The control file template in the 'pedantic' template set was missing automatic dependencies for shared libraries. In order to use the template more widely in the future, missing placeholders were copied from the 'default' template set. Signed-off-by: Chris Lamb <[email protected]> - - - - - 4818c9a4 by Felix Lechner at 2018-12-05T17:42:23Z Update copyright information for the "pedantic" template set. After combining files from both template sets, the copyright for 'pedantic' was amended to also include the information for 'default' as well. The latter may be dropped in the near future. With the most recent entry going back more than nine years, an additional entry was made for derivative work. Signed-off-by: Chris Lamb <[email protected]> - - - - - 2bf3f6ef by Felix Lechner at 2018-12-05T17:42:30Z Add a missing newline character. The copyright file in the 'pedantic' template set had no newline at the end of the file. This commit adds one. Signed-off-by: Chris Lamb <[email protected]> - - - - - 1e7d488d by Felix Lechner at 2018-12-05T17:42:43Z Use the "pedantic" Debian files in the default skeleton. With the planned retirement of the 'default' template set, the default skeleton was switched to use the files from 'pedantic' instead. Signed-off-by: Chris Lamb <[email protected]> - - - - - 135a5bb7 by Felix Lechner at 2018-12-05T17:42:56Z Provide non-empty diff/Changes files for four tests. Four tests check if the Changes file supplied by a skeleton was overridden in the package, but that did not generate the desired tag when the file was removed from the skeleton, because the overriding file was empty. A non-empty file is a better choice. This commit provides one each for four tests. Signed-off-by: Chris Lamb <[email protected]> - - - - - 91887bff by Felix Lechner at 2018-12-05T17:43:01Z Remove the line "Skeleton: pedantic" from all test descriptions. The default skeleton provides all the features of the pedantic skeleton, except it provides no upstream files. This commit switches all tests that used the pedantic skeleton over to "default." Signed-off-by: Chris Lamb <[email protected]> - - - - - 55a64154 by Felix Lechner at 2018-12-05T17:43:06Z Delete the "pedantic" skeleton (no longer needed). There are no tests that use the 'default' skeleton. This commit removes it. Signed-off-by: Chris Lamb <[email protected]> - - - - - 552737b8 by Felix Lechner at 2018-12-05T17:43:13Z Delete "pedantic" template set for upstream files; no longer used. There are no tests that use the 'pedantic' template set for upstream files. This commit removes the set. Signed-off-by: Chris Lamb <[email protected]> - - - - - e39c6077 by Felix Lechner at 2018-12-05T17:43:22Z Delete "default" template set for Debian files (no longer needed). There are no tests that use the 'default' template set for Debian files. This commit removes the set. Signed-off-by: Chris Lamb <[email protected]> - - - - - f3852738 by Felix Lechner at 2018-12-05T17:43:29Z Delete two outdated changelogs that describe historical template sets. The changelogs were outdated, unmaintained, over nine years old and quite short. With modern version control systems, there may not be a need for such changelogs. These two will probably not be needed anymore. This commit removes both. Signed-off-by: Chris Lamb <[email protected]> - - - - - 869ea0b4 by Chris Lamb at 2018-12-05T17:44:16Z Apply a patch series from Felix Lechner to make "pedantic" templates the default for all tests. (MR: !87) - - - - - 30 changed files: - debian/changelog - lib/Test/Lintian/Helper.pm - t/skeletons/tests/default - − t/skeletons/tests/pedantic - − t/templates/tests/changelog.default.old - − t/templates/tests/changelog.pedantic.old - − t/templates/tests/default/changelog.in - − t/templates/tests/default/compat.in - − t/templates/tests/default/control.in - − t/templates/tests/default/copyright - − t/templates/tests/default/rules - − t/templates/tests/default/source/format.in - − t/templates/tests/default/tests/control - − t/templates/tests/default/tests/test - − t/templates/tests/default/watch - − t/templates/tests/pedantic.upstream/Changes - t/templates/tests/pedantic/changelog.in - t/templates/tests/pedantic/control.in - t/templates/tests/pedantic/copyright - t/tests/changelog-file-backport/desc - t/tests/changelog-file-consecutive-debian-revision-unrel/desc - t/tests/changelog-file-experimental/desc - t/tests/changelog-file-line-too-short/desc - t/tests/control-file-duplicate/desc - t/tests/control-file-pedantic-space/desc - t/tests/control-file-pedantic/desc - t/tests/copyright-file-general/desc - t/tests/copyright-file-license-symlink/desc - t/tests/copyright-file-non-common-license/desc - t/tests/cruft-autogenerated/desc The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/lintian/lintian/compare/a18093bfe1fa2f760766178430cda6e221a779fb...869ea0b402e0d0264eaa55fd14112b3294a8bd10 -- View it on GitLab: https://salsa.debian.org/lintian/lintian/compare/a18093bfe1fa2f760766178430cda6e221a779fb...869ea0b402e0d0264eaa55fd14112b3294a8bd10 You're receiving this email because of your account on salsa.debian.org.
