The following commit has been merged in the master branch:
commit 6c2de62f3d187b2e79c1578bade765ea458298c4
Author: Alan Boudreault
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 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
Uploaders: Francesco Paolo Lovergine , Alan Boudreault
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..000
--- 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.0 +0100
-+++ mapserver/mapdraw.c2011-03-11 22:42:06.0 +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.0 +0100
-+++ mapserver/mapfile.c2011-03-11 22:42:06.0 +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; jnumclasses; j++) {
-- for(k=0; kclass[j]->numstyles; k++) {
-+for(k=0; kclass[j]->numstyles; k++) {
- if(GET_LAYER(map, i)->class[j]->styles[k]->symbolname &&
GET_
