[SCM] Debian package checker branch, master, updated. 2.5.10-179-g0e1f243
The following commit has been merged in the master branch:
commit 0e1f243b69addd21056ea3d9e53f7090f180a2db
Author: Niels Thykier <niels@thykier.net>
Date: Fri Jun 8 17:29:00 2012 +0200
t/runtests: Add support for purging upstream debian/ dirs
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/runtests b/t/runtests
index e4715c6..062eaec 100755
--- a/t/runtests
+++ b/t/runtests
@@ -58,7 +58,7 @@ BEGIN {
use lib "$ENV{'LINTIAN_ROOT'}/lib";
-use Lintian::Util qw(fail read_dpkg_control);
+use Lintian::Util qw(delete_dir fail read_dpkg_control slurp_entire_file);
# --- Global configuration
@@ -407,6 +407,13 @@ sub test_package {
}
runsystem("cd $rundir && ".
"tar czf ${pkg}_${orig_version}.orig.tar.gz $pkgdir");
+ if ( -f "$origdir/debian/debian/source/format" ) {
+ my $format = slurp_entire_file ("$origdir/debian/debian/source/format");
+ chomp $format;
+ if ($format =~ m/^3.\d+ \(quilt\)$/) {
+ delete_dir ("$targetdir/debian/");
+ }
+ }
}
copy_template_dir("$tmpldir/$skel", "$origdir/debian/", $targetdir,
['--exclude=debian/changelog']);
diff --git a/t/tests/basic-3.0-native/debian/README b/t/tests/basic-quilt-updeb/debian/README
similarity index 100%
copy from t/tests/basic-3.0-native/debian/README
copy to t/tests/basic-quilt-updeb/debian/README
diff --git a/t/tests/basic-quilt/debian/debian/patches/extra-readme b/t/tests/basic-quilt-updeb/debian/debian/patches/extra-readme
similarity index 100%
copy from t/tests/basic-quilt/debian/debian/patches/extra-readme
copy to t/tests/basic-quilt-updeb/debian/debian/patches/extra-readme
diff --git a/t/tests/basic-quilt/debian/debian/patches/series b/t/tests/basic-quilt-updeb/debian/debian/patches/series
similarity index 100%
copy from t/tests/basic-quilt/debian/debian/patches/series
copy to t/tests/basic-quilt-updeb/debian/debian/patches/series
diff --git a/t/tests/basic-quilt/debian/debian/source/format b/t/tests/basic-quilt-updeb/debian/debian/source/format
similarity index 100%
copy from t/tests/basic-quilt/debian/debian/source/format
copy to t/tests/basic-quilt-updeb/debian/debian/source/format
diff --git a/t/tests/basic-quilt/desc b/t/tests/basic-quilt-updeb/desc
similarity index 79%
copy from t/tests/basic-quilt/desc
copy to t/tests/basic-quilt-updeb/desc
index 53a99b9..df63881 100644
--- a/t/tests/basic-quilt/desc
+++ b/t/tests/basic-quilt-updeb/desc
@@ -1,4 +1,4 @@
-Testname: basic-quilt
+Testname: basic-quilt-updeb
Sequence: 0001
Type: non-native
Version: 1.0-1
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/basic-quilt-updeb/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/basic-quilt-updeb/tags
diff --git a/t/tests/basic-3.0-native/debian/README b/t/tests/basic-quilt-updeb/upstream/README
similarity index 100%
copy from t/tests/basic-3.0-native/debian/README
copy to t/tests/basic-quilt-updeb/upstream/README
diff --git a/reporting/lintian-dummy.cfg b/t/tests/basic-quilt-updeb/upstream/debian/basic-quilt-updeb.doc-base.EX
similarity index 100%
copy from reporting/lintian-dummy.cfg
copy to t/tests/basic-quilt-updeb/upstream/debian/basic-quilt-updeb.doc-base.EX
diff --git a/reporting/lintian-dummy.cfg b/t/tests/basic-quilt-updeb/upstream/debian/postinst.ex
similarity index 100%
copy from reporting/lintian-dummy.cfg
copy to t/tests/basic-quilt-updeb/upstream/debian/postinst.ex
--
Debian package checker
Reply to: