[meego-commits] 6150: Changes to Trunk/droid-fonts
Peter Zhu
peter.j.zhu at intel.com
Fri Jul 30 12:11:14 UTC 2010
Hi,
I have made the following changes to droid-fonts in project Trunk. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #6150:
submit: Trunk:Testing/droid-fonts(r6) -> Trunk/droid-fonts
Message:
Move to Trunk
State: new 2010-07-30T00:04:08 peter
Comment: None
changes files:
--------------
--- droid-fonts.changes
+++ droid-fonts.changes
@@ -1 +1,11 @@
-* Mon Mar 29 2010 Yan Li <yan.i.li at intel.com> 1.0.113_20100328
+* Thu Jul 29 2010 Yan Li <yan.i.li at intel.com> - 1.0.113_20100701
+- New fonts from upstream:
+ DroidSansArabic.ttf
+ DroidSansHebrew.ttf
+ DroidSansThai.ttf
+- DroidSansFallback upgraded from 2.20 to 2.31, added 4,398 Chinese
+ characters, which adds approximately ~0.5 MB to the system.
+- Using Fedora's latest fontconfig files for better handling of font
+ renaming
+
+* Mon Mar 29 2010 Yan Li <yan.i.li at intel.com> - 1.0.113_20100328
@@ -7 +17 @@
-* Sun Sep 27 2009 Jian-feng Ding <jian-feng.ding at intel.com> 1.0.112
+* Sun Sep 27 2009 Jian-feng Ding <jian-feng.ding at intel.com> - 1.0.112
@@ -10 +20 @@
-* Fri Jul 10 2009 Damien Lespiau <damien.lespiau at intel.com> 1.0.112
+* Fri Jul 10 2009 Damien Lespiau <damien.lespiau at intel.com> - 1.0.112
old:
----
droid-fonts-1.0.113_20100328.tar.xz
new:
----
droid-fonts-1.0.113_20100701.tar.xz
spec files:
-----------
--- droid-fonts.spec
+++ droid-fonts.spec
@@ -9,7 +9,7 @@
Name: %{fontname}-fonts
# The font files all have the same version except for sans fallback which I'm going to ignore here
-Version: 1.0.113_20100328
+Version: 1.0.113_20100701
Release: 1
Summary: General-purpose fonts released by Google as part of Android
@@ -31,24 +31,16 @@
%common_desc
-%package common
-Summary: Common files of the Droid font set
-Requires: fontpackages-filesystem
-
-%description common
-%common_desc
-
-This package consists of files used by other %{name} packages.
-
%package -n %{fontname}-sans-fonts
Summary: A humanist sans serif typeface
-Requires: %{name}-common = %{version}-%{release}
Provides: scalable-font-ja
Provides: scalable-font-zh-TW
Provides: scalable-font-zh-HK
Provides: scalable-font-zh-CN
Provides: scalable-font-zh-SG
Provides: scalable-font-zh-MO
+Requires: fontpackages-filesystem
+Obsoletes: %{name}-common
%description -n %{fontname}-sans-fonts
%common_desc
@@ -56,12 +48,13 @@
Droid Sans is a humanist sans serif typeface designed for user interfaces and
electronic communication.
-%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansFallback.ttf DroidSansJapanese.ttf
+# can't use wildcard for Sans fonts since we also have `SansMono'
+%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansFallback.ttf DroidSansJapanese.ttf DroidSansArabic.ttf DroidSansHebrew.ttf DroidSansThai.ttf
%package -n %{fontname}-sans-mono-fonts
Summary: A humanist monospace sans serif typeface
-Requires: %{name}-common = %{version}-%{release}
+Requires: fontpackages-filesystem
%description -n %{fontname}-sans-mono-fonts
%common_desc
@@ -70,11 +63,12 @@
interfaces and electronic communication.
%_font_pkg -n sans-mono -f ??-%{fontname}-sans-mono.conf DroidSansMono.ttf
+%doc *.txt
%package -n %{fontname}-serif-fonts
-Summary: A serif typeface
-Requires: %{name}-common = %{version}-%{release}
+Summary: A contemporary serif typeface
+Requires: fontpackages-filesystem
%description -n %{fontname}-serif-fonts
%common_desc
@@ -124,9 +118,3 @@
%clean
rm -fr %{buildroot}
-
-
-%files common
-%defattr(0644,root,root,0755)
-%doc *.txt
-
other changes:
--------------
++++++ droid-fonts-1.0.113_20100701.tar.xz (new)
++++++ droid-fonts-sans-fontconfig.conf
--- droid-fonts-sans-fontconfig.conf
+++ droid-fonts-sans-fontconfig.conf
@@ -1,6 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
+ <match target="scan">
+ <test name="family">
+ <string>Droid Sans</string>
+ </test>
+ <edit name="fontversion">
+ <int>7</int>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="family">
+ <string>Droid Sans Hebrew</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fullname">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fontversion">
+ <int>6</int>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="family">
+ <string>Droid Sans Arabic</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fullname">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fontversion">
+ <int>5</int>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="family">
+ <string>Droid Sans Thai</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fullname">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fontversion">
+ <int>4</int>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="lang" compare="not_eq">
+ <string>zh-cn</string>
+ <string>zh-sg</string>
+ <string>zh-hk</string>
+ <string>zh-tw</string>
+ <string>zh</string>
+ </test>
+ <test name="family">
+ <string>Droid Sans Japanese</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fullname">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fontversion">
+ <int>3</int>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="family">
+ <string>Droid Sans Fallback</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fullname">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fontversion">
+ <int>2</int>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="lang">
+ <string>zh-cn</string>
+ <string>zh-sg</string>
+ <string>zh-hk</string>
+ <string>zh-tw</string>
+ <string>zh</string>
+ </test>
+ <test name="family">
+ <string>Droid Sans Japanese</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fullname">
+ <string>Droid Sans</string>
+ </edit>
+ <edit name="fontversion">
+ <int>1</int>
+ </edit>
+ </match>
+ <alias binding="same">
+ <family>Droid Sans Arabic</family>
+ <accept>
+ <family>Droid Sans</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Droid Sans Hebrew</family>
+ <accept>
+ <family>Droid Sans</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Droid Sans Japanese</family>
+ <accept>
+ <family>Droid Sans</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Droid Sans Thai</family>
+ <accept>
+ <family>Droid Sans</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Droid Sans Fallback</family>
+ <accept>
+ <family>Droid Sans</family>
+ </accept>
+ </alias>
<alias>
<family>sans-serif</family>
<prefer>
@@ -13,12 +149,4 @@
<family>sans-serif</family>
</default>
</alias>
- <match target="scan">
- <test name="family">
- <string>Droid Sans Fallback</string>
- </test>
- <edit name="family">
- <string>Droid Sans</string>
- </edit>
- </match>
</fontconfig>
++++++ droid-fonts-sans-mono-fontconfig.conf
--- droid-fonts-sans-mono-fontconfig.conf
+++ droid-fonts-sans-mono-fontconfig.conf
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias>
<family>monospace</family>
++++++ droid-fonts-serif-fontconfig.conf
--- droid-fonts-serif-fontconfig.conf
+++ droid-fonts-serif-fontconfig.conf
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias>
<family>serif</family>
++++++ deleted files:
--- droid-fonts-1.0.113_20100328.tar.xz
More information about the MeeGo-commits
mailing list