Chris Lamb pushed to branch master at lintian / lintian
Commits: 184b6715 by Felix Lechner at 2018-11-22T17:13:35Z Remove extra files from test specifications. Exercising caution, I concluded that these files were not needed. In the case of watch-file-pubkey-missing, neither file was needed. In the other two cases the files were duplicates of files in ./orig. They all may have been copied unwittingly from elsewhere. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - 55c1baf1 by Felix Lechner at 2018-11-22T17:13:43Z t/runtests: Always use 'orig','diff' and 'debian' to build packages in tests. This change allows a clean separation of upstream files from Debian packaging files even for native packages, which are presently the default for tests. It will help to eliminate the confusing ./debian/debian hierarchy. Also, the test runner can now more easily swich through native and non-native package formats. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - c6bd80c6 by Felix Lechner at 2018-11-22T17:13:50Z Move upstream files from 'debian' to 'orig' (mostly for tests using a native source format). The purpose is to clear out ./debian so that the confusing double directory ./debian/debian can be collapsed. Upstream files now go into 'orig'. Files for any diff calculation go into 'diff'. Debian packaging files go into 'debian/debian'. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - b23498e3 by Felix Lechner at 2018-11-22T17:14:02Z Move packaging files from 'debian' to 'diff' when appropriate (for very few tests that rely on the diff). This affects very few tests that specifically require a diff to be present. For most tests, files in similar positions were instead moved to 'orig'. The purpose is to clear out ./debian, so that the confusing double directory ./debian/debian can eventually be collapsed. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - 1eb4c25a by Felix Lechner at 2018-11-22T17:14:08Z t/templates/tests: Move templates for debian packaging files up one level (no more ./debian). Eventually, this will simplify the directory structure in test specifications. Files previously stored in ./debian/debian will just be in ./debian. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - c2291de3 by Felix Lechner at 2018-11-22T17:14:12Z t/runtest: Strip 'debian' from template whitelist paths (no more ./debian/debian). This removes One level of 'debian' from the file locations. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - 45c01d05 by Felix Lechner at 2018-11-22T17:14:17Z t/runtests: Fill templates only in 'orig/debian' since template paths were shortened. The template set no longer contains ./debian in the file paths. That path portion needs to be added when filling templates in 'orig'. (The files in ./debian were moved up a level.) Signed-off-by: Chris Lamb <la...@debian.org> - - - - - 3a9455d5 by Felix Lechner at 2018-11-22T17:14:22Z t/runtests: Copy packaging files from ./debian instead of ./debian/debian. Templates and a packaging files have been moved up one level. There is no more need to copy the directory ./debian/debian. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - 73d631ff by Felix Lechner at 2018-11-22T17:14:28Z t/runtests: Read package format from ./debian instead of ./debian/debian. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - 14284eff by Felix Lechner at 2018-11-22T17:14:35Z t/tests: Move 'debian' directory up a level for all tests (no more ./debian/debian). This simplifies the file hierarchy for test specifications. Going forward, the Debian packaging code will simply be located in ./debian instead of the more cumbersome ./debian/debian. Please also see the README on 'diff'. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - a3c00412 by Felix Lechner at 2018-11-22T17:14:44Z t/tests/README: Explain new file hierarchy, including 'diff' and the shallower 'debian'. Signed-off-by: Chris Lamb <la...@debian.org> - - - - - abb6f414 by Chris Lamb at 2018-11-22T17:14:48Z Apply a patch from Felix Lechner to implement a new file hierarchy for test specifications. (MR: !74) - - - - - 30 changed files: - debian/changelog - t/runtests - t/templates/tests/default/debian/changelog.in → t/templates/tests/default/changelog.in - t/templates/tests/default/debian/compat.in → t/templates/tests/default/compat.in - t/templates/tests/default/debian/control.in → t/templates/tests/default/control.in - t/templates/tests/default/debian/copyright → t/templates/tests/default/copyright - t/templates/tests/default/debian/rules → t/templates/tests/default/rules - t/templates/tests/default/debian/source/format.in → t/templates/tests/default/source/format.in - t/templates/tests/default/debian/tests/control → t/templates/tests/default/tests/control - t/templates/tests/default/debian/tests/test → t/templates/tests/default/tests/test - t/templates/tests/pedantic/debian/changelog.in → t/templates/tests/pedantic/changelog.in - t/templates/tests/pedantic/debian/compat.in → t/templates/tests/pedantic/compat.in - t/templates/tests/pedantic/debian/control.in → t/templates/tests/pedantic/control.in - t/templates/tests/pedantic/debian/copyright → t/templates/tests/pedantic/copyright - t/templates/tests/pedantic/debian/rules → t/templates/tests/pedantic/rules - t/templates/tests/pedantic/debian/source/format.in → t/templates/tests/pedantic/source/format.in - t/templates/tests/pedantic/debian/tests/control → t/templates/tests/pedantic/tests/control - t/templates/tests/pedantic/debian/tests/test → t/templates/tests/pedantic/tests/test - t/templates/tests/pedantic/debian/upstream/metadata → t/templates/tests/pedantic/upstream/metadata - t/tests/README - t/tests/apache2-modules-general/debian/debian/control.in → t/tests/apache2-modules-general/debian/control.in - t/tests/apache2-modules-general/debian/debian/libapache2-mod-foo.dirs → t/tests/apache2-modules-general/debian/libapache2-mod-foo.dirs - t/tests/apache2-modules-general/debian/debian/libapache2-mod-foo.install → t/tests/apache2-modules-general/debian/libapache2-mod-foo.install - t/tests/apache2-modules-general/debian/debian/libapache2-mod-foo2.dirs → t/tests/apache2-modules-general/debian/libapache2-mod-foo2.dirs - t/tests/apache2-modules-general/debian/debian/libapache2-mod-foo2.install → t/tests/apache2-modules-general/debian/libapache2-mod-foo2.install - t/tests/apache2-modules-general/debian/debian/libapache2-mod-foo2.postinst → t/tests/apache2-modules-general/debian/libapache2-mod-foo2.postinst - t/tests/apache2-modules-general/debian/debian/libapache2-mod-foo2.postrm → t/tests/apache2-modules-general/debian/libapache2-mod-foo2.postrm - t/tests/apache2-modules-general/debian/debian/libapache2-modbaz.dirs → t/tests/apache2-modules-general/debian/libapache2-modbaz.dirs - t/tests/apache2-modules-general/debian/debian/libapache2-modbaz.install → t/tests/apache2-modules-general/debian/libapache2-modbaz.install - t/tests/apache2-modules-general/debian/Makefile → t/tests/apache2-modules-general/orig/Makefile The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/lintian/lintian/compare/6ff5555eda598a946a18d9213f324b1fbb18be13...abb6f41446459baa6c6020a9703190ed229a4bf8 -- View it on GitLab: https://salsa.debian.org/lintian/lintian/compare/6ff5555eda598a946a18d9213f324b1fbb18be13...abb6f41446459baa6c6020a9703190ed229a4bf8 You're receiving this email because of your account on salsa.debian.org.
