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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 0918448e8534b2bfe8437efd440518bb28a97201
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 2 22:46:37 2014 +0100

    Update copyright file.

diff --git a/debian/changelog b/debian/changelog
index 76b53d8..fc32350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mapserver (6.4.1-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.5, no changes required.
   * Add lintian override for debian-watch-may-check-gpg-signature,
     upstream doesn't provide signatures for verification.
+  * Update copyright file.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 02 Jan 2014 16:08:30 +0100
 
diff --git a/debian/copyright b/debian/copyright
index de61496..9510416 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -58,6 +58,7 @@ Files: cgiutil.c
  mapservutil.c
  mapshape.c
  mapshape.h
+ mapsmoothing.c
  mapsymbol.c
  mapsymbol.h
  maptemplate.h
@@ -151,13 +152,23 @@ Files: mapgeomutil.cpp
 Copyright: 1996-2011, Regents of the University of Minnesota
 License: MIT/X11
 
+Files: hittest.c
+ hittest.h
+Copyright: 1996-2013, Regents of the University of Minnesota
+License: MIT/X11
+
 Files: mapbits.c
 Copyright: 1996-2005, Regents of the University of Minnesota
 License: MIT/X11
 Comment: Derived from code placed in the public domain by Bob Stout, for more
  information see http://c.snippets.org/snip_lister.php?fname=bitarray.c.
 
-Files: mapuvraster.c
+Files: mapraster.h
+Copyright: 2013, Regents of the University of Minnesota
+License: MIT/X11
+
+Files: mapcontour.c
+ mapuvraster.c
 Copyright: 2011, Alan Boudreault, MapGears
 License: MIT/X11
 
@@ -399,7 +410,7 @@ License: GPL-2+ with Libtool exception
 Files: mapparser.c
  mapparser.h
 Copyright: 1984, 1989-1990, 2000-2006, Free Software Foundation, Inc.
-License: GPL-2+ with Bison exception
+License: GPL-3+ with Bison exception
 
 Files: opengl/glext.h
 Copyright: 1991-2004, Silicon Graphics, Inc
@@ -794,39 +805,6 @@ License: BSL-1.0
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: GPL-2+ with Bison exception
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
- .
- As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton.  Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- .
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
 License: GPL-2+ with Libtool exception
  GNU Libtool is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -853,6 +831,37 @@ License: GPL-2+ with Libtool exception
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-3+ with Bison exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton.  Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+ .
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
 License: SGI-B-1.1
  License Applicability. Except to the extent portions of this file are
  made subject to an alternative license as permitted in the SGI Free

-- 
Packaging for MapServer