[lintian] 02/02: c/deb-format: Permit control.tar{, .xz} + data.tar
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 373fb4f335333402038d47b8922a4fb0ecb41179
Author: Niels Thykier <niels@thykier.net>
Date: Wed Nov 30 21:16:44 2016 +0000
c/deb-format: Permit control.tar{,.xz} + data.tar
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/deb-format.pm | 16 ----------------
debian/changelog | 4 ++++
t/debs/deb-format-control-xz/Makefile | 10 ----------
t/debs/deb-format-control-xz/control | 11 -----------
t/debs/deb-format-control-xz/desc | 4 ----
t/debs/deb-format-control-xz/tags | 1 -
t/debs/deb-format-no-compress/tags | 2 --
7 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/checks/deb-format.pm b/checks/deb-format.pm
index 1f78aaa..f1e2c5a 100644
--- a/checks/deb-format.pm
+++ b/checks/deb-format.pm
@@ -130,17 +130,6 @@ sub run {
$failed = 1;
} elsif ($ctrl_member eq 'control.tar') {
tag 'uses-no-compression-for-control-tarball';
- # NB: We deliberately do not allow "data.tar",
- # since various tools seems to be unable to cope
- # with them particularly dak
- # see https://wiki.debian.org/Teams/Dpkg/DebSupport
- tag 'malformed-deb-archive','newer uncompressed control.tar';
- } elsif ($ctrl_member eq 'control.tar.xz') {
- # NB: We deliberately do not allow "data.tar",
- # since various tools seems to be unable to cope
- # with them particularly dak
- # see https://wiki.debian.org/Teams/Dpkg/DebSupport
- tag 'malformed-deb-archive','newer compressed control.tar.xz';
}
}
@@ -172,11 +161,6 @@ sub run {
tag 'uses-deprecated-compression-for-data-tarball', 'bzip2';
} elsif ($data_member eq 'data.tar') {
tag 'uses-no-compression-for-data-tarball';
- # NB: We deliberately do not allow "data.tar",
- # since various tools seems to be unable to cope
- # with them particularly dak
- # see https://wiki.debian.org/Teams/Dpkg/DebSupport
- tag 'malformed-deb-archive','newer uncompressed data.tar';
}
}
} else {
diff --git a/debian/changelog b/debian/changelog
index fe9a87b..0f48a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ lintian (2.5.50) UNRELEASED; urgency=medium
* checks/cruft.desc:
+ [BR] Detect utf convert non free code.
(Closes: #843595)
+ * checks/deb-format.pm:
+ + [NT] Permit uncompressed {control,data}.tar members plus xz
+ compressed control.tar files in deb files. Thanks to
+ Guillem Jover for the report. (Closes: #834867)
* checks/debhelper.pm:
+ [BR] Apply patch from Yann Soubeyrand :
"Allow debhelper "--with" addons to be quoted".
diff --git a/t/debs/deb-format-control-xz/Makefile b/t/debs/deb-format-control-xz/Makefile
deleted file mode 100644
index b2f5443..0000000
--- a/t/debs/deb-format-control-xz/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-name = deb-format-control-xz
-
-# Done by hand, create-deb cannot do this and it would
-# be "too much effort" to make it be able to do it.
-all:
- create-deb -o $(name).deb --control-compression xz -c xz \
- control
-clean:
- rm -f *.tar.xz *.deb md5sums debian-binary
- rm -rf root
diff --git a/t/debs/deb-format-control-xz/control b/t/debs/deb-format-control-xz/control
deleted file mode 100644
index fd0c956..0000000
--- a/t/debs/deb-format-control-xz/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: deb-format-control-xz
-Version: 1.0
-Architecture: all
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
-Section: devel
-Priority: extra
-Description: Test package with control.tar.xz
- 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.
diff --git a/t/debs/deb-format-control-xz/desc b/t/debs/deb-format-control-xz/desc
deleted file mode 100644
index b10dcb3..0000000
--- a/t/debs/deb-format-control-xz/desc
+++ /dev/null
@@ -1,4 +0,0 @@
-Testname: deb-format-control-xz
-Version: 1.0
-Description: Test package with control.tar.xz
-Test-Depends: dpkg (>= 1.17.6)
diff --git a/t/debs/deb-format-control-xz/tags b/t/debs/deb-format-control-xz/tags
deleted file mode 100644
index 2b7fd56..0000000
--- a/t/debs/deb-format-control-xz/tags
+++ /dev/null
@@ -1 +0,0 @@
-E: deb-format-control-xz: malformed-deb-archive newer compressed control.tar.xz
diff --git a/t/debs/deb-format-no-compress/tags b/t/debs/deb-format-no-compress/tags
index c474c6b..76c1d7e 100644
--- a/t/debs/deb-format-no-compress/tags
+++ b/t/debs/deb-format-no-compress/tags
@@ -1,4 +1,2 @@
-E: deb-format-no-compress: malformed-deb-archive newer uncompressed control.tar
-E: deb-format-no-compress: malformed-deb-archive newer uncompressed data.tar
E: deb-format-no-compress: uses-no-compression-for-control-tarball
E: deb-format-no-compress: uses-no-compression-for-data-tarball
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: