Merge lp:~ilidrissi.amine/ubuntu/maverick/language-support-fonts-zh-hans/fix-625163 into lp:ubuntu/maverick/language-support-fonts-zh-hans

[Mohamed Amine Ilidrissi]

From original bug:
"when you install language-support-fonts-zh-hans, the correct Simplified Chinese font should be linked under /etc/fonts/conf.d/ to make proper font available to users. regarding to new ttf-wqy-microhei is recently acquired by Ubuntu new distribution, I think it should be included in debian/control as a dependency."

[Mackenzie Morgan (maco.m)]

Looks reasonable to me, but I can't upload to main.

review: Approve

[Colin Watson (cjwatson)]

This needs to be fixed in lp:langpack-o-matic instead, otherwise it'll be overwritten the next time the package is re-autogenerated.

review: Disapprove

Unmerged revisions

8. By Mohamed Amine Ilidrissi on 2010-08-28

Modified changelog to include patch author.

7. By Mohamed Amine Ilidrissi on 2010-08-28

* Bumped version number, run postinst to link correct language selector.
* Patched to fix bug LP: #625163

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-05 14:35:31 +0000
+++ debian/changelog	2010-08-28 01:34:42 +0000
@@ -1,3 +1,13 @@
+language-support-fonts-zh-hans (1:10.10+20100827) maverick; urgency=low
+
+  [ Ubuntu automatic language-pack builder ]
+  * Bumped version number, run postinst to link correct language selector.
+
+  [ Mohamed Amine IL Idrissi ]
+  * Patched to fix bug LP: #625163 (many thanks, Ray Wang)
+
+ -- Mohamed Amine IL Idrissi <[e-mail]>  Sat, 28 Aug 2010 01:28:45 +0000
+
 language-support-fonts-zh-hans (1:10.04+20091218) lucid; urgency=low
 
   * Bumped version number, no changes

=== modified file 'debian/compat'
--- debian/compat	2009-07-28 04:20:07 +0000
+++ debian/compat	2010-08-28 01:34:42 +0000
@@ -1,1 +1,1 @@
-4
+7

=== modified file 'debian/control'
--- debian/control	2009-09-14 05:00:55 +0000
+++ debian/control	2010-08-28 01:34:42 +0000
@@ -2,12 +2,12 @@
 Section: translations
 Priority: optional
 Maintainer: Language pack maintainers <[e-mail]>
-Build-Depends: debhelper (>= 4.1.0)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
 
 Package: language-support-fonts-zh-hans
 Architecture: all
-Depends: ttf-wqy-zenhei, ttf-arphic-uming, ttf-arphic-ukai, xfonts-wqy
+Depends: ttf-wqy-microhei, ttf-wqy-zenhei, ttf-arphic-uming, ttf-arphic-ukai, xfonts-wqy
 Conflicts: language-support-fonts-zh (<< 1:9.10+20090901)
 Replaces: language-support-fonts-zh (<< 1:9.10+20090901)
 Description: Additional fonts metapackage for Simplified Chinese

=== added file 'debian/postinst'
--- debian/postinst	1970-01-01 00:00:00 +0000
+++ debian/postinst	2010-08-28 01:34:42 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /etc/fonts/conf.d/
+ln -s ../fonts/conf.avail/69-language-selector-zh-cn.conf .

=== added file 'debian/prerm'
--- debian/prerm	1970-01-01 00:00:00 +0000
+++ debian/prerm	2010-08-28 01:34:42 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -f /etc/fonts/conf.d/69-language-selector-zh-cn.conf

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-08-28 01:34:42 +0000
@@ -0,0 +1,1 @@
+3.0 (native)