[SCM] Debian package checker branch, master, updated. 2.2.14-12-g7821234

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 1abfd52c14914422256f24abe434f92d1678c42f
Author: Russ Allbery <rra@debian.org>
Date:   Sat Sep 12 14:50:31 2009 -0700

    Allow t1- and xfonts- as prefixes for font packages
    
    * checks/files{,.desc}:
      + [RA] Allow t1- and xfonts- as prefixes for font packages since the
        font regex is also looking for Type 1 fonts.  Thanks, Rogério
        Brito.  (Closes: #542389)
      + [RA] Stop looking for *.pcf files outside font packages.  The check
        wasn't triggering since PCF files are always compressed, and the
        situation for PCF font packages is more complex and not suitable for
        the same check.

diff --git a/checks/files b/checks/files
index fb9ae1d..0359d28 100644
--- a/checks/files
+++ b/checks/files
@@ -774,14 +774,14 @@ foreach my $file (sort keys %{$info->index}) {
 	}
 
 	# ---------------- fonts
-	if ($file =~ m,/([\w-]+\.(?:[to]tf|pfb|pcf))$,i) {
+	if ($file =~ m,/([\w-]+\.(?:[to]tf|pfb))$,i) {
 	    my $font = lc $1;
 	    $FONT_PACKAGES = Lintian::Data->new('files/fonts', '\s+')
 		unless defined($FONT_PACKAGES);
 	    if ($FONT_PACKAGES->known($font)) {
 		tag 'duplicate-font-file', "$file also in", $FONT_PACKAGES->value($font)
 		    if ($pkg ne $FONT_PACKAGES->value($font) and $type ne 'udeb');
-	    } elsif ($pkg !~ m/^[ot]tf-/) {
+	    } elsif ($pkg !~ m/^(?:[ot]tf|t1|xfonts)-/) {
 		tag 'font-in-non-font-package', $file;
 	    }
 	}
diff --git a/checks/files.desc b/checks/files.desc
index 3e63a99..4487cb5 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -917,13 +917,15 @@ Info: This package appears to contain development files only meaningful to
 Tag: font-in-non-font-package
 Severity: wishlist
 Certainty: possible
-Info: This package contains a *.ttf or *.otf file, file extensions
- normally used for TrueType or OpenType fonts, but the package does not
- appear to be a dedicated font package.  (Dedicated font package names
- should begin with <tt>ttf-</tt> or <tt>otf-</tt>.)  If the font is
- already packaged, you should depend on that package instead.  Otherwise,
- normally the font should be packaged separately, since fonts are usually
- useful outside of the package that embeds them.
+Info: This package contains a *.ttf, *.otf, or *.pfb file, file
+ extensions used by TrueType, OpenType, or Type 1 fonts, but the package
+ does not appear to be a dedicated font package.  Dedicated font package
+ names should begin with <tt>ttf-</tt>, <tt>otf-</tt>, or <tt>t1-</tt>,
+ depending on the types of fonts included.  (Type 1 fonts are also allowed
+ in packages starting with <tt>xfonts-</tt>.)  If the font is already
+ packaged, you should depend on that package instead.  Otherwise, normally
+ the font should be packaged separately, since fonts are usually useful
+ outside of the package that embeds them.
 
 Tag: duplicate-font-file
 Severity: normal
diff --git a/debian/changelog b/debian/changelog
index b0450e5..c4a85b2 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ lintian (2.2.15) UNRELEASED; urgency=low
     + [RA] Use Lintian::Data to read the essential package list.
     + [RA] Stop allowing unversioned build dependencies on coreutils.  The
       migration from fileutils is long since finished.
-  * checks/files:
+  * checks/files{,.desc}:
     + [RA] Suppress non-standard-dir-perm for /tmp, /var/tmp, /var/local,
       /var/lock, and /usr/src if they have their normal owner and
       permissions.  This suppresses some Lintian tags for base-files.
@@ -19,6 +19,13 @@ lintian (2.2.15) UNRELEASED; urgency=low
     + [RA] Remove swfobject.js from the known packaged Javascript
       libraries.  The version in libjs-yui is old and the new version is
       not packaged.  Thanks, Giuseppe Iuculano.  (Closes: #542046)
+    + [RA] Allow t1- and xfonts- as prefixes for font packages since the
+      font regex is also looking for Type 1 fonts.  Thanks, Rogério
+      Brito.  (Closes: #542389)
+    + [RA] Stop looking for *.pcf files outside font packages.  The check
+      wasn't triggering since PCF files are always compressed, and the
+      situation for PCF font packages is more complex and not suitable for
+      the same check.
   * checks/manpages:
     + [ADB] Add HTTPS to the list of recognised protocols for URLs in manpages
       which should not cause manpage-has-errors-from-man to be emitted.

-- 
Debian package checker