[SCM] mapserver branch, jessie, updated. upstream/6.4.0_rc1-173-gfb9af8a

[Bas Couwenberg]

The following commit has been merged in the jessie branch:
commit fbfb9fca05e0818b4c4b0faa1e9511e085aed85d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 2 17:44:50 2014 +0100

    Drop freetype2-include-dir.patch, applied upstream in modified form.

diff --git a/debian/changelog b/debian/changelog
index d3b6732..79daf10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.4.1-1) UNRELEASED; urgency=low
   * New upstream release, fixes a vulnerability leading to potential leakage of
     information when using TIME filtering on postgis layers.
   * Refresh patches.
+  * Drop freetype2-include-dir.patch, applied upstream in modified form. 
   * Bump Standards-Version to 3.9.5, no changes required.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 02 Jan 2014 16:08:30 +0100
diff --git a/debian/patches/freetype2-include-dir.patch b/debian/patches/freetype2-include-dir.patch
deleted file mode 100644
index a75e996..0000000
--- a/debian/patches/freetype2-include-dir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 efe5e02..f2af883 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ ruby-shebang.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 cmake-mapserver-export.patch
-freetype2-include-dir.patch

-- 
Packaging for MapServer