Merge lp:~3v1n0/ubuntu/utopic/ubuntu-meta/add-emoji-support into lp:ubuntu/utopic/ubuntu-meta

Proposed by Marco Trevisan (Treviño) on 2014-09-10
Status: Merged
Merge reported by: Marco Trevisan (Treviño)
Merged at revision: not available
Proposed branch: lp:~3v1n0/ubuntu/utopic/ubuntu-meta/add-emoji-support
Merge into: lp:ubuntu/utopic/ubuntu-meta
Diff against target: 61 lines (+10/-0)
5 files modified
debian/changelog (+6/-0)
desktop-recommends-amd64 (+1/-0)
desktop-recommends-i386 (+1/-0)
desktop-recommends-powerpc (+1/-0)
desktop-recommends-ppc64el (+1/-0)
To merge this branch: bzr merge lp:~3v1n0/ubuntu/utopic/ubuntu-meta/add-emoji-support
Reviewer Review Type Date Requested Status
Ubuntu branches 2014-09-10 Pending
Review via email: mp+234140@code.launchpad.net

Commit message

Added ttf-ancient-fonts-symbola to desktop-recommends

Description of the change

Added ttf-ancient-fonts-symbola to desktop-recommends

This depends on https://code.launchpad.net/~renatofilho/ubuntu/utopic/ttf-ancient-fonts/fix-1269017/+merge/234013

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

We don't generally use this branch; just poke a core-dev to run ./update and upload the result when the seed changes are in place.

Colin Watson (cjwatson) wrote :

Well, it's only partially merged. This needs to be in main before I can update ubuntu-meta. I've filed https://bugs.launchpad.net/ubuntu/+source/ttf-ancient-fonts/+bug/1377154

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 2014-04-14 17:31:30 +0000
3+++ debian/changelog 2014-09-10 15:28:43 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-meta (1.326) UNRELEASED; urgency=medium
6+
7+ * Added ttf-ancient-fonts-symbola to desktop-recommends (LP: #1137630)
8+
9+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 10 Sep 2014 17:18:29 +0200
10+
11 ubuntu-meta (1.325) trusty; urgency=medium
12
13 * Refreshed dependencies
14
15=== modified file 'desktop-recommends-amd64'
16--- desktop-recommends-amd64 2014-04-03 01:03:22 +0000
17+++ desktop-recommends-amd64 2014-09-10 15:28:43 +0000
18@@ -106,6 +106,7 @@
19 ttf-indic-fonts-core
20 ttf-punjabi-fonts
21 ttf-ubuntu-font-family
22+ttf-ancient-fonts-symbola
23 ubuntu-docs
24 unity-webapps-common
25 usb-creator-gtk
26
27=== modified file 'desktop-recommends-i386'
28--- desktop-recommends-i386 2014-04-03 01:03:22 +0000
29+++ desktop-recommends-i386 2014-09-10 15:28:43 +0000
30@@ -103,6 +103,7 @@
31 totem
32 totem-mozilla
33 transmission-gtk
34+ttf-ancient-fonts-symbola
35 ttf-indic-fonts-core
36 ttf-punjabi-fonts
37 ttf-ubuntu-font-family
38
39=== modified file 'desktop-recommends-powerpc'
40--- desktop-recommends-powerpc 2014-04-03 01:03:22 +0000
41+++ desktop-recommends-powerpc 2014-09-10 15:28:43 +0000
42@@ -88,6 +88,7 @@
43 totem
44 totem-mozilla
45 transmission-gtk
46+ttf-ancient-fonts-symbola
47 ttf-indic-fonts-core
48 ttf-punjabi-fonts
49 ttf-ubuntu-font-family
50
51=== modified file 'desktop-recommends-ppc64el'
52--- desktop-recommends-ppc64el 2014-04-03 01:03:22 +0000
53+++ desktop-recommends-ppc64el 2014-09-10 15:28:43 +0000
54@@ -92,6 +92,7 @@
55 totem
56 totem-mozilla
57 transmission-gtk
58+ttf-ancient-fonts-symbola
59 ttf-indic-fonts-core
60 ttf-punjabi-fonts
61 ttf-ubuntu-font-family

Subscribers

People subscribed via source and target branches