-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2014-09-19 10:11:16 UTC
-
mfrom:
(59.2.4 freetype)
-
Revision ID:
package-import@ubuntu.com-20140919101116-tev61zunurygqo0v
Tags: 2.5.2-2ubuntu1
* Merge from Debian unstable, 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
- Make libfreetype6-dev M-A: same.
- Error out on the use of the freetype-config --libtool option.
- Don't add multiarch libdirs for freetype-config --libs.
- Install the freetype2/config headers into the multiarch include path
and provide symlinks in /usr/include.
* Dropped changes, included in Debian:
- debian/patches/CVE-2014-2240.patch: validate hintMask in
src/cff/cf2hints.c.
- debian/patches/CVE-2014-2241.patch: don't trigger asserts in
src/cff/cf2ft.c.
- debian/patches-freetype/0001-Fix-Savannah-bug-40997.patch: Cherry-pick
upstream patch to fix a double free.
- debian/patches-freetype/0002-Fix-Savannah-bug-42418.patch: Cherry-pick
upstream patch to fix cjk font rendering issue.