[texlive-nonbin] 01/08: revert bitstream charter replacement
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit 78b7fa313783f6a322ac23c75ddf40df50218b74
Author: Norbert Preining <preining@debian.org>
Date: Thu Sep 5 10:20:54 2013 +0900
revert bitstream charter replacement
lintian error:
Tag: package-depends-on-an-x-font-package
Severity: important
Certainty: certain
Info: Packages must not depend on X Window System font packages.
.
If one or more of the fonts so packaged are necessary for proper operation
of the package with which they are associated the font package may be
Recommended; if the fonts merely provide an enhancement, a Suggests
relationship may be used.
Ref: policy 11.8.5
---
all/debian/cfg.d/font-ignore.cfg | 9 ---------
texlive-base/debian/changelog | 3 +--
texlive-base/debian/texlive-fonts-recommended.links.dist | 8 --------
texlive-base/debian/texlive-fonts-recommended.type1-fontdirs | 1 +
4 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/all/debian/cfg.d/font-ignore.cfg b/all/debian/cfg.d/font-ignore.cfg
index 89ed4e4..6bc774b 100644
--- a/all/debian/cfg.d/font-ignore.cfg
+++ b/all/debian/cfg.d/font-ignore.cfg
@@ -127,15 +127,6 @@ blacklist;file;texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf
# forget about marvosym ttf package, we don't need the ttf font here
#depends;texlive-fonts-recommended;ttf-marvosym
blacklist;file;texmf-dist/fonts/truetype/public/marvosym/marvosym.ttf
-depends;texlive-fonts-recommended;xfonts-scalable
-blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchri8a.pfb
-blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchri8a.afm
-blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchr8a.pfb
-blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchr8a.afm
-blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchb8a.pfb
-blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchb8a.afm
-blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchbi8a.pfb
-blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchbi8a.afm
depends;texlive-fonts-extra;fonts-stix
blacklist;file;texmf-dist/fonts/opentype/public/stix/STIXGeneralBolIta.otf
blacklist;file;texmf-dist/fonts/opentype/public/stix/STIXGeneralBol.otf
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 58623a4..28fa2a0 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -3,10 +3,9 @@ texlive-base (2013.20130904-1) UNRELEASED; urgency=low
* new upstream checkout
- don't ship strange duplicates of Nimbus Sans (Closes: #690125)
* remove /etc/texmf/dvipdfm/config/config (Closes: #713797)
- * link instead of ship bitstream charter fonts (Closes: #721633)
* do not ship marvosym.ttf via dependency (Closes: #721716)
- -- Norbert Preining <preining@debian.org> Wed, 04 Sep 2013 15:02:21 +0900
+ -- Norbert Preining <preining@debian.org> Thu, 05 Sep 2013 10:18:31 +0900
texlive-base (2013.20130722-1) unstable; urgency=low
diff --git a/texlive-base/debian/texlive-fonts-recommended.links.dist b/texlive-base/debian/texlive-fonts-recommended.links.dist
deleted file mode 100644
index d88dec5..0000000
--- a/texlive-base/debian/texlive-fonts-recommended.links.dist
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/fonts/X11/Type1/c0649bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchri8a.pfb
-usr/share/fonts/X11/Type1/c0649bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchri8a.afm
-usr/share/fonts/X11/Type1/c0632bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchb8a.pfb
-usr/share/fonts/X11/Type1/c0632bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchb8a.afm
-usr/share/fonts/X11/Type1/c0648bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchr8a.pfb
-usr/share/fonts/X11/Type1/c0648bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchr8a.afm
-usr/share/fonts/X11/Type1/c0633bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchbi8a.pfb
-usr/share/fonts/X11/Type1/c0633bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchbi8a.afm
diff --git a/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs b/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs
index b70bb60..1c2e8e1 100644
--- a/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs
+++ b/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs
@@ -1,2 +1,3 @@
texmf-dist/fonts/type1/adobe
+texmf-dist/fonts/type1/bitstrea
texmf-dist/fonts/type1/urw
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: