[SCM] Debian packaging of tex-gyre) branch, master, updated. upstream/2.004.1-14-g32fd070
The following commit has been merged in the master branch:
commit 32fd070a0c5104d2019ca3394183713a1bc85d12
Author: Norbert Preining <preining@debian.org>
Date: Tue Oct 9 17:02:33 2012 +0900
rework rules file, fix some empty dirs, fix descriptions, compat 7
diff --git a/debian/fontconf-aliases.conf b/debian/30-fonts-texgyre-aliases.conf
similarity index 100%
rename from debian/fontconf-aliases.conf
rename to debian/30-fonts-texgyre-aliases.conf
diff --git a/debian/fontconf-opentype.conf b/debian/65-fonts-texgyre.conf
similarity index 100%
rename from debian/fontconf-opentype.conf
rename to debian/65-fonts-texgyre.conf
diff --git a/debian/changelog b/debian/changelog
index c0c1c02..310145e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tex-gyre (2.004.1-5~2) experimental; urgency=low
+tex-gyre (2.004.1-5~3) experimental; urgency=low
Thanks to Fabian Greffrath who provided the fontconfig conf files,
did lots of inquire and testing.
@@ -9,9 +9,9 @@ tex-gyre (2.004.1-5~2) experimental; urgency=low
* register fonts as metric compatible alternatives to the Adobe Fonts
(Closes: #616419)
* bump standards version, shut lintian up since we create the
- copyright file
+ copyright file, use .install files, bump compat level to 7
- -- Norbert Preining <preining@debian.org> Tue, 09 Oct 2012 08:57:15 +0900
+ -- Norbert Preining <preining@debian.org> Tue, 09 Oct 2012 17:05:01 +0900
tex-gyre (2.004.1-4) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 6f7f9d0..0c1a748 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: tex-gyre
Section: tex
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, fonts-texgyre
+Depends: ${misc:Depends}, fonts-texgyre (= ${source:Version})
Description: scalable PostScript and OpenType fonts based on URW Fonts
The TeX Gyre project, following the Latin Modern project, aims at providing
a rich collection of diacritical characters in the attempt to cover as many
@@ -23,38 +23,7 @@ Description: scalable PostScript and OpenType fonts based on URW Fonts
This package provides TeX support and Type1 (PostScript) fonts. If only
the OpenType fonts are needed, please see the package fonts-texgyre.
.
- The TeX-GYRE bundle consists of seven font families:
- .
- The TeX Gyre Adventor family of fonts is based on the URW Gothic L
- family (designed by Herb Lubalin and Tom Carnase).
- .
- The TeX Gyre Bonum family of fonts is based on the URW Bookman L family
- (designed by Alexander Phemister).
- .
- The TeX Gyre Chorus font is based on URW Chancery L Medium Italic
- (designed by Hermann Zapf (ITC Zapf Chancery(R), 1979)).
- .
- The TeX Gyre Cursor family is based on the URW Nimbus Mono L family
- (designed by Howard G. (Bud) Kettler in 1955 for the IBM corporation).
- .
- The TeX Gyre Heros family of fonts is based on the URW Nimbus Sans L
- (prepared by Max Miedinger, with Eduard Hoffmann).
- .
- The TeX Gyre Pagella family of fonts is based on the URW Palladio L
- family (designed by Hermann Zapf).
- .
- The TeX Gyre Schola family of fonts is based on the URW Century
- Schoolbook L family (designed by Morris Fuller Benton).
- .
- The TeX Gyre Termes is based on the URW Nimbus Roman No9 L family
- (designed by Stanley Morison together with Starling Burgess and
- Victor Lardent).
- .
- The constituent 4 standard faces of each family have been greatly
- extended, and contain nearly 1200 glyphs each. Each family is
- available in Adobe Type 1 and Open Type formats, and LaTeX support
- (for use with a variety of encodings) is provided. Vietnamese
- characters were added by Han The Thanh.
+ See the description for fonts-texgyre package for more information.
Package: fonts-texgyre
Section: fonts
@@ -71,6 +40,9 @@ Description: OpenType fonts based on URW Fonts
This package provides the OpenType variant of these fonts. For support
for TeX and Type 1 (PostScript) fonts, see the tex-gyre package.
.
+ The fonts shipped in this package are registered as alternatives for the
+ 35 core PostScript fonts with fontconfig.
+ .
The TeX-GYRE bundle consists of seven font families:
.
The TeX Gyre Adventor family of fonts is based on the URW Gothic L
diff --git a/debian/fonts-texgyre.install b/debian/fonts-texgyre.install
new file mode 100644
index 0000000..0cb1430
--- /dev/null
+++ b/debian/fonts-texgyre.install
@@ -0,0 +1,4 @@
+fonts/opentype/public/tex-gyre/*.otf usr/share/texmf/fonts/opentype/public/tex-gyre
+doc/fonts/tex-gyre/* usr/share/doc/texmf/fonts/tex-gyre
+debian/65-fonts-texgyre.conf etc/fonts/conf.avail
+debian/30-fonts-texgyre-aliases.conf etc/fonts/conf.avail
diff --git a/debian/lintian-overrides b/debian/fonts-texgyre.lintian-overrides
similarity index 100%
rename from debian/lintian-overrides
rename to debian/fonts-texgyre.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 0afb8b9..f038490 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,77 +112,13 @@ binary-indep: build-indep
# pairs will be added to it in the relevant places.
: > "debian/$(PKG).links"
- dh_installdirs \
- usr/share/texmf/fonts/type1/public/tex-gyre \
- usr/share/texmf/fonts/opentype/public/tex-gyre \
- usr/share/texmf/fonts/afm/public/tex-gyre \
- usr/share/texmf/fonts/tfm/public/tex-gyre \
- usr/share/texmf/fonts/enc/dvips/tex-gyre \
- usr/share/texmf/fonts/map/dvips/tex-gyre \
- usr/share/texmf/tex/latex/tex-gyre \
- etc/X11/fonts/Type1 \
- etc/fonts/conf.avail \
- usr/share/fonts/X11/Type1
-
- dh_installdirs -p $(PKGFONTS) \
- usr/share/texmf/fonts/opentype/public/tex-gyre \
- usr/share/doc/texmf/fonts/tex-gyre \
- etc/fonts/conf.avail \
- usr/share/lintian/overrides
-
-
- # Note: we won't install the PFM files because we already have the
- # AFM files which are preferred in general.
-
- # Install all the PFB files in the right place for TeX and friends
- $(INSTALL_FILE) fonts/type1/public/tex-gyre/*.pfb \
- "$(PKG_INSTALL_DIR)/usr/share/texmf/fonts/type1/public/tex-gyre"
-
- # Install all the OpenType files in the right place for TeX and friends
- $(INSTALL_FILE) fonts/opentype/public/tex-gyre/*.otf \
- "$(PKGFONTS_INSTALL_DIR)/usr/share/texmf/fonts/opentype/public/tex-gyre"
-
- # Install all the AFM files in the right place for TeX and friends
- for file in fonts/afm/public/tex-gyre/*.afm; do \
- DEST_FILE="$(PKG_INSTALL_DIR)/usr/share/texmf/$$file" \
- && cp "$$file" "$$DEST_FILE" \
- && chown root:root "$$DEST_FILE" \
- && chmod 644 "$$DEST_FILE"; \
- done
# Setup symlinks so that X can see the AFM and PFB files as well.
sed -nf debian/sed_scripts/gen-x-fonts-links-list \
"debian/$(PKG).fontlist-x11" >> "debian/$(PKG).links"
- $(INSTALL_FILE) "debian/fontconf-opentype.conf" \
- "$(PKGFONTS_INSTALL_DIR)/etc/fonts/conf.avail/65-$(PKGFONTS).conf"
- $(INSTALL_FILE) "debian/fontconf-aliases.conf" \
- "$(PKGFONTS_INSTALL_DIR)/etc/fonts/conf.avail/30-$(PKGFONTS)-aliases.conf"
-
- $(INSTALL_FILE) "debian/$(PKG).scale" \
- "$(PKG_INSTALL_DIR)/etc/X11/fonts/Type1"
+ dh_install
dh_installxfonts
-
- $(INSTALL_FILE) fonts/tfm/public/tex-gyre/*.tfm \
- "$(PKG_INSTALL_DIR)/usr/share/texmf/fonts/tfm/public/tex-gyre"
-
- $(INSTALL_FILE) fonts/enc/dvips/tex-gyre/*.enc \
- "$(PKG_INSTALL_DIR)/usr/share/texmf/fonts/enc/dvips/tex-gyre"
-
- $(INSTALL_FILE) fonts/map/dvips/tex-gyre/*.map \
- "$(PKG_INSTALL_DIR)/usr/share/texmf/fonts/map/dvips/tex-gyre"
-
- for file in tex/latex/tex-gyre/*.fd tex/latex/tex-gyre/*.sty; do \
- $(INSTALL_FILE) "$$file" \
- "$(PKG_INSTALL_DIR)/usr/share/texmf/tex/latex/tex-gyre"; \
- done
-
- for file in doc/fonts/tex-gyre/*; do \
- $(INSTALL_FILE) "$$file" \
- "$(PKGFONTS_INSTALL_DIR)/usr/share/doc/texmf/fonts/tex-gyre"; \
- done
-
- # Install the standard conffile for update-updmap
dh_installtex mapfile=debian/tex-gyre.cfg
dh_installtex -p $(PKGFONTS)
@@ -205,10 +141,7 @@ binary-indep: build-indep
dh_installdocs
dh_installchangelogs
-
- $(INSTALL_FILE) debian/lintian-overrides \
- "$(PKGFONTS_INSTALL_DIR)/usr/share/lintian/overrides/$(PKGFONTS)"
-
+ dh_lintian
dh_compress -X.pdf
dh_fixperms
dh_installdeb
diff --git a/debian/tex-gyre.install b/debian/tex-gyre.install
new file mode 100644
index 0000000..448e0ce
--- /dev/null
+++ b/debian/tex-gyre.install
@@ -0,0 +1,7 @@
+fonts/type1/public/tex-gyre/*.pfb usr/share/texmf/fonts/type1/public/tex-gyre
+fonts/afm/public/tex-gyre/*.afm usr/share/texmf/fonts/afm/public/tex-gyre
+fonts/tfm/public/tex-gyre/*.tfm usr/share/texmf/fonts/tfm/public/tex-gyre
+fonts/enc/dvips/tex-gyre/*.enc usr/share/texmf/fonts/enc/dvips/tex-gyre
+fonts/map/dvips/tex-gyre/*.map usr/share/texmf/fonts/map/dvips/tex-gyre
+tex/latex/tex-gyre/*.fd tex/latex/tex-gyre/*.sty usr/share/texmf/tex/latex/tex-gyre
+debian/tex-gyre.scale etc/X11/fonts/Type1
--
Debian packaging of tex-gyre)
Reply to: