diff -u freetype-2.3.7/debian/rules freetype-2.3.7/debian/rules --- freetype-2.3.7/debian/rules +++ freetype-2.3.7/debian/rules @@ -82,6 +82,7 @@ build: unpack patch build-stamp build-stamp: dh_testdir + rm -f debian/copyright # grr, soyuz cd $(freetype_u) && ./configure --prefix=/usr CFLAGS="$(CFLAGS)" # cd $(freetype_u) && ./configure --prefix=/usr $(MAKE) -C $(freetype_u) @@ -101,6 +102,7 @@ rm -f $(freetype_config_man) rm -rf $(freetype_u) $(ft2demos_u) dh_clean + echo "fool soyuz" > debian/copyright # grr, soyuz install: DH_OPTIONS= install: build diff -u freetype-2.3.7/debian/control freetype-2.3.7/debian/control --- freetype-2.3.7/debian/control +++ freetype-2.3.7/debian/control @@ -1,7 +1,8 @@ Source: freetype Section: libs Priority: optional -Maintainer: Steve Langasek +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Steve Langasek Uploaders: Anthony Fok , Keith Packard Build-Depends: bzip2, debhelper (>= 5.0.22), docbook-to-man, gettext (>= 0.10.36-2), libx11-dev, x11proto-core-dev, libz-dev, quilt Standards-Version: 3.6.1 diff -u freetype-2.3.7/debian/changelog freetype-2.3.7/debian/changelog --- freetype-2.3.7/debian/changelog +++ freetype-2.3.7/debian/changelog @@ -1,3 +1,15 @@ +freetype (2.3.7-1ubuntu1) intrepid; urgency=low + + * Merge from debian testing (LP: #251369) , remaining changes: + - debian/patches-freetype/enable-subpixel-rendering.patch: + + enable subpixel rendering features, used by libcairo and xft to + provide LCD colour filtering. This is considered no more or less + evil than the bytecode interpreter which we also enable. + - Work around Soyuz breakage. + * changelog + + -- Mike Duigou Thu, 24 Jul 2008 12:35:54 -0700 + freetype (2.3.7-1) unstable; urgency=low * New upstream release @@ -13,6 +25,19 @@ -- Steve Langasek Mon, 30 Jun 2008 17:57:56 -0700 +freetype (2.3.6-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches-freetype/enable-subpixel-rendering.patch: + + enable subpixel rendering features, used by libcairo and xft to + provide LCD colour filtering. This is considered no more or less + evil than the bytecode interpreter which we also enable. + - Work around Soyuz breakage. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Bryce Harrington Thu, 19 Jun 2008 18:07:23 -0700 + freetype (2.3.6-1) unstable; urgency=low * New upstream release @@ -22,6 +47,43 @@ -- Steve Langasek Sun, 15 Jun 2008 23:52:53 -0700 +freetype (2.3.5-1ubuntu4) gutsy; urgency=low + + * debian/patches-freetype/enable-subpixel-rendering.patch: + - Restore patch that enables subpixel rendering features, now that + libcairo and xft provide the ability for the specific lcd filter + to be changed. + + -- Scott James Remnant Thu, 20 Sep 2007 20:51:00 +0100 + +freetype (2.3.5-1ubuntu3) gutsy; urgency=low + + * debian/patches-freetype/series + - Fix the removal of enable-subpixel-rendering.patch + + -- Matthew Garrett Thu, 20 Sep 2007 15:19:56 +0100 + +freetype (2.3.5-1ubuntu2) gutsy; urgency=low + + * debian/patches-freetype/enable-subpixel-rendering.patch: + - remove - not needed with the bytecode interpreter enabled, and + results in incorrect rendering + + -- Matthew Garrett Thu, 20 Sep 2007 05:07:09 +0100 + +freetype (2.3.5-1ubuntu1) gutsy; urgency=low + + [ Matti Lindell ] + * debian/patches-freetype/enable-subpixel-rendering.patch: + - enable subpixel rendering features, used by libcairo and xft to + provide LCD colour filtering. This is considered no more or less + evil than the bytecode interpreter which we also enable. + + [ Scott James Remnant ] + * Work around Soyuz breakage. + + -- Scott James Remnant Tue, 18 Sep 2007 19:42:32 +0100 + freetype (2.3.5-1) unstable; urgency=low * New upstream release @@ -1194,0 +1257 @@ + diff -u freetype-2.3.7/debian/patches-freetype/series freetype-2.3.7/debian/patches-freetype/series --- freetype-2.3.7/debian/patches-freetype/series +++ freetype-2.3.7/debian/patches-freetype/series @@ -5,0 +6 @@ +enable-subpixel-rendering.patch only in patch2: unchanged: --- freetype-2.3.7.orig/debian/copyright +++ freetype-2.3.7/debian/copyright @@ -0,0 +1 @@ +fool soyuz only in patch2: unchanged: --- freetype-2.3.7.orig/debian/patches-freetype/enable-subpixel-rendering.patch +++ freetype-2.3.7/debian/patches-freetype/enable-subpixel-rendering.patch @@ -0,0 +1,11 @@ +--- freetype-2.2.1.orig/include/freetype/config/ftoption.h 2006-09-27 00:55:44.000000000 +0300 ++++ freetype-2.2.1/include/freetype/config/ftoption.h 2006-10-31 03:08:14.000000000 +0200 +@@ -92,7 +92,7 @@ + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/