[mapserver] 01/03: Merge tag 'debian/7.0.2-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Thu Sep 29 17:28:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository mapserver.
commit 5c5001a2327c63dba4d2f68f43cabe73485bdb92
Merge: 4a1ca1e 0778053
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Sep 29 18:58:27 2016 +0200
Merge tag 'debian/7.0.2-1' into jessie-backports
Conflicts:
debian/changelog
CMakeLists.txt | 2 +-
HISTORY.TXT | 4 +-
debian/cgi-mapserver.lintian-overrides | 2 +
debian/changelog | 24 +
debian/control | 41 +-
debian/libmapscript-java.lintian-overrides | 2 -
debian/libmapserver2.symbols | 81 +-
debian/mapserver-bin.lintian-overrides | 2 +
debian/patches/didnt-typo.patch | 34 -
debian/patches/series | 1 -
debian/{php5-mapscript.docs => php-mapscript.docs} | 0
...5-mapscript.examples => php-mapscript.examples} | 0
debian/php-mapscript.install | 2 +
debian/php-mapscript.php | 1 +
...5-mapscript.postinst => php-mapscript.postinst} | 4 -
debian/php-mapscript.postrm | 7 +
debian/php-mapscript.prerm | 7 +
debian/php5-mapscript.install | 2 -
debian/php5-mapscript.prerm | 11 -
debian/rules | 13 +-
debian/watch | 2 +-
hittest.c | 11 +
kerneldensity.c | 1 +
mapcairo.c | 5 +-
mapchart.c | 7 +-
mapcluster.c | 57 +-
mapcopy.c | 15 +-
mapdraw.c | 60 +-
mapdrawgdal.c | 9 +
mapfile.c | 164 ++-
mapgraticule.c | 23 +-
maplabel.c | 9 +-
maplegend.c | 12 +-
maplibxml2.c | 7 +-
mapmssql2008.c | 111 +-
mapogcfilter.c | 103 +-
mapogcfilter.h | 1 +
mapogcfiltercommon.c | 29 +-
mapogcsld.c | 1 +
mapogcsos.c | 2 +-
mapogr.cpp | 1303 +++++++++++++++-----
mapogroutput.c | 35 +-
mapowscommon.c | 56 +-
mappostgis.c | 76 +-
mapprimitive.c | 12 +-
mapquery.c | 53 +-
mapraster.c | 36 +-
maprasterquery.c | 10 +-
mapscript/csharp/CMakeLists.txt | 8 +-
mapscript/csharp/Makefile.vc | 3 +-
mapscript/csharp/csmodule.i | 26 +-
mapscript/csharp/examples/drawmapGDIPlus.cs | 97 ++
mapscript/csharp/examples/drawmapWPF.cs | 109 ++
mapscript/csharp/swig_csharp_extensions.i | 50 +
mapscript/php/layer.c | 100 +-
mapscript/swiginc/class.i | 9 +-
mapscript/swiginc/color.i | 2 +-
mapserver.h | 2 +-
mapsymbol.c | 6 +
maputfgrid.cpp | 58 +-
mapwcs20.c | 21 +-
mapwfs.c | 7 +-
mapwfs11.c | 20 +-
mapwfs20.c | 6 +-
64 files changed, 2213 insertions(+), 761 deletions(-)
diff --cc debian/changelog
index f27ade7,758ffc0..93fa09d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,33 @@@
+ mapserver (7.0.2-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Sep 2016 14:13:34 +0200
+
+ mapserver (7.0.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Drop unused override for incompatible-java-bytecode-format.
+ * Drop didnt-typo.patch, applied upstream.
+ * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 21 Sep 2016 21:26:23 +0200
+
+ mapserver (7.0.1-3) unstable; urgency=medium
+
+ * Disable PHP mapscript, extension doesn't support PHP 7 yet.
+ * Update symbols for ppc64.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Mar 2016 20:16:37 +0100
+
+mapserver (7.0.1-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 Mar 2016 20:22:51 +0100
+
mapserver (7.0.1-2) unstable; urgency=medium
* Update symbols for alpha, hppa, sparc64 & x32.
diff --cc debian/control
index a0ee09f,af42295..8222b55
--- a/debian/control
+++ b/debian/control
@@@ -43,9 -44,9 +44,9 @@@ Build-Depends: debhelper (>= 9)
docbook-xml,
xsltproc
Build-Conflicts: libcurl3-openssl-dev
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapserver.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git -b jessie-backports
Homepage: http://www.mapserver.org
XS-Ruby-Versions: all
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git
More information about the Pkg-grass-devel
mailing list