Mozilla Firefox

Merge lp:~laney/firefox/fonts-no-transitional into lp:firefox/trunk

  1. fonts-no-transitional
  2. Merge into firefox-trunk.head
Proposed by Iain Lane
Status: Rejected
Rejected by: Rico Tzschichholz
Proposed branch: lp:~laney/firefox/fonts-no-transitional
Merge into: lp:firefox/trunk
Diff against target: 54 lines (+10/-4)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
debian/control.in (+2/-2)
To merge this branch: bzr merge lp:~laney/firefox/fonts-no-transitional
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+196756@code.launchpad.net

Description of the change

  * debian/control{,.in}: Update ttf-wqy-zenhei and ttf-arphic-ukai
    dependencies from firefox-testsuite to fonts-*. The former are either
    transitional packages or have been removed.

Please cherry-pick this into the trusty branch too.

To post a comment you must log in.
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/1296663

Unmerged revisions

1876. By Iain Lane

debian/control{,.in}: Update ttf-wqy-zenhei and ttf-arphic-ukai
dependencies from firefox-testsuite to fonts-*. The former are either
transitional packages or have been removed.

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 2013-11-20 11:15:23 +0000
3+++ debian/changelog 2013-11-26 17:19:53 +0000
4@@ -1,5 +1,6 @@
5 firefox-trunk (28.0~a1~hg20131118r156007-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Chris Coulson ]
8 * New upstream snapshot v28.0 A1 HG20131118R156007
9
10 * Refresh patches
11@@ -11,6 +12,11 @@
12 on nightly, so don't try to override it with our own
13 - add debian/searchplugins/bs/list.txt
14
15+ [ Iain Lane ]
16+ * debian/control{,.in}: Update ttf-wqy-zenhei and ttf-arphic-ukai
17+ dependencies from firefox-testsuite to fonts-*. The former are either
18+ transitional packages or have been removed.
19+
20 -- Chris Coulson <chris.coulson@canonical.com> Tue, 12 Nov 2013 20:34:55 +0000
21
22 firefox-trunk (27.0~a1~hg20131023r151789-0ubuntu1) saucy; urgency=low
23
24=== modified file 'debian/control'
25--- debian/control 2013-11-12 20:44:46 +0000
26+++ debian/control 2013-11-26 17:19:53 +0000
27@@ -143,9 +143,9 @@
28 fonts-kacst,
29 fonts-takao-mincho,
30 fonts-takao-gothic,
31- ttf-wqy-zenhei,
32+ fonts-wqy-zenhei,
33 fonts-arphic-uming,
34- ttf-arphic-ukai,
35+ fonts-arphic-ukai,
36 fonts-nanum,
37 fonts-nanum-coding,
38 fonts-unfonts-core,
39
40=== modified file 'debian/control.in'
41--- debian/control.in 2013-11-12 20:44:46 +0000
42+++ debian/control.in 2013-11-26 17:19:53 +0000
43@@ -143,9 +143,9 @@
44 fonts-kacst,
45 fonts-takao-mincho,
46 fonts-takao-gothic,
47- ttf-wqy-zenhei,
48+ fonts-wqy-zenhei,
49 fonts-arphic-uming,
50- ttf-arphic-ukai,
51+ fonts-arphic-ukai,
52 fonts-nanum,
53 fonts-nanum-coding,
54 fonts-unfonts-core,

Subscribers

People subscribed via source and target branches