[SCM] Debian package checker branch, master, updated. 2.5.2-52-ga92d714
The following commit has been merged in the master branch:
commit 16e351ca7a98265e6eb7ffa4e6cc705af8b93535
Author: Paul Wise <pabs@debian.org>
Date: Thu Aug 25 19:29:44 2011 +0200
Also search for fonts in packages with names starting with fonts-
This is the new font naming policy for Debian.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/data/files/fonts b/data/files/fonts
index 69631a0..03da667 100644
--- a/data/files/fonts
+++ b/data/files/fonts
@@ -1,6 +1,6 @@
# The list of known font filenames already packaged for Debian and the
# package that contains the font. Only packages starting with ttf-,
-# otf-, t1-, and xfonts- are searched for fonts.
+# otf-, t1-, xfonts- and fonts- are searched for fonts.
#
# Last updated: 2011-02-19
diff --git a/private/refresh-fonts-data b/private/refresh-fonts-data
index dcfad6c..713c376 100755
--- a/private/refresh-fonts-data
+++ b/private/refresh-fonts-data
@@ -69,7 +69,7 @@ mkdir -p "$lintian_data/files"
cat > "$workdir/fonts" <<EOF
# The list of known font filenames already packaged for Debian and the
# package that contains the font. Only packages starting with ttf-,
-# otf-, t1-, and xfonts- are searched for fonts.
+# otf-, t1-, xfonts- and fonts- are searched for fonts.
#
# Last updated: $(date -u +'%Y-%m-%d')
@@ -80,7 +80,7 @@ if [ -z "$contents" ] ; then
contents="$workdir/Contents-i386.gz"
fi
zcat "$contents" \
- | perl -n -w -E 'print lc $_ if (s%^.+/([\w-]+\.(?:[to]tf|pfb))\s+\w+/((?:[to]tf|t1|xfonts)-[^,]+)(,.+)?$%$1 $2%i);' \
+ | perl -n -w -E 'print lc $_ if (s%^.+/([\w-]+\.(?:[to]tf|pfb))\s+\w+/((?:[to]tf|t1|x?fonts)-[^,]+)(,.+)?$%$1 $2%i);' \
| LC_ALL=C sort >> "$workdir/fonts"
# Fonts in xfonts-tipa are really shipped by tipa.
sed -i 's/ xfonts-tipa$/ tipa/g' "$workdir/fonts"
--
Debian package checker
Reply to: