Ubuntu
fonts-arphic-uming package

Merge lp:~ubuntu-branches/ubuntu/quantal/fonts-arphic-uming/quantal-201209101011 into lp:ubuntu/quantal/fonts-arphic-uming

  1. Quantal (12.10)
  2. quantal-201209101011
  3. Merge into quantal
Proposed by Ubuntu Package Importer
Status: Rejected
Rejected by: James Westby
Proposed branch: lp:~ubuntu-branches/ubuntu/quantal/fonts-arphic-uming/quantal-201209101011
Merge into: lp:ubuntu/quantal/fonts-arphic-uming
Diff against target: 262 lines (+216/-0) (has conflicts)
8 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/applied-patches (+1/-0)
.pc/single_alias_test_tags.patch/41-arphic-uming.conf (+29/-0)
.pc/single_alias_test_tags.patch/64-arphic-uming.conf (+80/-0)
debian/patches/series (+1/-0)
debian/patches/single_alias_test_tags.patch (+102/-0)
Conflict adding file .pc.  Moved existing file to .pc.moved.
Conflict adding file debian/patches/series.  Moved existing file to debian/patches/series.moved.
Conflict adding file debian/patches/single_alias_test_tags.patch.  Moved existing file to debian/patches/single_alias_test_tags.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/quantal/fonts-arphic-uming/quantal-201209101011
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+123520@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/fonts-arphic-uming reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/fonts-arphic-uming/quantal-201209101011. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

7. By Martin Pitt

releasing version 0.2.20080216.2-4ubuntu1

6. By Martin Pitt

Add single_alias_test_tags.patch: Avoid multiple values in an alias and
test tags, as they are not supported by current fontconfig. (LP: #1034928)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== renamed directory '.pc' => '.pc.moved'
3=== added file '.pc/.quilt_patches'
4--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
5+++ .pc/.quilt_patches 2012-09-10 10:22:19 +0000
6@@ -0,0 +1,1 @@
7+debian/patches
8
9=== added file '.pc/.quilt_series'
10--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
11+++ .pc/.quilt_series 2012-09-10 10:22:19 +0000
12@@ -0,0 +1,1 @@
13+series
14
15=== added file '.pc/.version'
16--- .pc/.version 1970-01-01 00:00:00 +0000
17+++ .pc/.version 2012-09-10 10:22:19 +0000
18@@ -0,0 +1,1 @@
19+2
20
21=== added file '.pc/applied-patches'
22--- .pc/applied-patches 1970-01-01 00:00:00 +0000
23+++ .pc/applied-patches 2012-09-10 10:22:19 +0000
24@@ -0,0 +1,1 @@
25+single_alias_test_tags.patch
26
27=== added directory '.pc/single_alias_test_tags.patch'
28=== added file '.pc/single_alias_test_tags.patch/.timestamp'
29=== added file '.pc/single_alias_test_tags.patch/41-arphic-uming.conf'
30--- .pc/single_alias_test_tags.patch/41-arphic-uming.conf 1970-01-01 00:00:00 +0000
31+++ .pc/single_alias_test_tags.patch/41-arphic-uming.conf 2012-09-10 10:22:19 +0000
32@@ -0,0 +1,29 @@
33+<?xml version="1.0"?>
34+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
35+<fontconfig>
36+
37+<!--
38+ Serif faces
39+ -->
40+ <alias>
41+ <family>AR PL ShanHeiSun Uni</family>
42+ <family>AR PL ShanHeiSun Uni MBE</family>
43+ <family>AR PL UMing CN</family>
44+ <family>AR PL UMing HK</family>
45+ <family>AR PL UMing TW</family>
46+ <family>AR PL UMing TW MBE</family>
47+ <default><family>serif</family></default>
48+ </alias>
49+<!--
50+ Monospace faces
51+ -->
52+ <alias>
53+ <family>AR PL ShanHeiSun Uni</family>
54+ <family>AR PL ShanHeiSun Uni MBE</family>
55+ <family>AR PL UMing CN</family>
56+ <family>AR PL UMing HK</family>
57+ <family>AR PL UMing TW</family>
58+ <family>AR PL UMing TW MBE</family>
59+ <default><family>monospace</family></default>
60+ </alias>
61+</fontconfig>
62
63=== added file '.pc/single_alias_test_tags.patch/64-arphic-uming.conf'
64--- .pc/single_alias_test_tags.patch/64-arphic-uming.conf 1970-01-01 00:00:00 +0000
65+++ .pc/single_alias_test_tags.patch/64-arphic-uming.conf 2012-09-10 10:22:19 +0000
66@@ -0,0 +1,80 @@
67+<?xml version="1.0"?>
68+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
69+<fontconfig>
70+ <match target="pattern">
71+ <test qual="any" name="lang" compare="contains">
72+ <string>zh-cn</string>
73+ <string>zh-sg</string>
74+ </test>
75+ <test qual="any" name="family">
76+ <string>serif</string>
77+ </test>
78+ <edit name="family" mode="prepend" binding="strong">
79+ <string>AR PL UMing CN</string>
80+ </edit>
81+ </match>
82+
83+ <match target="pattern">
84+ <test qual="any" name="lang" compare="contains">
85+ <string>zh-cn</string>
86+ <string>zh-sg</string>
87+ </test>
88+ <test name="family">
89+ <string>AR PL UMing CN</string>
90+ </test>
91+ <edit name="family" mode="append" binding="strong">
92+ <string>DejaVu Serif</string>
93+ </edit>
94+ </match>
95+
96+ <match target="pattern">
97+ <test qual="any" name="lang" compare="contains">
98+ <string>zh-hk</string>
99+ <string>zh-mo</string>
100+ </test>
101+ <test qual="any" name="family">
102+ <string>serif</string>
103+ </test>
104+ <edit name="family" mode="prepend" binding="strong">
105+ <string>AR PL UMing HK</string>
106+ </edit>
107+ </match>
108+
109+ <match target="pattern">
110+ <test qual="any" name="lang" compare="contains">
111+ <string>zh-hk</string>
112+ <string>zh-mo</string>
113+ </test>
114+ <test name="family">
115+ <string>AR PL UMing HK</string>
116+ </test>
117+ <edit name="family" mode="append" binding="strong">
118+ <string>DejaVu Serif</string>
119+ </edit>
120+ </match>
121+
122+ <match target="pattern">
123+ <test name="lang" compare="contains">
124+ <string>zh-tw</string>
125+ </test>
126+ <test qual="any" name="family">
127+ <string>serif</string>
128+ </test>
129+ <edit name="family" mode="prepend" binding="strong">
130+ <string>AR PL UMing TW</string>
131+ </edit>
132+ </match>
133+
134+ <match target="pattern">
135+ <test name="lang" compare="contains">
136+ <string>zh-tw</string>
137+ </test>
138+ <test name="family">
139+ <string>AR PL UMing TW</string>
140+ </test>
141+ <edit name="family" mode="append" binding="strong">
142+ <string>DejaVu Serif</string>
143+ </edit>
144+ </match>
145+
146+</fontconfig>
147
148=== added file 'debian/patches/series'
149--- debian/patches/series 1970-01-01 00:00:00 +0000
150+++ debian/patches/series 2012-09-10 10:22:19 +0000
151@@ -0,0 +1,1 @@
152+single_alias_test_tags.patch
153
154=== renamed file 'debian/patches/series' => 'debian/patches/series.moved'
155=== added file 'debian/patches/single_alias_test_tags.patch'
156--- debian/patches/single_alias_test_tags.patch 1970-01-01 00:00:00 +0000
157+++ debian/patches/single_alias_test_tags.patch 2012-09-10 10:22:19 +0000
158@@ -0,0 +1,102 @@
159+Description: Avoid multiple values in an alias and test tags, as they are not supported by current fontconfig
160+Author: Radu Stoica <radumstoica@gmail.com>
161+Bug-Ubuntu: https://launchpad.net/bugs/1034928
162+Bug-Debian: http://bugs.debian.org/687043
163+
164+=== modified file '41-arphic-uming.conf'
165+--- old/41-arphic-uming.conf 2011-12-11 19:57:38 +0000
166++++ new/41-arphic-uming.conf 2012-09-10 09:43:19 +0000
167+@@ -7,22 +7,52 @@
168+ -->
169+ <alias>
170+ <family>AR PL ShanHeiSun Uni</family>
171++ <default><family>serif</family></default>
172++ </alias>
173++ <alias>
174+ <family>AR PL ShanHeiSun Uni MBE</family>
175++ <default><family>serif</family></default>
176++ </alias>
177++ <alias>
178+ <family>AR PL UMing CN</family>
179++ <default><family>serif</family></default>
180++ </alias>
181++ <alias>
182+ <family>AR PL UMing HK</family>
183++ <default><family>serif</family></default>
184++ </alias>
185++ <alias>
186+ <family>AR PL UMing TW</family>
187++ <default><family>serif</family></default>
188++ </alias>
189++ <alias>
190+ <family>AR PL UMing TW MBE</family>
191+ <default><family>serif</family></default>
192+ </alias>
193+ <!--
194+ Monospace faces
195+ -->
196+- <alias>
197++ <alias>
198+ <family>AR PL ShanHeiSun Uni</family>
199++ <default><family>monospace</family></default>
200++ </alias>
201++ <alias>
202+ <family>AR PL ShanHeiSun Uni MBE</family>
203++ <default><family>monospace</family></default>
204++ </alias>
205++ <alias>
206+ <family>AR PL UMing CN</family>
207++ <default><family>monospace</family></default>
208++ </alias>
209++ <alias>
210+ <family>AR PL UMing HK</family>
211++ <default><family>monospace</family></default>
212++ </alias>
213++ <alias>
214+ <family>AR PL UMing TW</family>
215++ <default><family>monospace</family></default>
216++ </alias>
217++ <alias>
218+ <family>AR PL UMing TW MBE</family>
219+ <default><family>monospace</family></default>
220+ </alias>
221+
222+=== modified file '64-arphic-uming.conf'
223+--- old/64-arphic-uming.conf 2011-12-11 19:57:38 +0000
224++++ new/64-arphic-uming.conf 2012-09-10 09:43:19 +0000
225+@@ -4,6 +4,8 @@
226+ <match target="pattern">
227+ <test qual="any" name="lang" compare="contains">
228+ <string>zh-cn</string>
229++ </test>
230++ <test qual="any" name="lang" compare="contains">
231+ <string>zh-sg</string>
232+ </test>
233+ <test qual="any" name="family">
234+@@ -17,6 +19,8 @@
235+ <match target="pattern">
236+ <test qual="any" name="lang" compare="contains">
237+ <string>zh-cn</string>
238++ </test>
239++ <test qual="any" name="lang" compare="contains">
240+ <string>zh-sg</string>
241+ </test>
242+ <test name="family">
243+@@ -30,6 +34,8 @@
244+ <match target="pattern">
245+ <test qual="any" name="lang" compare="contains">
246+ <string>zh-hk</string>
247++ </test>
248++ <test qual="any" name="lang" compare="contains">
249+ <string>zh-mo</string>
250+ </test>
251+ <test qual="any" name="family">
252+@@ -43,6 +49,8 @@
253+ <match target="pattern">
254+ <test qual="any" name="lang" compare="contains">
255+ <string>zh-hk</string>
256++ </test>
257++ <test qual="any" name="lang" compare="contains">
258+ <string>zh-mo</string>
259+ </test>
260+ <test name="family">
261
262=== renamed file 'debian/patches/single_alias_test_tags.patch' => 'debian/patches/single_alias_test_tags.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: