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

Proposed by Mohamed Amine Ilidrissi
Status: Needs review
Proposed branch: lp:~ilidrissi.amine/ubuntu/maverick/language-support-fonts-zh-hans/fix-625163
Merge into: lp:ubuntu/maverick/language-support-fonts-zh-hans
Diff against target: 68 lines (+22/-4)
6 files modified
debian/changelog (+10/-0)
debian/compat (+1/-1)
debian/control (+3/-3)
debian/postinst (+4/-0)
debian/prerm (+3/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~ilidrissi.amine/ubuntu/maverick/language-support-fonts-zh-hans/fix-625163
Reviewer Review Type Date Requested Status
Colin Watson Disapprove
Mackenzie Morgan (community) Approve
Review via email: mp+33977@code.launchpad.net

Description of the change

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."

To post a comment you must log in.
Revision history for this message
Mackenzie Morgan (maco.m) wrote :

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

review: Approve
Revision history for this message
Colin Watson (cjwatson) wrote :

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

Modified changelog to include patch author.

7. By Mohamed Amine Ilidrissi

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-01-05 14:35:31 +0000
3+++ debian/changelog 2010-08-28 01:34:42 +0000
4@@ -1,3 +1,13 @@
5+language-support-fonts-zh-hans (1:10.10+20100827) maverick; urgency=low
6+
7+ [ Ubuntu automatic language-pack builder ]
8+ * Bumped version number, run postinst to link correct language selector.
9+
10+ [ Mohamed Amine IL Idrissi ]
11+ * Patched to fix bug LP: #625163 (many thanks, Ray Wang)
12+
13+ -- Mohamed Amine IL Idrissi <ilidrissiamine@gmail.com> Sat, 28 Aug 2010 01:28:45 +0000
14+
15 language-support-fonts-zh-hans (1:10.04+20091218) lucid; urgency=low
16
17 * Bumped version number, no changes
18
19=== modified file 'debian/compat'
20--- debian/compat 2009-07-28 04:20:07 +0000
21+++ debian/compat 2010-08-28 01:34:42 +0000
22@@ -1,1 +1,1 @@
23-4
24+7
25
26=== modified file 'debian/control'
27--- debian/control 2009-09-14 05:00:55 +0000
28+++ debian/control 2010-08-28 01:34:42 +0000
29@@ -2,12 +2,12 @@
30 Section: translations
31 Priority: optional
32 Maintainer: Language pack maintainers <language-packs@ubuntu.com>
33-Build-Depends: debhelper (>= 4.1.0)
34-Standards-Version: 3.7.3
35+Build-Depends: debhelper (>= 7)
36+Standards-Version: 3.9.1
37
38 Package: language-support-fonts-zh-hans
39 Architecture: all
40-Depends: ttf-wqy-zenhei, ttf-arphic-uming, ttf-arphic-ukai, xfonts-wqy
41+Depends: ttf-wqy-microhei, ttf-wqy-zenhei, ttf-arphic-uming, ttf-arphic-ukai, xfonts-wqy
42 Conflicts: language-support-fonts-zh (<< 1:9.10+20090901)
43 Replaces: language-support-fonts-zh (<< 1:9.10+20090901)
44 Description: Additional fonts metapackage for Simplified Chinese
45
46=== added file 'debian/postinst'
47--- debian/postinst 1970-01-01 00:00:00 +0000
48+++ debian/postinst 2010-08-28 01:34:42 +0000
49@@ -0,0 +1,4 @@
50+#!/bin/sh
51+
52+cd /etc/fonts/conf.d/
53+ln -s ../fonts/conf.avail/69-language-selector-zh-cn.conf .
54
55=== added file 'debian/prerm'
56--- debian/prerm 1970-01-01 00:00:00 +0000
57+++ debian/prerm 2010-08-28 01:34:42 +0000
58@@ -0,0 +1,3 @@
59+#!/bin/sh
60+
61+rm -f /etc/fonts/conf.d/69-language-selector-zh-cn.conf
62
63=== added directory 'debian/source'
64=== added file 'debian/source/format'
65--- debian/source/format 1970-01-01 00:00:00 +0000
66+++ debian/source/format 2010-08-28 01:34:42 +0000
67@@ -0,0 +1,1 @@
68+3.0 (native)

Subscribers

People subscribed via source and target branches