-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2013-11-28 23:10:19 UTC
-
mfrom:
(1.3.1)
(53.1.4 trunk)
-
Revision ID:
package-import@ubuntu.com-20131128231019-kd6gradcx7dm80bj
Tags: 2.5.1-1ubuntu1
* Merge from Debian unstable (LP: #1256114), remaining changes:
- debian/patches-freetype/revert_scalable_fonts_metric.patch:
revert commit "Fix metrics on size request for scalable fonts.",
which breaks gtk underlining markups
* Dropped changes, included in Debian:
- debian/control: build-depends on libpng-dev
- debian/libfreetype6.symbols: new version update
* Drop debian/patches-ft2demos/compiler-warning-fixes.patch, which is
actually a bug in the compiler_hardening_fixes.patch and has been fixed
there in the Ubuntu version.