[SCM] mapserver branch, jessie, updated. upstream/6.4.0_rc1-143-g81837e3
The following commit has been merged in the jessie branch:
commit 773030e3bfd439858b72500d5a0fcf1774fe9f6a
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Sep 18 23:30:30 2013 +0200
Restructure control file.
diff --git a/debian/control b/debian/control
index 396fd6b..6ac0cdd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,55 +1,94 @@
Source: mapserver
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: Francesco Paolo Lovergine fran...@debian.org,
+ Alan Boudreault aboudrea...@mapgears.com,
+ Bas Couwenberg sebas...@xs4all.nl
Section: devel
Priority: optional
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault
aboudrea...@mapgears.com, Bas Couwenberg sebas...@xs4all.nl
-Standards-Version: 3.9.4
-Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1),
- libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (= 1.1.4),
- libgd-dev (= 2.1.0~rc1-2), libfreetype6-dev (= 2.0.9),
- libgdal1-dev (= 1.9.0), libproj-dev, libgeos-dev (= 3.3.1-1~),
- libfribidi-dev, libcairo2-dev,
- libgif-dev, librsvg2-dev,
- libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (=
2.6.6-3~),
- ruby1.9.1, ruby1.9.1-dev,
- sharutils, libsdl1.2-dev,
- libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev,
libreadline-dev,
- libedit-dev, libepsilon-dev,
- chrpath, cmake (= 2.8.0), pkg-config, pkg-kde-tools,
- docbook2x, docbook-xsl, docbook-xml, xsltproc
+Build-Depends: debhelper (= 9),
+ dpkg-dev (= 1.16.1.1),
+ libcurl4-gnutls-dev,
+ libpng-dev,
+ libjpeg-dev,
+ zlib1g-dev (= 1.1.4),
+ libgd-dev (= 2.1.0~rc1-2),
+ libfreetype6-dev (= 2.0.9),
+ libgdal1-dev (= 1.9.0),
+ libproj-dev,
+ libgeos-dev (= 3.3.1-1~),
+ libfribidi-dev,
+ libcairo2-dev,
+ libgif-dev,
+ librsvg2-dev,
+ libpq-dev,
+ php5-dev,
+ swig,
+ python-all (= 2.6.6-3~),
+ python-all-dev (= 2.6.6-3~),
+ ruby1.9.1,
+ ruby1.9.1-dev,
+ sharutils,
+ libsdl1.2-dev,
+ libfcgi-dev,
+ libxml2-dev,
+ libogdi3.2-dev,
+ libxslt1-dev,
+ libpam0g-dev,
+ libreadline-dev,
+ libedit-dev,
+ libepsilon-dev,
+ pkg-kde-tools,
+ chrpath,
+ cmake (= 2.8.0),
+ pkg-config,
+ docbook2x,
+ docbook-xsl,
+ docbook-xml,
+ xsltproc
Build-Conflicts: libcurl3-openssl-dev
XS-Ruby-Versions: ruby1.9.1
-Homepage: http://www.mapserver.org
+Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
+Homepage: http://www.mapserver.org
Package: libmapserver
-Depends: libmapserver1, ${misc:Depends}
Architecture: all
Section: oldlibs
+Depends: libmapserver1,
+ ${misc:Depends}
Description: Dummy package for libmapserver to libmapserver1 transition
This is a transitional dummy package to ease upgrades from the
libmapserver package to the libmapserver1 package.
It can safely be removed.
Package: libmapserver-6.2.1
-Depends: libmapserver1, ${misc:Depends}
Architecture: all
Section: oldlibs
+Depends: libmapserver1,
+ ${misc:Depends}
Description: Dummy package for libmapserver-6.2.1 to libmapserver1 transition
This is a transitional dummy package to ease upgrades from the
libmapserver-6.2.1 package to the libmapserver1 package.
It can safely be removed.
Package: libmapserver1
-Replaces: libmapserver ( 6.2.1-3~), libmapserver-6.2.1
-Breaks: libmapserver ( 6.2.1-3~), libmapserver-6.2.1
-Section: libs
Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: cgi-mapserver,
+ mapserver-bin,
+ mapserver-doc,
+ libmapscript-perl,
+ php5-mapscript,
+ python-mapscript,
+ ruby-mapscript
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
- libmapscript-perl, php5-mapscript, python-mapscript, ruby-mapscript
+Breaks: libmapserver ( 6.2.1-3~),
+libmapserver-6.2.1
+Replaces: libmapserver ( 6.2.1-3~),
+ libmapserver-6.2.1
Description: Shared library for MapServer
This package contains the shared library.
.
@@ -59,31 +98,41 @@ Description: Shared library for MapServer
library packages.
Package: libmapserver-dev
-Depends: libmapserver1-dev, ${misc:Depends}
Architecture: all
Section: oldlibs
+Depends: libmapserver1-dev,
+ ${misc:Depends}
Description:
[SCM] mapserver branch, jessie, updated. upstream/6.4.0_rc1-143-g81837e3
The following commit has been merged in the jessie branch: commit 81837e3354ad594089588a3d20243d849352d7e9 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 18 23:30:50 2013 +0200 Use license shortnames without spaces. diff --git a/debian/copyright b/debian/copyright index bbbfc0a..de61496 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: MapServer Upstream-Contact: The MapServer team Source: http://mapserver.org Copyright: 1996-2007 Regents of the University of Minnesota. -License: MIT/X11 (BSD like) +License: MIT/X11 Files: * Copyright: 1996-2007 Regents of the University of Minnesota. -License: MIT/X11 (BSD like) +License: MIT/X11 Files: cgiutil.c cgiutil.h @@ -87,12 +87,12 @@ Files: cgiutil.c mapscript/mapscript.i mapscript/php/php_regex.c Copyright: 1996-2005, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapcrypto.c msencrypt.c Copyright: 1996-2006, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: configure.in mapagg.cpp @@ -108,7 +108,7 @@ Files: configure.in mapscript/swiginc/referencemap.i mapscript/swiginc/scalebar.i Copyright: 1996-2007, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapoglcontext.cpp mapoglcontext.h @@ -132,7 +132,7 @@ Files: mapoglcontext.cpp mapscript/csharp/examples/shapeinfo.cs mapscript/csharp/examples/shpdump.cs Copyright: 1996-2008, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapcairo.c mapgd.c @@ -140,54 +140,54 @@ Files: mapcairo.c mapkmlrenderer.cpp mapkmlrenderer.h Copyright: 1996-2009, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapraster.c Copyright: 1996-2010, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapgeomutil.cpp maprendering.c Copyright: 1996-2011, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapbits.c Copyright: 1996-2005, Regents of the University of Minnesota -License: MIT/X11 (BSD like) +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 Copyright: 2011, Alan Boudreault, MapGears -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapscript/php/php_mapscript_util.h Copyright: 2000, 2001, Daniel Morissette, DM Solutions Group Inc. -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapscript/php/mapscript_i.c Copyright: 2000, 2007, Daniel Morissette, DM Solutions Group Inc. -License: MIT/X11 (BSD like) +License: MIT/X11 Files: maphttp.c Copyright: 2001-2003, Daniel Morissette, DM Solutions Group Inc -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapwmslayer.c Copyright: 2001-2004, Daniel Morissette, DM Solutions Group Inc -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapwfs.c mapwfslayer.c Copyright: 2002, Daniel Morissette, DM Solutions Group Inc -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapogr.cpp mapscript/php/php_mapscript.c mapscript/php/php_mapscript.h mapscript/php/php_mapscript_util.h Copyright: 2000-2005, Daniel Morissette, DM Solutions Group Inc -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapscript/php/class.c mapscript/php/cluster.c @@ -220,65 +220,65 @@ Files: mapscript/php/class.c mapscript/php/symbol.c mapscript/php/web.c Copyright: 2000-2010, Daniel Morissette, DM Solutions Group Inc. -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapscript/php/php_mapscript_util.c Copyright: 2000-2005, DM Solutions Group -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapwcs20.c Copyright: 2010-2011, EOX IT Services GmbH, Austria -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapresample.h Copyright: 2001, Frank Warmerdam, DM Solutions Group Inc -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapgdal.c mapoutput.c Copyright: 2002, Frank Warmerdam -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapobject.c Copyright: 2004, Frank Warmerdam -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapio.c mapio.h mapscript/swiginc/msio.i Copyright: 2004, Frank Warmerdam warmer...@pobox.com -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapwcs11.c Copyright: 2007, Frank Warmerdam -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapogroutput.c Copyright: 2010, Frank Warmerdam warmer...@pobox.com -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapmssql2008.c Copyright: 2007, IS Consulting (www.mapdotnet.com) -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapgraticule.c Copyright: 2003, John Novak, Novacell Technologies -License: MIT/X11 (BSD like) +License: MIT/X11 Files: mapcontext.c Copyright:
