Hi, This is my patch for NMU.
Osamu
diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/25-wqy-zenhei.conf ttf-wqy-zenhei-0.9.45/debian/25-wqy-zenhei.conf --- ttf-wqy-zenhei-0.9.45-orig/debian/25-wqy-zenhei.conf 1970-01-01 09:00:00.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/25-wqy-zenhei.conf 2011-12-17 20:01:39.094401419 +0900 @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- WenQuanYi Zen Hei Configure File --> +<fontconfig> + <!-- modified by Madsen@SMTH --> + <match target="font"> + <test qual="any" name="family"> + <string>WenQuanYi Zen Hei</string> + <string>文泉驿正黑</string> + <string>文泉驛正黑</string> + </test> + <edit name="globaladvance"><bool>false</bool></edit> + <edit name="spacing"><int>0</int></edit> + <edit name="antialias" mode="assign"><bool>true</bool></edit> + <edit name="hinting" mode="assign"><bool>true</bool></edit> + <edit name="hintstyle" mode="assign"><const>hintnone</const></edit> + <edit name="autohint" mode="assign"><bool>false</bool></edit> + <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit> + <edit name="rgba" mode="assign"><const>none</const></edit> + <edit name="embeddedbitmap"><bool>false</bool></edit> + </match> +</fontconfig> diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/63-wqy-zenhei-sharp.conf ttf-wqy-zenhei-0.9.45/debian/63-wqy-zenhei-sharp.conf --- ttf-wqy-zenhei-0.9.45-orig/debian/63-wqy-zenhei-sharp.conf 1970-01-01 09:00:00.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/63-wqy-zenhei-sharp.conf 2011-12-17 20:02:00.498507519 +0900 @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- WenQuanYi Zen Hei Configure File --> +<fontconfig> + <alias> + <family>serif</family> + <prefer> + <family>WenQuanYi Zen Hei Sharp</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> + <family>WenQuanYi Zen Hei Sharp</family> + </prefer> + </alias> +</fontconfig> diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/64-wqy-zenhei.conf ttf-wqy-zenhei-0.9.45/debian/64-wqy-zenhei.conf --- ttf-wqy-zenhei-0.9.45-orig/debian/64-wqy-zenhei.conf 1970-01-01 09:00:00.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/64-wqy-zenhei.conf 2011-12-17 20:02:29.810652924 +0900 @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<!-- WenQuanYi Zen Hei Configure File --> +<fontconfig> + <!-- modified by Madsen@SMTH --> + <alias> + <family>serif</family> + <prefer> + <family>WenQuanYi Zen Hei</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> + <family>WenQuanYi Zen Hei</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> + <family>WenQuanYi Zen Hei Mono</family> + </prefer> + </alias> +</fontconfig> diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/changelog ttf-wqy-zenhei-0.9.45/debian/changelog --- ttf-wqy-zenhei-0.9.45-orig/debian/changelog 2011-06-27 15:42:28.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/changelog 2011-12-17 20:22:31.264610613 +0900 @@ -1,3 +1,13 @@ +ttf-wqy-zenhei (0.9.45-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix fontconfig configuration file in right way by splitting and + moving them to right places. This also fix regression of + diasabling 01_remove_alias_block.dpatch patch in 0.9.45-1. + zenheiset was ajusted accordingly. Closes: #533189 + + -- Osamu Aoki <os...@debian.org> Sat, 17 Dec 2011 20:14:58 +0900 + ttf-wqy-zenhei (0.9.45-3) unstable; urgency=low * Team upload by Debian Fonts Task Force. diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/patches/00list ttf-wqy-zenhei-0.9.45/debian/patches/00list --- ttf-wqy-zenhei-0.9.45-orig/debian/patches/00list 2011-06-27 02:02:21.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/patches/00list 1970-01-01 09:00:00.000000000 +0900 @@ -1,2 +0,0 @@ -#01_remove_alias_block -#02_readme_revision diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/patches/01_remove_alias_block.dpatch ttf-wqy-zenhei-0.9.45/debian/patches/01_remove_alias_block.dpatch --- ttf-wqy-zenhei-0.9.45-orig/debian/patches/01_remove_alias_block.dpatch 2011-06-27 02:02:21.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/patches/01_remove_alias_block.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_gtk-immodule-install-dir .dpatch by Hou ZhengPeng <zhengpeng....@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix immodule install dir - -@DPATCH@ - -diff -ruNad ttf-wqy-zenhei-0.4.23/44-wqy-zenhei.conf~ ttf-wqy-zenhei-0.4.23/44-wqy-zenhei.conf ---- ttf-wqy-zenhei-0.4.23/44-wqy-zenhei.conf~ 2008-07-01 05:28:36.000000000 +0000 -+++ ttf-wqy-zenhei-0.4.23/44-wqy-zenhei.conf 2008-07-01 05:29:35.000000000 +0000 -@@ -19,27 +19,4 @@ - <edit name="rgba" mode="assign"><const>none</const></edit> - <edit name="embeddedbitmap"><bool>false</bool></edit> - </match> -- <alias> -- <family>serif</family> -- <prefer> -- <family>Bitstream Vera Serif</family> -- <family>DejaVu Serif</family> -- <family>WenQuanYi Zen Hei</family> -- </prefer> -- </alias> -- <alias> -- <family>sans-serif</family> -- <prefer> -- <family>Bitstream Vera Sans</family> -- <family>DejaVu Sans</family> -- <family>WenQuanYi Zen Hei</family> -- </prefer> -- </alias> -- <alias> -- <family>monospace</family> -- <prefer> -- <family>Bitstream Vera Sans Mono</family> -- <family>DejaVu Sans Mono</family> -- </prefer> -- </alias> - </fontconfig> diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/patches/02_readme_revision.dpatch ttf-wqy-zenhei-0.9.45/debian/patches/02_readme_revision.dpatch --- ttf-wqy-zenhei-0.9.45-orig/debian/patches/02_readme_revision.dpatch 2011-06-27 02:02:21.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/patches/02_readme_revision.dpatch 1970-01-01 09:00:00.000000000 +0900 @@ -1,44 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_readme_revision.dpatch by Anthony Fok <f...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Minor typographic revisions to the upstream README file. -## DP: 2008-07-05 - -@DPATCH@ - ---- ttf-wqy-zenhei-0.6.26.orig/README -+++ ttf-wqy-zenhei-0.6.26/README -@@ -35,7 +35,7 @@ - Copyright (c) 2005 Tsong-Min Wu, Tsong-Huey Wu and Edward G.J. Lee. - - Part of the embedded bitmap glyphs were derived from -- "firefly bitmap fonts" [2], Copyright (c) 2004, Firefly -+ "Firefly bitmap fonts" [2], Copyright (c) 2004, Firefly - - ---------------------------------------------------------- - Born Free -@@ -52,7 +52,7 @@ - - I. About this font - --The WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) -+WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) - Chinese outline font. It was designed for general purpose text - formatting and on-screen display of Chinese characters among - many other languages. The embolden strokes of the font glyphs -@@ -61,11 +61,11 @@ - performance, which can be enabled with the provided - configuration files. - --WenQuanYi Zen Hei provides fairly complete coverage to Chinese -+WenQuanYi Zen Hei provides fairly complete coverage of Chinese - Hanzi glyphs, including both simplified and traditional forms. - The total glyph number in this font is over 35,000, including over --21,000 Chinese Hanzi. This font provides full coverage to --GBK(CP936) charset, CJK Unified Ideographs, as well as the -+21,000 Chinese Hanzi. This font provides full coverage of -+GBK (CP936) charset, CJK Unified Ideographs, as well as the - code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, - ja (Japanese) and ko (Korean) locales for fontconfig. - diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/patches/02_readme_revision.patch ttf-wqy-zenhei-0.9.45/debian/patches/02_readme_revision.patch --- ttf-wqy-zenhei-0.9.45-orig/debian/patches/02_readme_revision.patch 1970-01-01 09:00:00.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/patches/02_readme_revision.patch 2011-12-17 20:43:53.890970808 +0900 @@ -0,0 +1,28 @@ +Description: TYpo fix to README + Minor typographic revisions to the upstream README file. + Originally DP: 2008-07-05 and updated in 2011-12-17 +Author: Anthony Fok <f...@debian.org> and Osamu Aoki <os...@debian.org> +--- a/README ++++ b/README +@@ -38,7 +38,7 @@ + Copyright (c) 2005 Tsong-Min Wu, Tsong-Huey Wu and Edward G.J. Lee. + + Part of the embedded bitmap glyphs were derived from +- "firefly bitmap fonts" [2], Copyright (c) 2004, Firefly ++ "Firefly bitmap fonts" [2], Copyright (c) 2004, Firefly + + The mono-spaced Latin glyphs were derived from M+ M2 Light + Copyright (c) 2002-2008 M+ FONTS PROJECT +@@ -67,10 +67,10 @@ + with the provided configuration files, further enhance the + on-screen performance. + +-WenQuanYi Zen Hei provides a fairly complete coverage to Chinese ++WenQuanYi Zen Hei provides a fairly complete coverage of Chinese + Hanzi glyphs, including both simplified and traditional forms. + The total glyph number in this font is over 35,000, including over +-27,000 Chinese Hanzi. This font has full coverage CJK Unified ++27,000 Chinese Hanzi. This font has full coverage of CJK Unified + Ideographs (U4E00-U9FC3) and CJK Extension A (U3400-U4DB5), + as well as the code-points needed for zh_cn, zh_sg, zh_tw, + zh_hk, zh_mo, ja (Japanese) and ko (Korean) locales. diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/patches/03_fontconfig.patch ttf-wqy-zenhei-0.9.45/debian/patches/03_fontconfig.patch --- ttf-wqy-zenhei-0.9.45-orig/debian/patches/03_fontconfig.patch 1970-01-01 09:00:00.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/patches/03_fontconfig.patch 2011-12-17 20:45:18.795391791 +0900 @@ -0,0 +1,32 @@ +Description: zenheiset adjustment + Minor file location adjustment matching Debian package location +Author: Osamu Aoki <os...@debian.org> +--- a/zenheiset ++++ b/zenheiset +@@ -8,9 +8,8 @@ + + FAVAIL=/etc/fonts/conf.avail + FCONF=/etc/fonts/conf.d +-BMPCONF=43-wqy-zenhei-sharp.conf +-BMPSTDCONF=66-wqy-zenhei-sharp-no13px.conf +-AACONF=44-wqy-zenhei.conf ++BMPCONF=63-wqy-zenhei-sharp.conf ++AACONF=64-wqy-zenhei.conf + + + if [ $# -ne 1 ]; then +@@ -31,14 +30,6 @@ + if [ $1 = "bitmap" -o $1 = "bitmapfull" ]; then + if [ -f "$FAVAIL/$BMPCONF" ]; then + ln -sf $FAVAIL/$BMPCONF $FCONF/$BMPCONF +- #if [ $1 = "bitmap" ]; then +- # if [ -f "$FAVAIL/$BMPSTDCONF" ]; then +- # ln -sf $FAVAIL/$BMPSTDCONF $FCONF/$BMPSTDCONF +- # else +- # echo $FAVAIL/$BMPSTDCONF does not exist! +- # exit 2 +- # fi +- #fi + else + echo $FAVAIL/$BMPCONF does not exist! + exit 2 diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/patches/series ttf-wqy-zenhei-0.9.45/debian/patches/series --- ttf-wqy-zenhei-0.9.45-orig/debian/patches/series 1970-01-01 09:00:00.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/patches/series 2011-12-17 20:31:05.239159261 +0900 @@ -0,0 +1,2 @@ +03_fontconfig.patch +02_readme_revision.patch diff -Nru ttf-wqy-zenhei-0.9.45-orig/debian/rules ttf-wqy-zenhei-0.9.45/debian/rules --- ttf-wqy-zenhei-0.9.45-orig/debian/rules 2011-06-27 02:02:21.000000000 +0900 +++ ttf-wqy-zenhei-0.9.45/debian/rules 2011-12-17 20:28:43.578456813 +0900 @@ -26,9 +26,11 @@ dh_prep dh_installdirs dh_install wqy-zenhei.ttc usr/share/fonts/truetype/wqy/ - dh_install 44-wqy-zenhei.conf etc/fonts/conf.avail/ - dh_install 43-wqy-zenhei-sharp.conf etc/fonts/conf.avail/ - dh_link etc/fonts/conf.avail/44-wqy-zenhei.conf etc/fonts/conf.d/44-wqy-zenhei.conf + dh_install debian/25-wqy-zenhei.conf etc/fonts/conf.avail/ + dh_install debian/64-wqy-zenhei.conf etc/fonts/conf.avail/ + dh_install debian/63-wqy-zenhei-sharp.conf etc/fonts/conf.avail/ + dh_link etc/fonts/conf.avail/25-wqy-zenhei.conf etc/fonts/conf.d/25-wqy-zenhei.conf \ + etc/fonts/conf.avail/64-wqy-zenhei.conf etc/fonts/conf.d/64-wqy-zenhei.conf binary-indep: build install dh_testdir