[arch-commits] Commit in fontconfig/repos (5 files)

[Jan de Groot]

    Date: Sunday, July 6, 2008 @ 18:07:36
  Author: jgc
Revision: 4423

Merged revisions 4359-4422 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/fontconfig/trunk

........
  r4422 | jgc | 2008-07-06 22:07:24 +0000 (Sun, 06 Jul 2008) | 2 lines
  
  upgpkg: fontconfig 2.6.0-2
      Change priority of replace-bitmap-fonts config file, otherwise it will have no effect
........

Added:
  fontconfig/repos/extra-x86_64/29-replace-bitmap-fonts.conf
    (from rev 4422, fontconfig/trunk/29-replace-bitmap-fonts.conf)
Modified:
  fontconfig/repos/extra-x86_64/	(properties)
  fontconfig/repos/extra-x86_64/PKGBUILD
  fontconfig/repos/extra-x86_64/fontconfig.install
Deleted:
  fontconfig/repos/extra-x86_64/30-replace-bitmap-fonts.conf

------------------------------+
 29-replace-bitmap-fonts.conf |   37 +++++++++++++++++++++++++++++++++++++
 30-replace-bitmap-fonts.conf |   37 -------------------------------------
 PKGBUILD                     |    6 +++---
 fontconfig.install           |    2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)


Property changes on: fontconfig/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /fontconfig/trunk:1-4358
   + /fontconfig/trunk:1-4422

Copied: fontconfig/repos/extra-x86_64/29-replace-bitmap-fonts.conf (from rev 4422, fontconfig/trunk/29-replace-bitmap-fonts.conf)
===================================================================
--- extra-x86_64/29-replace-bitmap-fonts.conf	                        (rev 0)
+++ extra-x86_64/29-replace-bitmap-fonts.conf	2008-07-06 22:07:36 UTC (rev 4423)
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <!-- Replace generic bitmap font names by generic font families.
+         These font-families will get replaced by other rules and
+	 default to scaled ones. -->
+    <match target="pattern" name="family">
+        <test name="family" qual="any">
+            <string>Helvetica</string>
+        </test>
+        <edit mode="assign" name="family">
+            <string>Arial</string>
+            <string>Liberation Sans</string>	    
+            <string>sans-serif</string>
+        </edit>
+    </match>
+    <match target="pattern" name="family">
+        <test name="family" qual="any">
+            <string>Courier</string>
+        </test>
+        <edit mode="assign" name="family">
+            <string>Courier New</string>
+            <string>Liberation Mono</string>
+            <string>monospace</string>
+        </edit>
+    </match>
+    <match target="pattern" name="family">
+        <test name="family" qual="any">
+            <string>Times</string>
+        </test>
+        <edit mode="assign" name="family">
+            <string>Times New Roman</string>
+            <string>Liberation Serif</string>
+            <string>serif</string>
+        </edit>
+    </match>
+</fontconfig>

Deleted: extra-x86_64/30-replace-bitmap-fonts.conf
===================================================================
--- extra-x86_64/30-replace-bitmap-fonts.conf	2008-07-06 22:07:24 UTC (rev 4422)
+++ extra-x86_64/30-replace-bitmap-fonts.conf	2008-07-06 22:07:36 UTC (rev 4423)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <!-- Replace generic bitmap font names by generic font families.
-         These font-families will get replaced by other rules and
-	 default to scaled ones. -->
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Helvetica</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Arial</string>
-            <string>Liberation Sans</string>	    
-            <string>sans-serif</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Courier</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Courier New</string>
-            <string>Liberation Mono</string>
-            <string>monospace</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Times</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Times New Roman</string>
-            <string>Liberation Serif</string>
-            <string>serif</string>
-        </edit>
-    </match>
-</fontconfig>

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-06 22:07:24 UTC (rev 4422)
+++ extra-x86_64/PKGBUILD	2008-07-06 22:07:36 UTC (rev 4423)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=fontconfig
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -11,7 +11,7 @@
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz
-	30-replace-bitmap-fonts.conf)
+	29-replace-bitmap-fonts.conf)
 md5sums=('ab54ec1d4ddd836313fdbc0cd5299d6d'
          'f6b67e8cc79197ed6abd4701911e83da')
 
@@ -22,7 +22,7 @@
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
-  install -m644 ${startdir}/src/30-replace-bitmap-fonts.conf \
+  install -m644 ${startdir}/src/29-replace-bitmap-fonts.conf \
       ${startdir}/pkg/etc/fonts/conf.avail || return 1
   rm -f ${startdir}/pkg/etc/fonts/conf.d/*.conf
 

Modified: extra-x86_64/fontconfig.install
===================================================================
--- extra-x86_64/fontconfig.install	2008-07-06 22:07:24 UTC (rev 4422)
+++ extra-x86_64/fontconfig.install	2008-07-06 22:07:36 UTC (rev 4423)
@@ -1,8 +1,8 @@
 configs=('20-fix-globaladvance.conf'
          '20-unhint-small-vera.conf'
+         '29-replace-bitmap-fonts.conf'
          '30-metric-aliases.conf'
          '30-urw-aliases.conf'
-         '30-replace-bitmap-fonts.conf'
          '40-nonlatin.conf'
          '45-latin.conf'
          '49-sansserif.conf'