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

[SCM] Debian packaging of tex-gyre) branch, master, updated. upstream/2.004.1-3-ga783e64



The following commit has been merged in the master branch:
commit a783e644939753ff6851349ff393b13b3519c371
Author: Norbert Preining <preining@debian.org>
Date:   Mon Sep 24 21:49:49 2012 +0900

    * make OTF fonts available to fontconfig, and disable the Type1 fonts
      for fontconfig, but keep them for normal X (Closes: #686098)
    * register fonts as metric compatible alternatives to the Adobe Fonts
      (Closes: #616419)
    Thanks to Fabian Greffrath who provided the fontconfif conf files,
    did lots of inquire and testing.

diff --git a/debian/30-tex-gyre-aliases.conf b/debian/30-tex-gyre-aliases.conf
new file mode 100644
index 0000000..2a52648
--- /dev/null
+++ b/debian/30-tex-gyre-aliases.conf
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  TeX Gyre is an extensive remake and extension of the freely
+  available 35 base PostScript fonts.
+  -->
+	<alias binding="same">
+	  <family>Helvetica</family>
+	  <accept><family>TeX Gyre Heros</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Times</family>
+	  <accept><family>TeX Gyre Termes</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Courier</family>
+	  <accept><family>TeX Gyre Cursor</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <accept><family>TeX Gyre Adventor</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <accept><family>TeX Gyre Bonum</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept><family>TeX Gyre Schola</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept><family>TeX Gyre Pagella</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Zapf Chancery</family>
+	  <accept><family>TeX Gyre Chorus</family></accept>
+	</alias>
+</fontconfig>
diff --git a/debian/65-tex-gyre.conf b/debian/65-tex-gyre.conf
new file mode 100644
index 0000000..d9ff9cb
--- /dev/null
+++ b/debian/65-tex-gyre.conf
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Scan for OpenType fonts -->
+ <dir>/usr/share/texmf/fonts/opentype/public/tex-gyre</dir>
+<!-- Reject Type 1 fonts -->
+ <selectfont>
+  <rejectfont>
+   <pattern>
+     <patelt name="family"><string>TeXGyreAdventor</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreBonum</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreChorus</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreCursor</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreHeros</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreHerosCondensed</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyrePagella</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreSchola</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>TeXGyreTermes</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+  </rejectfont>
+ </selectfont>
+</fontconfig>
diff --git a/debian/changelog b/debian/changelog
index 18344d9..7ddeb7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tex-gyre (2.004.1-5) UNRELEASED; urgency=low
+
+  * make OTF fonts available to fontconfig, and disable the Type1 fonts
+    for fontconfig, but keep them for normal X (Closes: #686098)
+  * register fonts as metric compatible alternatives to the Adobe Fonts
+    (Closes: #616419)
+  Thanks to Fabian Greffrath who provided the fontconfif conf files,
+  did lots of inquire and testing.
+
+ -- Norbert Preining <preining@debian.org>  Mon, 24 Sep 2012 21:46:44 +0900
+
 tex-gyre (2.004.1-4) unstable; urgency=low
 
   * upload to unstable
diff --git a/debian/rules b/debian/rules
index 6355536..4d0f28e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,6 +120,7 @@ binary-indep: build-indep
           usr/share/texmf/tex/latex/tex-gyre \
           usr/share/doc/texmf/fonts/tex-gyre \
 	  etc/X11/fonts/Type1 \
+	  etc/fonts/conf.avail \
 	  usr/share/fonts/X11/Type1 \
           usr/share/lintian/overrides
 
@@ -146,6 +147,11 @@ binary-indep: build-indep
 	sed -nf debian/sed_scripts/gen-x-fonts-links-list \
 	  "debian/$(PKG).fontlist-x11" >> "debian/$(PKG).links"
 	
+	$(INSTALL_FILE) "debian/65-$(PKG).conf" \
+	  "$(PKG_INSTALL_DIR)/etc/fonts/conf.avail"
+	$(INSTALL_FILE) "debian/30-$(PKG)-aliases.conf"
+	  "$(PKG_INSTALL_DIR)/etc/fonts/conf.avail"
+
 	$(INSTALL_FILE) "debian/$(PKG).scale" \
 	  "$(PKG_INSTALL_DIR)/etc/X11/fonts/Type1"
 	dh_installxfonts

-- 
Debian packaging of tex-gyre)


Reply to: