--- xfonts-wqy-0.7.0-6.orig/debian/po/zh_CN.po
+++ xfonts-wqy-0.7.0-6/debian/po/zh_CN.po
@@ -0,0 +1,35 @@
+# Simplified Chinese translation for xfonts-wqy debconf msg.
+# Copyright (C) 2006 Carlos Z.F. Liu
+# This file is distributed under the same license as the xfonts-wqy package.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfonts-wqy 0.7.0-5-2\n"
+"Report-Msgid-Bugs-To: carlosliu@users.sourceforge.net\n"
+"POT-Creation-Date: 2006-07-10 13:38+0800\n"
+"PO-Revision-Date: 2006-07-04 02:33+1200\n"
+"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
+"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Enable WenQuanYi font in fontconfig?"
+msgstr "在 fontconfig 中启用文泉驿字体吗？"
+
+#. Type: boolean
+#. Description
+#: ../templates:1002
+msgid ""
+"By default, bitmapped fonts are disabled in fontconfig setting because they "
+"are often lower quality. Enabling this option will bypass the system wide "
+"fontconfig setting and allow applications to use WenQuanYi font without "
+"affecting other bitmapped fonts."
+msgstr ""
+"由于点阵字体的显示质量较差，fontconfig 的缺省设置关闭了对它们的支持。通过开启"
+"此选项，您将能在不影响其它点阵字体的情况下，绕过 fontconfig 的全局设置让应用"
+"程序能使用文泉驿字体。"
--- xfonts-wqy-0.7.0-6.orig/debian/po/templates.pot
+++ xfonts-wqy-0.7.0-6/debian/po/templates.pot
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: carlosliu@users.sourceforge.net\n"
+"POT-Creation-Date: 2006-07-10 13:38+0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Enable WenQuanYi font in fontconfig?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1002
+msgid ""
+"By default, bitmapped fonts are disabled in fontconfig setting because they "
+"are often lower quality. Enabling this option will bypass the system wide "
+"fontconfig setting and allow applications to use WenQuanYi font without "
+"affecting other bitmapped fonts."
+msgstr ""
--- xfonts-wqy-0.7.0-6.orig/debian/po/POTFILES.in
+++ xfonts-wqy-0.7.0-6/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
--- xfonts-wqy-0.7.0-6.orig/debian/dirs
+++ xfonts-wqy-0.7.0-6/debian/dirs
@@ -0,0 +1,3 @@
+etc/fonts/conf.d/
+etc/X11/fonts/misc/
+usr/share/X11/fonts/misc/
--- xfonts-wqy-0.7.0-6.orig/debian/docs
+++ xfonts-wqy-0.7.0-6/debian/docs
@@ -0,0 +1,5 @@
+CREDIT
+LOGO.png
+README
+STAT
+PLEASE_HELP_TO_IMPROVE
--- xfonts-wqy-0.7.0-6.orig/debian/control
+++ xfonts-wqy-0.7.0-6/debian/control
@@ -0,0 +1,17 @@
+Source: xfonts-wqy
+Section: x11
+Priority: optional
+Maintainer: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>
+Build-Depends: debhelper (>= 5.0.7), po-debconf, xfonts-utils (>> 4.0.3), bdftopcf
+Standards-Version: 3.7.2
+
+Package: xfonts-wqy
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: xserver | xfs
+Description: WenQuanYi Bitmap Song CJK font
+ WenQuanYi Bitmap Song font for complete CJK Unified Ideographics,
+ including 9, 10, 11 and 12 point size. It provides both medium and
+ bold weight.
+ .
+ Homepage: http://wqy.sourceforge.net/
--- xfonts-wqy-0.7.0-6.orig/debian/rules
+++ xfonts-wqy-0.7.0-6/debian/rules
@@ -0,0 +1,55 @@
+#! /usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	sh debian/fontconverter.sh
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_clean
+
+	chmod +w debian/po/*.po
+	debconf-updatepo
+
+	rm -f $(CURDIR)/*.pcf*
+	rm -f build-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+	dh_installdirs
+
+	gzip -9 $(CURDIR)/*.pcf
+	install -Dm0644 $(CURDIR)/*.pcf.gz \
+		$(CURDIR)/debian/xfonts-wqy/usr/share/X11/fonts/misc/
+
+	install -m0644 $(CURDIR)/debian/xfonts-wqy.alias \
+		$(CURDIR)/debian/xfonts-wqy/etc/X11/fonts/misc/
+
+	install -m0644 $(CURDIR)/debian/wqy.conf \
+		$(CURDIR)/debian/xfonts-wqy/etc/fonts/conf.d/
+
+binary: binary-indep
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs ChangeLog
+	dh_installxfonts
+	dh_installdebconf
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch:
+
+.PHONY: build clean install binary binary-indep binary-arch
--- xfonts-wqy-0.7.0-6.orig/debian/xfonts-wqy.alias
+++ xfonts-wqy-0.7.0-6/debian/xfonts-wqy.alias
@@ -0,0 +1,8 @@
+"-wenquanyi-wenquanyi bitmap song-bold-r-normal--13-130-75-75-P-80-gbk-0" "-wenquanyi-wenquanyi bitmap song-bold-r-normal--13-130-75-75-P-80-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-medium-r-normal--13-130-75-75-P-80-gbk-0" "-wenquanyi-wenquanyi bitmap song-medium-r-normal--13-130-75-75-P-80-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-bold-r-normal--15-150-75-75-P-80-gbk-0" "-wenquanyi-wenquanyi bitmap song-bold-r-normal--15-150-75-75-P-80-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-medium-r-normal--15-150-75-75-P-80-gbk-0" "-wenquanyi-wenquanyi bitmap song-medium-r-normal--15-150-75-75-P-80-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-bold-r-normal--16-160-75-75-P-80-gbk-0" "-wenquanyi-wenquanyi bitmap song-bold-r-normal--16-160-75-75-P-80-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-medium-r-normal--16-160-75-75-P-80-gbk-0" "-wenquanyi-wenquanyi bitmap song-medium-r-normal--16-160-75-75-P-80-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-bold-r-normal--12-120-75-75-P-119-gbk-0" "-wenquanyi-wenquanyi bitmap song-bold-r-normal--12-120-75-75-P-119-iso10646-1"
+"-wenquanyi-wenquanyi bitmap song-medium-r-normal--12-120-75-75-P-119-gbk-0" "-wenquanyi-wenquanyi bitmap song-medium-r-normal--12-120-75-75-P-119-iso10646-1"
--- xfonts-wqy-0.7.0-6.orig/debian/changelog
+++ xfonts-wqy-0.7.0-6/debian/changelog
@@ -0,0 +1,66 @@
+xfonts-wqy (0.7.0-6-1ubuntu1) edgy; urgency=low
+
+  * Merge 0.7.0-6-1 from Debian sid.
+
+ -- ZhengPeng Hou <zhengpeng.hou@gmail.com>  Mon, 10 Jul 2006 16:21:27 +1200
+
+xfonts-wqy (0.7.0-6-1) unstable; urgency=low
+
+  * Newest upstream is 0.7.0-4, higher number to avoid package
+    version conflict.
+  * Acknowledge NMU, thanks Cai Qian.
+  * Revert back to bdf source package, and bring fontconvert
+    script and xutils dependency back.
+  * Use debconf to switch xfonts-wqy in fontconfig.
+  * Add gbk encoding alias to avoid slowness in wine app, thanks
+    Huang Jiahua.
+  * debian/compat : move DH_COMPAT out of rules.
+
+ -- Carlos Z.F. Liu <carlosliu@users.sourceforge.net>  Mon,  3 Jul 2006 20:00:45 +1200
+
+xfonts-wqy (0.7.0-5-1) unstable; urgency=low
+
+  * Upload PCF version (Closes: #370708)
+
+ -- Cai Qian <caiqian@debian.org>  Sat, 10 Jun 2006 22:13:50 +0100
+
+xfonts-wqy (0.7.0-4-1) unstable; urgency=low
+
+  * New upstream release (Closes: #369184)
+  * Depends on DH 5.0.31, and xfonts-utils. Change installed font
+    path. (Closes: #362405)
+  * build depends on debhelper, as we have the clean target.
+  * Drop override file, fontconvert script and xutils dependency.
+  * Add Co-Maintainer
+
+ -- Cai Qian <caiqian@debian.org>  Mon, 29 May 2006 13:02:08 +0100
+
+xfonts-wqy (0.6.0-1) unstable; urgency=low
+
+  * New upstream release
+  * First official Debian package. (Closes: #315851)
+  * Drop the ptSz patch. The problem was fixed in upstream
+  * debian/xfonts-wqy.overrides:
+    - prevent lintian's "packages-installs-file-to-usr-x11r6" error
+  * debian/copyright:
+    - change to new FSF address.
+
+ -- Carlos Z.F. Liu <carlosliu@users.sourceforge.net>  Tue,  4 Oct 2005 23:29:42 +1300
+
+xfonts-wqy (0.5.0-3) unstable; urgency=low
+
+  * debian/control : build depend on utils (>> 4.0.3)
+
+ -- Carlos Z.F. Liu <carlosliu@users.sourceforge.net>  Thu,  7 Jul 2005 01:20:09 +1200
+
+xfonts-wqy (0.5.0-2) unstable; urgency=low
+
+  * Fix wrong ptSz setting for 9, 10 and 11 pt.
+
+ -- Carlos Z.F. Liu <carlosliu@users.sourceforge.net>  Wed, 29 Jun 2005 00:45:21 +1200
+
+xfonts-wqy (0.5.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Carlos Z.F. Liu <carlosliu@users.sourceforge.net>  Mon, 27 Jun 2005 01:42:03 +1200
--- xfonts-wqy-0.7.0-6.orig/debian/postinst
+++ xfonts-wqy-0.7.0-6/debian/postinst
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONFDIR=/etc/fonts/conf.d
+
+db_get xfonts-wqy/enable_wqy
+enable_wqy="$RET"
+
+wqy_prio="70-debconf-"
+wqy_conf="wqy.conf"
+
+if [ -h $CONFDIR/$wqy_prio$wqy_conf ]; then
+	rm $CONFDIR/$wqy_prio$wqy_conf
+fi
+
+case "$enable_wqy" in
+"true")
+	ln -s $wqy_conf $CONFDIR/$wqy_prio$wqy_conf
+	;;
+*)
+	;;
+esac
+
+if [ "$1" = configure -a -x /usr/bin/fc-cache ]; then
+	echo -n "Regenerating fonts cache... "
+
+	HOME=/root fc-cache -f -v 1>/var/log/fontconfig.log 2>&1 || \
+		(echo "failed; see /var/log/fontconfig.log for more information."; \
+		exit 1)
+
+	echo "done."
+fi
+
+#DEBHELPER#
--- xfonts-wqy-0.7.0-6.orig/debian/compat
+++ xfonts-wqy-0.7.0-6/debian/compat
@@ -0,0 +1 @@
+5
--- xfonts-wqy-0.7.0-6.orig/debian/config
+++ xfonts-wqy-0.7.0-6/debian/config
@@ -0,0 +1,34 @@
+#! /bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONFDIR=/etc/fonts/conf.d
+
+wqy_prio="70-debconf-"
+wqy_conf="wqy.conf"
+
+if [ -z "$2" ]; then
+	FIRSTINST=yes
+fi
+
+if [ -z "$FIRSTINST" ] && [ ! -h $CONFDIR/$wqy_prio$wqy_conf ]; then
+	# We are upgrading and no previous link
+	enable_wqy="false"
+else
+	# First install or already linked
+	enable_wqy="true"
+fi
+
+if [ "$1" = "configure" ]; then
+	# if we're upgrading from an old version without fontconfig stuff.
+	if [ -z "$FIRSTINST" ] && dpkg --compare-versions "$2" le 0.7.0-5-1; then
+		enable_wqy="true"
+	fi
+fi
+
+db_set xfonts-wqy/enable_wqy "$enable_wqy"
+
+db_input low xfonts-wqy/enable_wqy || true
+db_go
--- xfonts-wqy-0.7.0-6.orig/debian/postrm
+++ xfonts-wqy-0.7.0-6/debian/postrm
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+set -e
+
+CONFDIR=/etc/fonts/conf.d
+wqy_prio="70-debconf-"
+wqy_conf="wqy.conf"
+
+case "$1" in
+    purge)
+		rm $CONFDIR/$wqy_prio$wqy_conf 2>/dev/null || true
+        ;;
+esac
+
+#DEBHELPER#
--- xfonts-wqy-0.7.0-6.orig/debian/fontconverter.sh
+++ xfonts-wqy-0.7.0-6/debian/fontconverter.sh
@@ -0,0 +1 @@
+for i in `find . -name "*.bdf"`;do bdftopcf $i -o `echo $i | sed 's#.bdf#.pcf#'`;done
--- xfonts-wqy-0.7.0-6.orig/debian/copyright
+++ xfonts-wqy-0.7.0-6/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Carlos Z.F. Liu <carlosliu@users.sourceforge.net> on
+Sun, 26 Jun 2005 23:04:11 +1200.
+
+It was downloaded from http://wqy.sourceforge.net/
+
+Copyright Holder: Qianqian Fang <fangq@nmr.mgh.harvard.edu>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- xfonts-wqy-0.7.0-6.orig/debian/wqy.conf
+++ xfonts-wqy-0.7.0-6/debian/wqy.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/xfonts-wqy.conf -->
+<fontconfig>
+<!-- enable wqy font in fontconfig -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+    <patelt name="family"><string>WenQuanYi Bitmap Song</string></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>
--- xfonts-wqy-0.7.0-6.orig/debian/templates
+++ xfonts-wqy-0.7.0-6/debian/templates
@@ -0,0 +1,8 @@
+Template: xfonts-wqy/enable_wqy
+Type: boolean
+Default: true
+_Description: Enable WenQuanYi font in fontconfig?
+ By default, bitmapped fonts are disabled in fontconfig setting because
+ they are often lower quality. Enabling this option will bypass the
+ system wide fontconfig setting and allow applications to use WenQuanYi
+ font without affecting other bitmapped fonts.