[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.18-64-gad85634



The following commit has been merged in the master branch:
commit 8e419f411de7d21af6045f2d70a3680468419f02
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Wed Sep 16 18:15:21 2009 -0500

    Check for duplicated compressed and uncompressed files

diff --git a/checks/files b/checks/files
index 8f77421..5a7dd9d 100644
--- a/checks/files
+++ b/checks/files
@@ -808,6 +808,12 @@ foreach my $file (sort keys %{$info->index}) {
 	    }
 	}
 
+	# --------------- compressed + uncompressed files
+	if ($file =~ m,^(.+)\.(?:gz|bz2)$,) {
+	    tag 'duplicated-compressed-file', $file
+		if exists $info->file_info->{$1};
+	}
+
 	# ---------------- general: setuid/setgid files!
 	if ($operm & 04000 or $operm & 02000) {
 	    my ($setuid, $setgid) = ("","");
diff --git a/checks/files.desc b/checks/files.desc
index fabc761..490bb6f 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -1076,3 +1076,11 @@ Info: This package contains files under <tt>/usr/share/games</tt>, such as
  equivalent and using the upstream installation rules.  These files need
  to be moved into the corresponding directories directly under
  <tt>/usr/share</tt>.
+
+Tag: duplicated-compressed-file
+Severity: normal
+Certainty: possible
+Info: The given, apparently compressed, file is shipped in the package
+ in addition to another file with the same name without the
+ compression-method extension.  Normally this indicates a mistake in
+ the installation process of the package.
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index 4539338..bf64f88 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -1,5 +1,6 @@
 lintian-16x16.png usr/share/apps/lintian/icons/hicolor/22x22
 lintian-22x22.png usr/share/apps/lintian/icons/hicolor/22x22
+lintian-16x16.png usr/share/doc/lintian/
 lintian-22x22.png usr/share/games/icons/hicolor/22x22
 --lzma etc/modprobe.d
 lintian.conf etc/modprobe.d
diff --git a/t/tests/files-general/debian/debian/rules b/t/tests/files-general/debian/debian/rules
index 6274ad9..7069dab 100755
--- a/t/tests/files-general/debian/debian/rules
+++ b/t/tests/files-general/debian/debian/rules
@@ -8,3 +8,10 @@ tmp = $(CURDIR)/debian/$(shell dh_listpackages)
 override_dh_fixperms:
 	dh_fixperms
 	chmod 755 $(tmp)/usr/share/man/man5/foo.5.gz
+
+override_dh_compress:
+	dh_compress
+	# create a .png and .png.gz
+	gzip -1 $(tmp)/usr/share/doc/lintian/lintian-16x16.png
+	zcat $(tmp)/usr/share/doc/lintian/lintian-16x16.png.gz > \
+		$(tmp)/usr/share/doc/lintian/lintian-16x16.png
diff --git a/t/tests/files-general/desc b/t/tests/files-general/desc
index 55bb04e..ed35486 100644
--- a/t/tests/files-general/desc
+++ b/t/tests/files-general/desc
@@ -5,6 +5,7 @@ Description: Test tags for file paths, names, and modes
 Test-For:
  dir-or-file-in-var-lock
  dir-or-file-in-var-run
+ duplicated-compressed-file
  executable-manpage
  global-data-in-games-directory
  icon-size-and-directory-name-mismatch
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index e43ee8a..b77d250 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -7,6 +7,7 @@ E: files-general: package-contains-info-dir-file usr/share/info/dir.gz
 E: files-general: package-modifies-ld.so-search-path etc/ld.so.conf.d/lintian-lib.conf
 E: files-general: stray-directory-in-manpage-directory usr/share/man/man1/random/
 I: files-general: package-contains-empty-directory usr/share/man/man1/random/
+W: files-general: duplicated-compressed-file usr/share/doc/lintian/lintian-16x16.png.gz
 W: files-general: executable-not-elf-or-script ./usr/share/man/man5/foo.5.gz
 W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/22x22/lintian-16x16.png 16x16
 W: files-general: windows-devel-file-in-package usr/lib/foo/foo.vcproj

-- 
Debian package checker


Reply to: