[lintian] 01/02: t: Make dsc.in.in a template in t/source
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 9eb1914f70dcafeb8ec32fe987f7eea253ac85ca
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 9 09:49:30 2016 +0000
t: Make dsc.in.in a template in t/source
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/runtests | 6 +++---
t/source/changelog-file-symlink/{dsc.in => dsc.in.in} | 2 +-
t/source/control-field-traversal-1/{dsc.in => dsc.in.in} | 2 +-
t/source/control-field-traversal-2/{dsc.in => dsc.in.in} | 2 +-
t/source/control-field-traversal-3/{dsc.in => dsc.in.in} | 2 +-
t/source/control-file-duplicate-field/{dsc.in => dsc.in.in} | 2 +-
t/source/control-file-missing-separator/{dsc.in => dsc.in.in} | 2 +-
t/source/control-file-syntax-error/{dsc.in => dsc.in.in} | 2 +-
t/source/debconf-traversal/{dsc.in => dsc.in.in} | 2 +-
t/source/debian-source-dir-traversal-1/{dsc.in => dsc.in.in} | 2 +-
t/source/debian-source-dir-traversal-2/{dsc.in => dsc.in.in} | 2 +-
.../debian-source-dir-unknown-source-format/{dsc.in => dsc.in.in} | 2 +-
t/source/debian-symlink/{dsc.in => dsc.in.in} | 2 +-
t/source/fields-src-bad-version/{dsc.in => dsc.in.in} | 2 +-
t/source/fields-src-fields-filename/{dsc.in => dsc.in.in} | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/t/runtests b/t/runtests
index bbe7588..5729248 100755
--- a/t/runtests
+++ b/t/runtests
@@ -115,7 +115,7 @@ chomp $ARCHITECTURE;
our %TEMPLATES = (
'tests' => ['debian/changelog', 'debian/control'],
'debs' => ['changelog', 'control', 'Makefile'],
- 'source' => ['changelog', 'control'],
+ 'source' => ['changelog', 'control', 'dsc.in'],
);
my $DATE = safe_qx(qw(date -R));
chomp $DATE;
@@ -384,7 +384,7 @@ sub test_package {
['--exclude=debian/changelog']);
foreach my $tfile (@{ $TEMPLATES{$suite} }) {
- unless (-e "$targetdir/$tfile") {
+ if (not -e "$targetdir/$tfile" and -f "$targetdir/${tfile}.in") {
fill_in_tmpl("$targetdir/$tfile", $testdata);
}
}
@@ -595,7 +595,7 @@ sub generic_test_runner {
['--exclude=changelog'], ['--exclude=desc']);
foreach my $tfile (@{ $TEMPLATES{$suite} }) {
- unless (-e "$targetdir/$tfile") {
+ if (not -e "$targetdir/$tfile" and -f "$targetdir/${tfile}.in") {
fill_in_tmpl("$targetdir/$tfile", $testdata);
}
}
diff --git a/t/source/changelog-file-symlink/dsc.in b/t/source/changelog-file-symlink/dsc.in.in
similarity index 90%
rename from t/source/changelog-file-symlink/dsc.in
rename to t/source/changelog-file-symlink/dsc.in.in
index 678bda4..9852821 100644
--- a/t/source/changelog-file-symlink/dsc.in
+++ b/t/source/changelog-file-symlink/dsc.in.in
@@ -4,7 +4,7 @@ Binary: changelog-file-symlink
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 9)
Checksums-Sha1:
@SHA1@ @SIZE@ changelog-file-symlink_1.tar.gz
diff --git a/t/source/control-field-traversal-1/dsc.in b/t/source/control-field-traversal-1/dsc.in.in
similarity index 90%
rename from t/source/control-field-traversal-1/dsc.in
rename to t/source/control-field-traversal-1/dsc.in.in
index efef93c..4a853e1 100644
--- a/t/source/control-field-traversal-1/dsc.in
+++ b/t/source/control-field-traversal-1/dsc.in.in
@@ -4,7 +4,7 @@ Binary: control-field-traversal-1
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ control-field-traversal-1_1.tar.gz
diff --git a/t/source/control-field-traversal-2/dsc.in b/t/source/control-field-traversal-2/dsc.in.in
similarity index 91%
rename from t/source/control-field-traversal-2/dsc.in
rename to t/source/control-field-traversal-2/dsc.in.in
index 2615db7..6d05871 100644
--- a/t/source/control-field-traversal-2/dsc.in
+++ b/t/source/control-field-traversal-2/dsc.in.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.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ control-field-traversal-2_1.tar.gz
diff --git a/t/source/control-field-traversal-3/dsc.in b/t/source/control-field-traversal-3/dsc.in.in
similarity index 91%
rename from t/source/control-field-traversal-3/dsc.in
rename to t/source/control-field-traversal-3/dsc.in.in
index 4436f91..74e2a4f 100644
--- a/t/source/control-field-traversal-3/dsc.in
+++ b/t/source/control-field-traversal-3/dsc.in.in
@@ -4,7 +4,7 @@ Binary: control-field-traversal-3
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ control-field-traversal-3_1.tar.gz
diff --git a/t/source/control-file-duplicate-field/dsc.in b/t/source/control-file-duplicate-field/dsc.in.in
similarity index 91%
rename from t/source/control-file-duplicate-field/dsc.in
rename to t/source/control-file-duplicate-field/dsc.in.in
index 60232c2..e7bd2d1 100644
--- a/t/source/control-file-duplicate-field/dsc.in
+++ b/t/source/control-file-duplicate-field/dsc.in.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.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ control-file-duplicate-field_1.tar.gz
diff --git a/t/source/control-file-missing-separator/dsc.in b/t/source/control-file-missing-separator/dsc.in.in
similarity index 92%
rename from t/source/control-file-missing-separator/dsc.in
rename to t/source/control-file-missing-separator/dsc.in.in
index 814cc60..e66300e 100644
--- a/t/source/control-file-missing-separator/dsc.in
+++ b/t/source/control-file-missing-separator/dsc.in.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.9.8
+Standards-Version: {$standards_version}
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-syntax-error/dsc.in b/t/source/control-file-syntax-error/dsc.in.in
similarity index 90%
rename from t/source/control-file-syntax-error/dsc.in
rename to t/source/control-file-syntax-error/dsc.in.in
index 682d0e1..8a918f4 100644
--- a/t/source/control-file-syntax-error/dsc.in
+++ b/t/source/control-file-syntax-error/dsc.in.in
@@ -4,7 +4,7 @@ Binary: control-file-syntax-error
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ control-file-syntax-error_1.tar.gz
diff --git a/t/source/debconf-traversal/dsc.in b/t/source/debconf-traversal/dsc.in.in
similarity index 90%
rename from t/source/debconf-traversal/dsc.in
rename to t/source/debconf-traversal/dsc.in.in
index c83aa67..7ba83e7 100644
--- a/t/source/debconf-traversal/dsc.in
+++ b/t/source/debconf-traversal/dsc.in.in
@@ -4,7 +4,7 @@ Binary: ../unpacked/debian/changelog@NULL@
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ debconf-traversal_1.tar.gz
diff --git a/t/source/debian-source-dir-traversal-1/dsc.in b/t/source/debian-source-dir-traversal-1/dsc.in.in
similarity index 91%
rename from t/source/debian-source-dir-traversal-1/dsc.in
rename to t/source/debian-source-dir-traversal-1/dsc.in.in
index a9aebea..910e5b1 100644
--- a/t/source/debian-source-dir-traversal-1/dsc.in
+++ b/t/source/debian-source-dir-traversal-1/dsc.in.in
@@ -4,7 +4,7 @@ Binary: debian-source-dir-traversal-1
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7), quilt
Checksums-Sha1:
@SHA1@ @SIZE@ debian-source-dir-traversal-1_1.tar.gz
diff --git a/t/source/debian-source-dir-traversal-2/dsc.in b/t/source/debian-source-dir-traversal-2/dsc.in.in
similarity index 91%
rename from t/source/debian-source-dir-traversal-2/dsc.in
rename to t/source/debian-source-dir-traversal-2/dsc.in.in
index 52ab59a..8bcf0e8 100644
--- a/t/source/debian-source-dir-traversal-2/dsc.in
+++ b/t/source/debian-source-dir-traversal-2/dsc.in.in
@@ -4,7 +4,7 @@ Binary: debian-source-dir-traversal-2
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ debian-source-dir-traversal-2_1.tar.gz
diff --git a/t/source/debian-source-dir-unknown-source-format/dsc.in b/t/source/debian-source-dir-unknown-source-format/dsc.in.in
similarity index 92%
rename from t/source/debian-source-dir-unknown-source-format/dsc.in
rename to t/source/debian-source-dir-unknown-source-format/dsc.in.in
index 8f48591..b62c591 100644
--- a/t/source/debian-source-dir-unknown-source-format/dsc.in
+++ b/t/source/debian-source-dir-unknown-source-format/dsc.in.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.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ debian-source-dir-unknown-source-format_1.tar.gz
diff --git a/t/source/debian-symlink/dsc.in b/t/source/debian-symlink/dsc.in.in
similarity index 89%
rename from t/source/debian-symlink/dsc.in
rename to t/source/debian-symlink/dsc.in.in
index a599111..05c2fd5 100644
--- a/t/source/debian-symlink/dsc.in
+++ b/t/source/debian-symlink/dsc.in.in
@@ -4,7 +4,7 @@ Binary: debian-symlink
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ debian-symlink_1.tar.gz
diff --git a/t/source/fields-src-bad-version/dsc.in b/t/source/fields-src-bad-version/dsc.in.in
similarity index 91%
rename from t/source/fields-src-bad-version/dsc.in
rename to t/source/fields-src-bad-version/dsc.in.in
index f393da8..2269f2a 100644
--- a/t/source/fields-src-bad-version/dsc.in
+++ b/t/source/fields-src-bad-version/dsc.in.in
@@ -4,7 +4,7 @@ Binary: control-file-syntax-error
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7), g++ (>= s4.0), gcc ((>= 4)
Checksums-Sha1:
@SHA1@ @SIZE@ control-file-syntax-error_1.tar.gz
diff --git a/t/source/fields-src-fields-filename/dsc.in b/t/source/fields-src-fields-filename/dsc.in.in
similarity index 90%
rename from t/source/fields-src-fields-filename/dsc.in
rename to t/source/fields-src-fields-filename/dsc.in.in
index ce6a5e3..c256315 100644
--- a/t/source/fields-src-fields-filename/dsc.in
+++ b/t/source/fields-src-fields-filename/dsc.in.in
@@ -4,7 +4,7 @@ Binary: fields-src-fields-filename
Architecture: all
Version: 1
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Standards-Version: 3.9.8
+Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7)
Checksums-Sha1:
@SHA1@ @SIZE@ some-other-name_1.tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: