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

[SCM] Debian package checker branch, master, updated. 2.5.6-13-gbcb26a0

The following commit has been merged in the master branch:
commit facfa6c6f6754acd1532ab58dd38bcb519161dd2
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Mar 14 23:46:04 2012 +0100

    files: Remove most of the old X11 file tags
    
    All removed tags are reduced to package-installs-file-to-usr-x11r6.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/files b/checks/files
index a59c791..a668ab7 100644
--- a/checks/files
+++ b/checks/files
@@ -461,18 +461,8 @@ foreach my $file (@{$info->sorted_index}) {
                 tag 'old-style-example-dir', $file;
             }
         }
-        # ---------------- /usr/X11R6/lib/X11/app-defaults
-        elsif ($file =~ m,usr/X11R6/lib/X11/app-defaults,) {
-            tag 'old-app-defaults-directory', $file;
-        }
 
         #----------------- /usr/X11R6/
-        elsif ($file =~ m,^usr/X11R6/bin, && $pkg ne 'x11-common') {
-            tag 'package-installs-file-to-usr-x11r6-bin', $file;
-        }
-        elsif ($file =~ m,^usr/X11R6/lib/X11/fonts,) {
-            tag 'package-installs-font-to-usr-x11r6', $file;
-        }
         elsif ($file =~ m,^usr/X11R6/, and
                $index_info->{type} !~ m,^l,) { #links to FHS locations are allowed
             tag 'package-installs-file-to-usr-x11r6', $file;
diff --git a/checks/files.desc b/checks/files.desc
index 41cb0cb..866309f 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -14,46 +14,6 @@ Info: Your package contains a file that claims to have been generated
  will be rejected by the Debian archive scripts if it contains a file
  with such a timestamp.
 
-Tag: old-app-defaults-directory
-Severity: important
-Certainty: certain
-Info: The app-defaults files have moved to /etc/X11/app-defaults/. Files in
- the old directory, /usr/X11R6/lib/X11/app-defaults/, will no longer be
- used by X. The old directory should not exist in packages at all;
- this prevents X from replacing it with a compatibility symlink.
-Ref: policy 11.8.6
-
-Tag: package-installs-font-to-usr-x11r6
-Severity: important
-Certainty: certain
-Info: The standard location for X fonts has moved to /usr/share/fonts/X11.
- Packages providing X fonts must install them into the new path.  Fonts
- installed into the old /usr/X11R6/lib/X11/fonts path may not be seen by
- the X server.
- .
- If the package uses imake, it must build-depend on xutils-dev (&gt;=
- 1:1.0.2-2) for the correct paths. If it uses dh_installxfonts to handle X
- font installation, it must build-depend on debhelper (&gt;= 5.0.31).
-Ref: policy 11.8.5
-
-Tag: package-installs-file-to-usr-x11r6-bin
-Severity: important
-Certainty: certain
-Info: Debian has switched to the modular X tree which now uses the regular
- FHS paths, and all packages must follow. All packages installing binaries
- must install them into /usr/bin (or some other appropriate location)
- instead of /usr/X11R6/bin.
- .
- The x11-common package attempts to change /usr/X11R6/bin into a symlink
- to /usr/bin, so if this migration has already occurred, a package
- installing files into /usr/X11R6/bin may appear to install
- successfully. However, such a package will be left in an inconsistent
- state and may orphan files when the compatibility link goes away.
- .
- If the package uses imake, it must build-depend on xutils-dev (&gt;=
- 1:1.0.2-2) for the correct paths.
-Ref: policy 11.8.7
-
 Tag: package-installs-file-to-usr-x11r6
 Severity: important
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 02f4865..43aca19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,13 @@ lintian (2.5.7) UNRELEASED; urgency=low
     + Removed:
       - manpage-for-non-x11-binary-in-wrong-directory
       - manpage-for-x11-binary-in-wrong-directory
+      - old-app-defaults-directory
+      - package-installs-file-to-usr-x11r6-bin
+      - package-installs-font-to-usr-x11r6
       - x11-games-should-be-in-usr-games
 
-  * checks/files:
+  * checks/files{,.desc}:
+    + [NT] Remove old tags.
     + [NT] Remove "manual" lazy loads of data files.
   * checks/manpages{,.desc}:
     + [NT] Remove old tags.
diff --git a/t/COVERAGE b/t/COVERAGE
index 33db75c..8ef2bd7 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-03-14
-Coverage: 791/958 (82.57%), w. legacy tests: 896/958 (93.53%)
+Coverage: 789/955 (82.62%), w. legacy tests: 894/955 (93.61%)
 
 The following tags are not tested by the test suite:
 
@@ -35,7 +35,6 @@ files config-file-reserved
 files debug-package-should-be-named-dbg
 files nfs-temporary-file-in-package
 files non-standard-file-permissions-for-etc-init.d-script
-files old-app-defaults-directory
 files old-style-example-dir
 files package-uses-obsolete-file
 files udeb-contains-documentation-file
diff --git a/t/tests/files-foo-in-bar/desc b/t/tests/files-foo-in-bar/desc
index 748c1e9..5d4f9c0 100644
--- a/t/tests/files-foo-in-bar/desc
+++ b/t/tests/files-foo-in-bar/desc
@@ -19,8 +19,6 @@ Test-For:
  image-file-in-usr-lib
  package-contains-xvpics-dir
  package-installs-file-to-usr-x11r6
- package-installs-file-to-usr-x11r6-bin
- package-installs-font-to-usr-x11r6
  package-installs-into-etc-gconf-schemas
  package-installs-into-etc-rc.boot
  package-installs-into-etc-rc.d
diff --git a/t/tests/files-foo-in-bar/tags b/t/tests/files-foo-in-bar/tags
index cf41d6c..d980b09 100644
--- a/t/tests/files-foo-in-bar/tags
+++ b/t/tests/files-foo-in-bar/tags
@@ -22,15 +22,15 @@ E: files-foo-in-bar: nested-examples-directory usr/share/doc/files-foo-in-bar/ex
 E: files-foo-in-bar: non-standard-dir-in-var var/foo/
 E: files-foo-in-bar: package-contains-xvpics-dir usr/share/doc/files-foo-in-bar/.xvpics/
 E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/bin/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/bin/bar
 E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/lib/
 E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/lib/X11/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/lib/X11/fonts/
+E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/lib/X11/fonts/bar
 E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/
 E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
 E: files-foo-in-bar: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/bar.1.gz
-E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
-E: files-foo-in-bar: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/bar
-E: files-foo-in-bar: package-installs-font-to-usr-x11r6 usr/X11R6/lib/X11/fonts/
-E: files-foo-in-bar: package-installs-font-to-usr-x11r6 usr/X11R6/lib/X11/fonts/bar
 E: files-foo-in-bar: package-installs-into-etc-rc.boot etc/rc.boot/bar
 E: files-foo-in-bar: package-installs-into-etc-rc.d etc/rc.d/bar
 E: files-foo-in-bar: perl-module-in-core-directory usr/lib/perl/bar
diff --git a/t/tests/manpages-general/tags b/t/tests/manpages-general/tags
index d4216b9..9e4315b 100644
--- a/t/tests/manpages-general/tags
+++ b/t/tests/manpages-general/tags
@@ -13,11 +13,11 @@ E: manpages-general: manpage-not-compressed-with-gzip usr/share/man/man1/usr-bin
 E: manpages-general: manpage-not-compressed-with-gzip usr/share/man/man1/usr-sbin-binary.1.gz
 E: manpages-general: manpage-not-compressed-with-max-compression usr/share/man/man6/usr-games-binary.6.gz
 E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/
+E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/bin/
+E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/bin/rstartd
 E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/
 E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
 E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/rstartd.1x.gz
-E: manpages-general: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
-E: manpages-general: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/rstartd
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:11
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:12
 I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:13
diff --git a/testset/tags.filenames b/testset/tags.filenames
index b4361ea..955494e 100644
--- a/testset/tags.filenames
+++ b/testset/tags.filenames
@@ -14,8 +14,8 @@ E: filenames: no-copyright-file
 E: filenames: non-standard-toplevel-dir files/
 E: filenames: package-contains-ancient-file usr/lib/perl5/foo/ancient.pm 1975-01-01
 E: filenames: package-installs-file-to-usr-x11r6 usr/X11R6/
-E: filenames: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
-E: filenames: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/testxbin2
+E: filenames: package-installs-file-to-usr-x11r6 usr/X11R6/bin/
+E: filenames: package-installs-file-to-usr-x11r6 usr/X11R6/bin/testxbin2
 E: filenames: package-installs-packlist usr/lib/perl5/foo/.packlist
 E: filenames: postinst-does-not-call-updatemenus usr/share/menu/menu
 E: filenames: subdir-in-usr-bin usr/bin/bin/

-- 
Debian package checker
Reply to: