Merge changes from 2.8.12.1-1.1 Non-maintainer upload.

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 <kibi@debian.org>  Sun, 15 Dec 2013 10:30:54 +0000
+
 cmake (2.8.12.1-1) unstable; urgency=low
 
   * New upstream release:

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 <kibi@debian.org>
+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

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

debian/source/local-options

@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes