[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 388401bfcd886a93542c9a5857b5375ae0b6dd4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 1 17:31:31 2013 +0200

    Drop obsolete patch: fixmapscriptvars.patch.

diff --git a/debian/changelog b/debian/changelog
index 9b39ab0..18b4414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * Build system changed from autotools to cmake.
   * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.
   * Update hardening.patch for CMake build.
+  * Drop patches:
+    - fixmapscriptvars.patch (mapscriptvars no longer used)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/fixmapscriptvars.patch b/debian/patches/fixmapscriptvars.patch
deleted file mode 100644
index 24d5ecd..0000000
--- a/debian/patches/fixmapscriptvars.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix mapscriptvars to send the right argument to ld.
-Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
-Last-Update: 2012-11-15
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -415,7 +415,7 @@ mapscriptvars:	Makefile
- 	echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
- 	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
- 	echo $(LIBMAP) >> mapscriptvars
--	echo $(EXE_LDFLAGS) >> mapscriptvars
-+	echo -Wl,$(EXE_LDFLAGS) >> mapscriptvars
- 	grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
- 
- mapserver-config: Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 981b3de..3dcc945 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fixmapscriptvars.patch
 php_segfault.patch
 mapows-contenttype.patch
 hardening.patch

-- 
Packaging for MapServer