From ee6e1488d03234032aabde268a0ade5efc1b20b4 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 28 Feb 2014 15:29:01 +0100 Subject: [PATCH] Merge changes from 2.8.12.1-1.1 Non-maintainer upload. --- debian/changelog | 8 ++++++++ debian/patches/fix-FindFreetype.diff | 17 +++++++++++++++++ debian/patches/series | 1 + debian/source/local-options | 2 -- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fix-FindFreetype.diff delete mode 100644 debian/source/local-options diff --git a/debian/changelog b/debian/changelog index 60bbf513d..4f0151244 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cmake (2.8.12.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Make sure to find freetype headers in their new location (without an + extra freetype/ directory, fix-FindFreetype.diff). (Closes: #731089) + + -- Cyril Brulebois Sun, 15 Dec 2013 10:30:54 +0000 + cmake (2.8.12.1-1) unstable; urgency=low * New upstream release: diff --git a/debian/patches/fix-FindFreetype.diff b/debian/patches/fix-FindFreetype.diff new file mode 100644 index 000000000..47d757005 --- /dev/null +++ b/debian/patches/fix-FindFreetype.diff @@ -0,0 +1,17 @@ +Description: Fix FindFreetype after headers location breakage. + Make sure to find freetype headers in their new location (without an + extra freetype/ directory). +Author: Cyril Brulebois +Bug-Debian: http://bugs.debian.org/731089 + +--- a/Modules/FindFreetype.cmake ++++ b/Modules/FindFreetype.cmake +@@ -56,7 +56,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build + PATH_SUFFIXES include/freetype2 include + ) + +-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS diff --git a/debian/patches/series b/debian/patches/series index 0a1f7ed0d..0b24e01ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ qt_import_dir_variable.diff FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff fix-ftbfs-on-kfreebsd.patch +fix-FindFreetype.diff diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 9cdfca9f9..000000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -unapply-patches -abort-on-upstream-changes