[mapserver] 01/02: Merge tag 'debian/7.0.1-2' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Mar 7 19:49:18 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 bfbf4c12f2ce6fb4a4b93ff06f914a59d72f9c0b
Merge: 8c182db e9fc6a3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Mar 7 20:22:43 2016 +0100
Merge tag 'debian/7.0.1-2' into jessie-backports
Conflicts:
debian/changelog
debian/control
.gitmodules | 0
.travis.yml | 87 -
CMakeLists.txt | 124 +-
COMMITERS | 29 -
Makefile | 15 +-
astyle.sh | 10 -
debian/changelog | 91 +
debian/control | 10 +-
debian/libmapscript-java.lintian-overrides | 2 +-
debian/libmapserver2.postinst | 10 -
debian/libmapserver2.postrm | 10 -
debian/libmapserver2.symbols | 125 +-
debian/man/tile4ms.1.xml | 2 +-
debian/mapserver-doc.docs | 1 -
debian/patches/cmake-mapserver-export.patch | 377 --
debian/patches/didnt-typo.patch | 34 +
debian/patches/ruby-shebang.patch | 11 -
debian/patches/series | 3 +-
debian/rules | 5 +-
debian/watch | 5 +-
genhtml.patch | 43 -
github_issue_no_activity_closer.py | 123 -
install-msautotest.sh | 14 -
mapagg.cpp | 3 +
mapaxisorder.csv | 1788 ------
mapaxisorder.h | 8206 +++++++++++++--------------
mapaxisorder.sh | 110 -
mapcontour.c | 135 +-
mapdraw.c | 91 +-
mapdrawgdal.c | 42 +-
mapfile.c | 33 +-
mapfile.h | 6 +-
mapgeomtransform.c | 39 +-
mapimageio.c | 13 +-
mapjoin.c | 1 +
maplabel.c | 13 +-
maplayer.c | 13 +-
maplegend.c | 4 +-
maplexer.c | 4007 ++++++-------
maplexer.l | 1 +
mapogcfilter.c | 1 +
mapogcsld.c | 239 +-
mapogr.cpp | 32 +-
mapogroutput.c | 72 +-
maporaclespatial.c | 12 +-
mappostgis.c | 5 +-
mapprimitive.c | 6 +-
mapproject.c | 6 +-
maprasterquery.c | 40 +-
maprendering.c | 1 -
mapresample.c | 95 +-
mapscript/csharp/examples/drawquery.cs | 2 +-
mapscript/java/javamodule.i | 8 +-
mapscript/mserror.i | 2 +-
mapscript/php/map.c | 2 +-
mapscript/php/nmake.opt | 35 -
mapscript/php/php_mapscript.c | 13 +-
mapscript/python/setup.py | 13 +
mapscript/ruby/rbmodule.i | 12 +-
mapserver-config-version.cmake.in | 11 +
mapserver-config.cmake.in | 18 +
mapshape.c | 1 +
mapstring.c | 10 +-
maptemplate.c | 7 +-
mapthread.c | 2 +-
maptime.c | 4 +
maputil.c | 10 +-
mapuvraster.c | 30 +-
mapv8.cpp | 2 +
mapwcs20.c | 30 +-
mapwfs.c | 2 +
mapwms.c | 15 +-
mapwmslayer.c | 2 +-
nmake.opt | 856 ---
print-test-results.sh | 65 -
release-notes.sh | 11 -
run-test-suite.sh | 22 -
run_code_coverage_upload.sh | 37 -
scalebar.c | 1 +
stablemerge.sh | 29 -
xmlmapfile/mapfile.xsd | 4 +-
81 files changed, 7189 insertions(+), 10212 deletions(-)
diff --cc debian/changelog
index cb49cb7,2ccaf7b..e1b4b09
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,94 +1,100 @@@
+ mapserver (7.0.1-2) unstable; urgency=medium
+
+ * Update symbols for alpha, hppa, sparc64 & x32.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Feb 2016 23:08:15 +0100
+
+ mapserver (7.0.1-1) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Feb 2016 10:22:20 +0100
+
+ mapserver (7.0.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update lintian override for OpenJDK 8 as default JDK.
+ * Bump Standards-Version to 3.9.7, no changes.
+ * Update watch file to use download.osgeo.org.
+ GitHub releases include msautotest which contains non-free CITE tests.
+ * Drop patches applied upstream.
+ * Don't install documentation no longer included upstream.
+ * Update symbols for amd64.
+ * Add dependency on php5-common to php5-mapscript for php5enmod.
+ * Fix 'associated' typo in manpage.
+ * Add patch for "didn't" typo.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 25 Feb 2016 21:59:11 +0100
+
+ mapserver (7.0.0-9) unstable; urgency=medium
+
+ * Update Vcs-Git URL to use HTTPS.
+ * Add patch by Michael Tautschnig to fix type inconsistencies.
+ (closes: #812685)
+ * Add patch to fix 'should' typo.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 26 Jan 2016 09:38:54 +0100
+
+ mapserver (7.0.0-8) unstable; urgency=medium
+
+ * Don't fail the build when the examples are not installed.
+ (closes: #806074)
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 24 Nov 2015 22:22:21 +0100
+
+ mapserver (7.0.0-7) unstable; urgency=medium
+
+ * Add patch to fix build with newer SWIG versions.
+ * Rebuild for ruby2.2 transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 16 Nov 2015 23:25:23 +0100
+
+ mapserver (7.0.0-6) unstable; urgency=medium
+
+ * Add upstream patch for giflib 5.1 support.
+ (closes: #803299)
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 28 Oct 2015 22:35:39 +0100
+
+ mapserver (7.0.0-5) unstable; urgency=medium
+
+ * Add patch to add ARCHIVE install target for Windows builds.
+ * Add patch to install mapserver target only once.
+ * Add patch to not export the mapserver target for static builds.
+ * Disable experimental pixman support.
+ (closes: #801573)
+ * Drop libmapserver2 post{inst,rm}, rely on dpkg-triggers for ldconfig.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 12 Oct 2015 17:42:33 +0200
+
+ mapserver (7.0.0-4) unstable; urgency=medium
+
+ * Update symbols for ppc64.
+ * Rebuild for geos transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 29 Aug 2015 14:20:22 +0200
+
+ mapserver (7.0.0-3) unstable; urgency=medium
+
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 26 Aug 2015 02:35:54 +0200
+
+ mapserver (7.0.0-2) unstable; urgency=medium
+
+ * Update Vcs-Browser URL to use HTTPS.
+ * Update symbols for amd64.
+ * Rebuild for gdal transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 25 Aug 2015 14:33:32 +0200
+
+mapserver (7.0.0-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 31 Jul 2015 20:18:45 +0200
+
mapserver (7.0.0-1) unstable; urgency=medium
* Move from experimental to unstable.
diff --cc debian/control
index f361879,f1aa440..a0ee09f
--- a/debian/control
+++ b/debian/control
@@@ -44,9 -43,9 +43,9 @@@ Build-Depends: debhelper (>= 9)
docbook-xml,
xsltproc
Build-Conflicts: libcurl3-openssl-dev
- Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mapserver.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git -b jessie-backports
+ Standards-Version: 3.9.7
+ 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