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

[SCM] Debian packaging of lmodern) branch, master, updated. upstream/2.004.2-11-g70ccbe5



The following commit has been merged in the master branch:
commit e2b45e637591058e34b8273456db8683d40fa71f
Author: Norbert Preining <preining@debian.org>
Date:   Tue Sep 25 13:29:45 2012 +0900

    * install a fontconfig file that makes the opentype fonts available
      and disables the type 1 fonts for fontconfig
      (Closes: #687940, #645841)

diff --git a/debian/65-lmodern.conf b/debian/65-lmodern.conf
new file mode 100644
index 0000000..35272ff
--- /dev/null
+++ b/debian/65-lmodern.conf
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Scan for OpenType fonts -->
+ <dir>/usr/share/texmf/fonts/opentype/public/lm</dir>
+<!-- Reject Type 1 fonts -->
+ <selectfont>
+  <rejectfont>
+   <pattern>
+     <patelt name="family"><string>LMMono10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMMonoCaps10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMMonoLt10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMMonoLtCond10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMMonoProp10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMMonoPropLt10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMMonoSlant10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMRoman10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMRomanCaps10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMRomanDemi10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMRomanDunh10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMRomanSlant10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMRomanUnsl10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMSans10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMSansDemiCond10</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+   <pattern>
+     <patelt name="family"><string>LMSansQuot8</string></patelt>
+     <patelt name="fontformat"><string>Type 1</string></patelt>
+   </pattern>
+  </rejectfont>
+ </selectfont>
+</fontconfig>
diff --git a/debian/changelog b/debian/changelog
index 66a72ed..42aba5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-lmodern (2.004.2-2) UNRELEASED; urgency=low
+lmodern (2.004.2-2~1) UNRELEASED; urgency=low
 
   * don't mention defoma in description anymore (Closes: #685120)
+  * install a fontconfig file that makes the opentype fonts available
+    and disables the type 1 fonts for fontconfig
+    (Closes: #687940, #645841)
 
- -- Norbert Preining <preining@debian.org>  Fri, 17 Aug 2012 13:45:50 +0900
+ -- Norbert Preining <preining@debian.org>  Tue, 25 Sep 2012 13:29:33 +0900
 
 lmodern (2.004.2-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 1b387ee..b290d1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,6 +126,7 @@ binary-indep: build-indep
           usr/share/doc/texmf/fonts/lm \
           usr/share/doc/$(PKG)/font-substitution \
           etc/X11/fonts/Type1 \
+	  etc/fonts/conf.avail \
           usr/share/fonts/X11/Type1 \
           usr/share/lintian/overrides
 
@@ -157,6 +158,9 @@ 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/$(PKG).scale" \
           "$(PKG_INSTALL_DIR)/etc/X11/fonts/Type1"
 	dh_installxfonts

-- 
Debian packaging of lmodern)


Reply to: