[lintian] 01/02: Rename compressed-objects.inv to file-should-not-be-compressed and use it for doxygen map.gz
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 6d1f38b75bc9558989eef8345eff24177515f445
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Sun Nov 16 21:47:41 2014 +0100
Rename compressed-objects.inv to file-should-not-be-compressed and use it for doxygen map.gz
Detect should not be compressed map file (Closes: #751949).
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/files.desc | 8 +++-----
checks/files.pm | 13 ++++++++++---
debian/changelog | 4 ++++
.../debian/src/doc/html/graph_legend.map.gz | Bin 0 -> 52 bytes
t/tests/files-doxygen-documentation/desc | 1 +
t/tests/files-doxygen-documentation/tags | 1 +
t/tests/files-python-general/desc | 2 +-
t/tests/files-python-general/tags | 2 +-
8 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/checks/files.desc b/checks/files.desc
index c6b8949..c9f19d8 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1457,15 +1457,13 @@ Info: The package appears to ship locales for a language but uses an
It is possible that the language code was mistyped or incorrectly
guessed from the language's or country's name.
-Tag: compressed-objects.inv
+Tag: file-should-not-be-compressed
Severity: normal
Certainty: possible
-Info: The package appears to ship a gzip compressed objects.inv file
- in it's documentation. Unfortunately some tools do not cope with
- this file being compressed.
+Info: The following file should not be compressed.
.
This file should be excluded from compression during build time.
- If using debhelper (<< 8.1.0), you may need to use the -X
+ If using debhelper (<< 9.20140227), you may need to use the -X
option to dh_compress. Newer versions of debhelper handle this
correctly by default.
diff --git a/checks/files.pm b/checks/files.pm
index c293842..a1f70cd 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -534,7 +534,7 @@ sub run {
unless (
$fname =~ m,^usr/share/doc/(?:[^/]+/)?examples/,
or $fname
- =~ m,^usr/share/doc/(?:.+/)?html/.*\.map$,
+ =~ m,^usr/share/doc/(?:.+/)?(?:doxygen|html)/.*\.map$,
or $fname
=~ m,^usr/share/doc/(?:.+/)?__init__\.py$,){
tag 'zero-byte-file-in-doc-directory', $file;
@@ -582,7 +582,7 @@ sub run {
if ($fname
=~ m,^usr/share/doc/$ppkg/(?:[^/]+/)+objects\.inv\.gz$,
and $file->file_info =~ m/gzip compressed/) {
- tag 'compressed-objects.inv', $file;
+ tag 'file-should-not-be-compressed', $file;
}
}
@@ -1148,13 +1148,20 @@ sub run {
tag 'override-file-in-wrong-location', $file;
}
- # doxygen map + md5sum
+ # doxygen md5sum
if ($fname =~ m,^usr/share/doc/$ppkg/[^/]+/.+\.md5$,) {
if ($file->parent_dir->child('doxygen.png')) {
tag 'useless-autogenerated-doxygen-file', $file;
}
}
+ # doxygen compressed map
+ if ($fname =~ m,^usr/share/doc/(?:.+/)?(?:doxygen|html)/
+ .*\.map\.$COMPRESS_FILE_EXTENSIONS_OR_ALL,x) {
+ tag 'file-should-not-be-compressed', $file;
+ }
+
+
# ---------------- pyshared-data
if ($fname=~ m,^usr/share/python-support/$ppkg\.(?:public|private)$,){
$py_support_nver = '(>= 0.90)';
diff --git a/debian/changelog b/debian/changelog
index 72012af..11685c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ lintian (2.5.31) UNRELEASED; urgency=medium
* checks/fields.desc:
+ [BR] Add reference to build-depends-on-metapackage
(Closes: #767107).
+ * checks/files.{desc,pm}:
+ + [BR] Rename compressed-objects.inv to
+ file-should-not-be-compressed and use it for doxygen
+ map.gz (Closes: #751949).
* checks/source-copyright.{desc,pm}:
+ [BR] Fix a false positive for
missing-license-paragraph-in-dep5-copyright tag.
diff --git a/t/tests/files-doxygen-documentation/debian/src/doc/html/graph_legend.map.gz b/t/tests/files-doxygen-documentation/debian/src/doc/html/graph_legend.map.gz
new file mode 100644
index 0000000..2b2d51e
Binary files /dev/null and b/t/tests/files-doxygen-documentation/debian/src/doc/html/graph_legend.map.gz differ
diff --git a/t/tests/files-doxygen-documentation/desc b/t/tests/files-doxygen-documentation/desc
index a43867c..5f02502 100644
--- a/t/tests/files-doxygen-documentation/desc
+++ b/t/tests/files-doxygen-documentation/desc
@@ -6,5 +6,6 @@ Skeleton: pedantic
Options: --pedantic -I -E
Architecture: any
Test-For:
+ file-should-not-be-compressed
source-contains-prebuilt-doxygen-documentation
useless-autogenerated-doxygen-file
diff --git a/t/tests/files-doxygen-documentation/tags b/t/tests/files-doxygen-documentation/tags
index 4330bb5..c572720 100644
--- a/t/tests/files-doxygen-documentation/tags
+++ b/t/tests/files-doxygen-documentation/tags
@@ -1,3 +1,4 @@
I: files-doxygen-documentation: possible-documentation-but-no-doc-base-registration
I: files-doxygen-documentation: useless-autogenerated-doxygen-file usr/share/doc/files-doxygen-documentation/html/doc/html/graph_legend.md5
P: files-doxygen-documentation source: source-contains-prebuilt-doxygen-documentation src/doc/html/
+W: files-doxygen-documentation: file-should-not-be-compressed usr/share/doc/files-doxygen-documentation/html/doc/html/graph_legend.map.gz
diff --git a/t/tests/files-python-general/desc b/t/tests/files-python-general/desc
index 8e1054c..b264413 100644
--- a/t/tests/files-python-general/desc
+++ b/t/tests/files-python-general/desc
@@ -4,7 +4,7 @@ Version: 1.0
Description: Test general Python related tags
References: Debian Bug#608810, Debian Bug#756005
Test-For:
- compressed-objects.inv
+ file-should-not-be-compressed
package-installs-python-bytecode
package-installs-python-egg
package-installs-python-pycache-dir
diff --git a/t/tests/files-python-general/tags b/t/tests/files-python-general/tags
index c7d1a91..efc9189 100644
--- a/t/tests/files-python-general/tags
+++ b/t/tests/files-python-general/tags
@@ -3,4 +3,4 @@ E: python-kinterbasdb: package-installs-python-bytecode usr/share/python-kinterb
E: python-kinterbasdb: package-installs-python-egg usr/share/python-kinterbasdb/python.egg
E: python-kinterbasdb: package-installs-python-pycache-dir usr/share/python-kinterbasdb/__pycache__/
W: python-kinterbasdb-dbg: python-debug-in-wrong-location usr/lib/debug/usr/lib/pyshared/python2.7/python-module.so usr/lib/debug/usr/lib/pymodules/python2.7/python-module.so
-W: python-kinterbasdb: compressed-objects.inv usr/share/doc/python-kinterbasdb/docs/objects.inv.gz
+W: python-kinterbasdb: file-should-not-be-compressed usr/share/doc/python-kinterbasdb/docs/objects.inv.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: