[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-163-g3b921c6

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 3b921c6a5b3e1c37845b87b025a85c14137be808
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Dec 11 16:39:11 2013 +0100

    Fixed problem in finding the correct include directory for FreeType2

diff --git a/debian/changelog b/debian/changelog
index 46c64be..f10c7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ mapserver (6.4.0-3) unstable; urgency=low
 
   [ Francesco Paolo Lovergine ]
   * Now build-dep on (versioned) libgdal-dev instead of (obsolete) libgdal1-dev. 
+  * Added a new patch freetype2-include-dir.patch to fix problem in
+    determining the correct FreeType2 include directory (why is it not using
+    freetype-config?).
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 11 Dec 2013 14:42:31 +0100
 
diff --git a/debian/patches/freetype2-include-dir.patch b/debian/patches/freetype2-include-dir.patch
new file mode 100644
index 0000000..a75e996
--- /dev/null
+++ b/debian/patches/freetype2-include-dir.patch
@@ -0,0 +1,25 @@
+Description: Fixating FreeType2 include directory
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-12-11
+--- mapserver.orig/cmake/FindFreetype.cmake	2013-12-11 16:33:03.000000000 +0100
++++ mapserver/cmake/FindFreetype.cmake	2013-12-11 16:35:49.000000000 +0100
+@@ -52,9 +52,10 @@
+   /sw/include
+   /opt/local/include
+   /usr/freeware/include
++  /usr/include/freetype2
+ )
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+   HINTS
+   $ENV{FREETYPE_DIR}/include/freetype2
+   PATHS
+@@ -65,6 +66,7 @@
+   /opt/local/include
+   /usr/freeware/include
+   PATH_SUFFIXES freetype2
++  /usr/include/freetype2
+ )
+ 
+ set(FREETYPE_NAMES ${FREETYPE_NAMES} freetype libfreetype freetype219 freetype239 freetype241MT_D freetype2411)
diff --git a/debian/patches/series b/debian/patches/series
index f2af883..efe5e02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ ruby-shebang.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 cmake-mapserver-export.patch
+freetype2-include-dir.patch

-- 
Packaging for MapServer