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

[Marco Trevisan (Treviño)]

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

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

[Colin Watson (cjwatson)]

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)]

Seeds changed: http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/platform.utopic/revision/1981

[Colin Watson (cjwatson)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-14 17:31:30 +0000
+++ debian/changelog	2014-09-10 15:28:43 +0000
@@ -1,3 +1,9 @@
+ubuntu-meta (1.326) UNRELEASED; urgency=medium
+
+  * Added ttf-ancient-fonts-symbola to desktop-recommends (LP: #1137630)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 10 Sep 2014 17:18:29 +0200
+
 ubuntu-meta (1.325) trusty; urgency=medium
 
   * Refreshed dependencies
 
=== modified file 'desktop-recommends-amd64'
--- desktop-recommends-amd64	2014-04-03 01:03:22 +0000
+++ desktop-recommends-amd64	2014-09-10 15:28:43 +0000
@@ -106,6 +106,7 @@
 ttf-indic-fonts-core
 ttf-punjabi-fonts
 ttf-ubuntu-font-family
+ttf-ancient-fonts-symbola
 ubuntu-docs
 unity-webapps-common
 usb-creator-gtk
 
=== modified file 'desktop-recommends-i386'
--- desktop-recommends-i386	2014-04-03 01:03:22 +0000
+++ desktop-recommends-i386	2014-09-10 15:28:43 +0000
@@ -103,6 +103,7 @@
 totem
 totem-mozilla
 transmission-gtk
+ttf-ancient-fonts-symbola
 ttf-indic-fonts-core
 ttf-punjabi-fonts
 ttf-ubuntu-font-family
 
=== modified file 'desktop-recommends-powerpc'
--- desktop-recommends-powerpc	2014-04-03 01:03:22 +0000
+++ desktop-recommends-powerpc	2014-09-10 15:28:43 +0000
@@ -88,6 +88,7 @@
 totem
 totem-mozilla
 transmission-gtk
+ttf-ancient-fonts-symbola
 ttf-indic-fonts-core
 ttf-punjabi-fonts
 ttf-ubuntu-font-family
 
=== modified file 'desktop-recommends-ppc64el'
--- desktop-recommends-ppc64el	2014-04-03 01:03:22 +0000
+++ desktop-recommends-ppc64el	2014-09-10 15:28:43 +0000
@@ -92,6 +92,7 @@
 totem
 totem-mozilla
 transmission-gtk
+ttf-ancient-fonts-symbola
 ttf-indic-fonts-core
 ttf-punjabi-fonts
 ttf-ubuntu-font-family