[SCM] mapserver branch, master, updated. upstream/5.6.6-12-g6c2de62

Alan Boudreault aboudreault at mapgears.com
Fri Dec 9 03:30:35 UTC 2011 

The following commit has been merged in the master branch:
commit 6c2de62f3d187b2e79c1578bade765ea458298c4
Author: Alan Boudreault <aboudreault at mapgears.com>
Date:   Thu Dec 8 22:29:47 2011 -0500

    New upstream release: 6.0.1

diff --git a/debian/changelog b/debian/changelog
index 6cf6bed..a858b0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.0.1-1) unstable; urgency=low
+	
+  * New upstream release.
+
+ -- Alan Boudreault <aboudreault at mapgears.com>  Thu, 08 Dec 2011 22:09:22 -0500
+
 mapserver (5.6.6-2) unstable; urgency=low
 
   * Ack previous NMU: added libepsilon-dev as build-dep.
diff --git a/debian/control b/debian/control
index 0840a10..e39cdaf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4),
- libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.4.0), libproj-dev,
- libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 2.2.3-2),
- ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
+-Build-Depends: debhelper (>= 7), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4),
+- libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.4.0), libproj-dev,
+- libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 2.2.3-2),
+- ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
- libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev
+ libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
 Build-Depends-Indep: python-docutils
 Build-Conflicts: libcurl3-openssl-dev
 Homepage: http://www.mapserver.org
diff --git a/debian/copyright b/debian/copyright
index 3d8fc3a..055f06c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,7 +43,7 @@ tests/vera:
 Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
 Vera is a trademark of Bitstream, Inc.
 
-mapscript/php3/Makefile.in:
+mapscript/php/Makefile.in:
 
 # | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
 
@@ -169,7 +169,7 @@ Software without prior written authorization from the Gnome Foundation
 or Bitstream Inc., respectively. For further information, contact:
 fonts at gnome dot org.
 
-mapscript/php3/Makefile.in:
+mapscript/php/Makefile.in:
 
 # | This program is free software; you can redistribute it and/or modify |
 # | it under the terms of one of the following licenses:                 |
diff --git a/debian/mapserver-doc.docs b/debian/mapserver-doc.docs
index 50afbee..045e372 100644
--- a/debian/mapserver-doc.docs
+++ b/debian/mapserver-doc.docs
@@ -2,5 +2,5 @@ README
 COMMITERS
 fonts
 symbols
-MIGRATION_GUIDE.TXT
+MIGRATION_GUIDE.txt
 xmlmapfile
diff --git a/debian/patches/series b/debian/patches/series
index c867d1d..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-symbol_index_overflow
+
diff --git a/debian/patches/symbol_index_overflow b/debian/patches/symbol_index_overflow
deleted file mode 100644
index 1d7c38f..0000000
--- a/debian/patches/symbol_index_overflow
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: mapserver/mapdraw.c
-===================================================================
---- mapserver.orig/mapdraw.c	2011-03-09 21:27:34.000000000 +0100
-+++ mapserver/mapdraw.c	2011-03-11 22:42:06.000000000 +0100
-@@ -1421,6 +1421,10 @@
- 			nStatus = MS_FAILURE;
- 		}
- */
-+      if (style->symbol >= map->symbolset.numsymbols) {
-+          msSetError(MS_SYMERR, "Invalid symbol index: %d", "msDrawShape()", style->symbol);
-+          return MS_FAILURE;
-+      }
- #endif
-         else
-         {
-Index: mapserver/mapfile.c
-===================================================================
---- mapserver.orig/mapfile.c	2011-03-09 21:27:34.000000000 +0100
-+++ mapserver/mapfile.c	2011-03-11 22:42:06.000000000 +0100
-@@ -4911,6 +4911,10 @@
-                 return MS_FAILURE;
-               }
-             }
-+	    if(!MS_IS_VALID_ARRAY_INDEX(GET_LAYER(map, i)->class[j]->styles[k]->symbol, map->symbolset.numsymbols)) {
-+	      msSetError(MS_MISCERR, "Invalid symbol index in class %d, style %d of layer %s.", "msUpdateMapFromURL()", j, k, GET_LAYER(map, i)->name);
-+	      return MS_FAILURE;
-+	    }
-           }
-         }
-       }
-@@ -5381,13 +5385,17 @@
- 
-       /* make sure any symbol names for this layer have been resolved (bug #2700) */
-       for(j=0; j<GET_LAYER(map, i)->numclasses; j++) {
--	for(k=0; k<GET_LAYER(map, i)->class[j]->numstyles; k++) {
-+        for(k=0; k<GET_LAYER(map, i)->class[j]->numstyles; k++) {
-           if(GET_LAYER(map, i)->class[j]->styles[k]->symbolname && GET_LAYER(map, i)->class[j]->styles[k]->symbol == 0) {
-             if((GET_LAYER(map, i)->class[j]->styles[k]->symbol =  msGetSymbolIndex(&(map->symbolset), GET_LAYER(map, i)->class[j]->styles[k]->symbolname, MS_TRUE)) == -1) {
-               msSetError(MS_MISCERR, "Undefined symbol \"%s\" in class %d, style %d of layer %s.", "msUpdateMapFromURL()", GET_LAYER(map, i)->class[j]->styles[k]->symbolname, j, k, GET_LAYER(map, i)->name);
-               return MS_FAILURE;
-             }
-           }
-+          if(!MS_IS_VALID_ARRAY_INDEX(GET_LAYER(map, i)->class[j]->styles[k]->symbol, map->symbolset.numsymbols)) {
-+            msSetError(MS_MISCERR, "Invalid symbol index in class %d, style %d of layer %s.", "msUpdateMapFromURL()", j, k, GET_LAYER(map, i)->name);
-+            return MS_FAILURE;
-+          }
-         }
-       }
- 
-Index: mapserver/mapserver.h
-===================================================================
---- mapserver.orig/mapserver.h	2011-03-09 21:27:34.000000000 +0100
-+++ mapserver/mapserver.h	2011-03-11 22:42:06.000000000 +0100
-@@ -373,6 +373,8 @@
- #define MS_REFCNT_DECR_IS_NOT_ZERO(obj) (MS_REFCNT_DECR(obj))>0
- #define MS_REFCNT_DECR_IS_ZERO(obj) (MS_REFCNT_DECR(obj))<=0
- 
-+#define MS_IS_VALID_ARRAY_INDEX(index, size) ((index<0 || index>=size)?MS_FALSE:MS_TRUE)
-+
- #endif
- 
- /* General enumerated types - needed by scripts */
diff --git a/debian/php5-mapscript.examples b/debian/php5-mapscript.examples
index 8d0df31..e30f8d7 100644
--- a/debian/php5-mapscript.examples
+++ b/debian/php5-mapscript.examples
@@ -1 +1 @@
-mapscript/php3/examples/*
+mapscript/php/examples/*
diff --git a/debian/rules b/debian/rules
index cea6af8..2e49c52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,6 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-gd=/usr \
 		--with-freetype=/usr \
 		--with-fribidi-config \
-		--with-ming \
 		--with-zlib=/usr \
 		--with-png=/usr \
 		--with-xpm=/usr \
@@ -52,14 +51,15 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-geos \
 		--with-fastcgi \
 		--with-agg \
-		--with-experimental-png
+		--with-experimental-png \
+		--with-cairo
 
 rstoptions=--stylesheet=mapscript.css --link-stylesheet 
 
 MS_CFLAGS=-g -O2
 MS_CXXFLAGS=$(MS_CFLAGS)
 
-configure-stamp: 
+configure-stamp:
 	dh_testdir
 	./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
 
@@ -114,7 +114,7 @@ build-arch-stamp: configure-stamp
 
 build-php5-stamp: configure-php5-stamp
 	dh_testdir
-	-cd mapscript/php3 && \
+	-cd mapscript/php && \
 		$(MAKE) clean
 	# Build php_mapscript
 	$(MAKE)
@@ -147,7 +147,7 @@ clean-first-build:
 
 	# Remove some generated files 
 	-$(RM) Makefile mapscript/java/Makefile
-	-$(RM) mapscript/csharp/Makefile mapscript/php3/Makefile
+	-$(RM) mapscript/csharp/Makefile mapscript/php/Makefile
 	-$(RM) config.log config.status
 
 	-$(RM) debian/.#* .#*
@@ -212,7 +212,7 @@ install-php5-stamp: build-php5-stamp
 	-mkdir -p debian/tmp$(PHP5DIR)
 
 	# php5-mapscript
-	install -m644 mapscript/php3/php_mapscript.so \
+	install -m644 mapscript/php/php_mapscript.so \
 		debian/tmp$(PHP5DIR)
                       
 	echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars

-- 
Mapserver

More information about the Pkg-grass-devel mailing list