[Git][debian-gis-team/mapnik][master] 9 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg
gitlab at salsa.debian.org
Mon Jan 11 05:14:41 GMT 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / mapnik
Commits:
f3ee1fa9 by Bas Couwenberg at 2021-01-08T14:51:17+01:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
4bbc5e5e by Bas Couwenberg at 2021-01-08T14:52:49+01:00
New upstream version 3.1.0+ds
- - - - -
3301302c by Bas Couwenberg at 2021-01-08T14:52:57+01:00
Update upstream source from tag 'upstream/3.1.0+ds'
Update to upstream version '3.1.0+ds'
with Debian dir c1ecd6e930c7bd12ada32649de3dca7206676211
- - - - -
6aa3fa3b by Bas Couwenberg at 2021-01-08T14:53:28+01:00
New upstream release.
- - - - -
76db7d43 by Bas Couwenberg at 2021-01-08T15:24:25+01:00
Rename library package for new minor version.
- - - - -
35cb28bf by Bas Couwenberg at 2021-01-08T15:24:25+01:00
Drop explicit architecture list, see: #893188.
- - - - -
6c0d08ee by Bas Couwenberg at 2021-01-08T15:24:25+01:00
Set distribution to experimental.
- - - - -
47eafaec by Bas Couwenberg at 2021-01-11T05:32:50+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit f3ee1fa963c52c7645dbd201e82624b464954680.
- - - - -
c6b0be1a by Bas Couwenberg at 2021-01-11T05:33:52+01:00
Move from experimental to unstable.
- - - - -
9 changed files:
- CHANGELOG.md
- SConstruct
- debian/changelog
- debian/control
- debian/libmapnik3.0.install → debian/libmapnik3.1.install
- debian/libmapnik3.0.lintian-overrides → debian/libmapnik3.1.lintian-overrides
- debian/rules
- include/mapnik/version.hpp
- scripts/publish_release.sh
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -6,6 +6,14 @@ Developers: Please commit along with changes.
For a complete change history, see the git log.
+## 3.1.0
+
+Released: January 8, 2021
+
+(Packaged from 445438e34)
+
+* Require c++14 compliant complier (Boost.Geometry `BOOST_VERSION >= 1_75`)
+
## 3.0.24
Released: January 5, 2021
=====================================
SConstruct
=====================================
@@ -42,7 +42,7 @@ ICU_LIBS_DEFAULT='/usr/'
DEFAULT_CC = "cc"
DEFAULT_CXX = "c++"
-DEFAULT_CXX11_CXXFLAGS = " -std=c++11 -DU_USING_ICU_NAMESPACE=0"
+DEFAULT_CXX11_CXXFLAGS = " -std=c++14 -DU_USING_ICU_NAMESPACE=0"
DEFAULT_CXX11_LINKFLAGS = ""
if sys.platform == 'darwin':
# homebrew default
@@ -62,7 +62,7 @@ SCONS_CONFIGURE_CACHE = 'config.cache'
SCONF_TEMP_DIR = '.sconf_temp'
# auto-search directories for boost libs/headers
BOOST_SEARCH_PREFIXES = ['/usr/local','/opt/local','/sw','/usr',]
-BOOST_MIN_VERSION = '1.47'
+BOOST_MIN_VERSION = '1.61'
#CAIRO_MIN_VERSION = '1.8.0'
HARFBUZZ_MIN_VERSION = (0, 9, 34)
@@ -1168,12 +1168,12 @@ int main()
return True
return False
-def supports_cxx11(context,silent=False):
+def supports_cxx14(context,silent=False):
ret = context.TryRun("""
int main()
{
-#if __cplusplus >= 201103
+#if __cplusplus >= 201402L
return 0;
#else
return -1;
@@ -1182,7 +1182,7 @@ int main()
""", '.cpp')
if not silent:
- context.Message('Checking if compiler (%s) supports -std=c++11 flag... ' % context.env.get('CXX','CXX'))
+ context.Message('Checking if compiler (%s) supports -std=c++14 flag... ' % context.env.get('CXX','CXX'))
if silent:
context.did_show_result=1
context.Result(ret[0])
@@ -1214,7 +1214,7 @@ conf_tests = { 'prioritize_paths' : prioritize_paths,
'harfbuzz_with_freetype_support': harfbuzz_with_freetype_support,
'boost_regex_has_icu' : boost_regex_has_icu,
'sqlite_has_rtree' : sqlite_has_rtree,
- 'supports_cxx11' : supports_cxx11,
+ 'supports_cxx14' : supports_cxx14,
'CheckBoostScopedEnum' : CheckBoostScopedEnum,
}
@@ -1504,9 +1504,9 @@ if not preconfigured:
if env['PRIORITIZE_LINKING']:
conf.prioritize_paths(silent=True)
- # test for C++11 support, which is required
- if not env['HOST'] and not conf.supports_cxx11():
- color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler")
+ # test for C++14 support, which is required
+ if not env['HOST'] and not conf.supports_cxx14():
+ color_print(1,"C++ compiler does not support C++14 standard (-std=c++14), which is required. Please upgrade your compiler")
Exit(1)
if not env['HOST']:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+mapnik (3.1.0+ds-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 11 Jan 2021 05:33:41 +0100
+
+mapnik (3.1.0+ds-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Rename library package for new minor version.
+ * Drop explicit architecture list, see: #893188.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 08 Jan 2021 14:57:36 +0100
+
mapnik (3.0.24+ds-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -36,8 +36,8 @@ Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapnik
Vcs-Git: https://salsa.debian.org/debian-gis-team/mapnik.git
Homepage: http://www.mapnik.org/
-Package: libmapnik3.0
-Architecture: any-amd64 i386 arm64 armel armhf powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Package: libmapnik3.1
+Architecture: any
Depends: fonts-dejavu,
${shlibs:Depends},
${misc:Depends}
@@ -55,9 +55,9 @@ Description: C++ toolkit for developing GIS applications (libraries)
This package contains the shared library and input plugins.
Package: libmapnik-dev
-Architecture: any-amd64 i386 arm64 armel armhf powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: any
Section: libdevel
-Depends: libmapnik3.0 (= ${binary:Version}),
+Depends: libmapnik3.1 (= ${binary:Version}),
libboost-filesystem-dev,
libboost-program-options-dev,
libboost-regex-dev,
@@ -99,7 +99,7 @@ Description: C++ toolkit for developing GIS applications (devel)
build utilities.
Package: mapnik-utils
-Architecture: any-amd64 i386 arm64 armel armhf powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32
+Architecture: any
Section: utils
Depends: ${shlibs:Depends},
${misc:Depends}
=====================================
debian/libmapnik3.0.install → debian/libmapnik3.1.install
=====================================
=====================================
debian/libmapnik3.0.lintian-overrides → debian/libmapnik3.1.lintian-overrides
=====================================
=====================================
debian/rules
=====================================
@@ -44,7 +44,7 @@ SCONS_FLAGS += SYSTEM_FONTS=/usr/share/fonts
SCONS_FLAGS += XMLPARSER=libxml2
SCONS_FLAGS += DEMO=False
SCONS_FLAGS += CPP_TESTS=False
-SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/3.0
+SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/3.1
SCONS_FLAGS += CUSTOM_CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0"
SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0"
SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0"
=====================================
include/mapnik/version.hpp
=====================================
@@ -26,8 +26,8 @@
#include <mapnik/stringify_macro.hpp>
#define MAPNIK_MAJOR_VERSION 3
-#define MAPNIK_MINOR_VERSION 0
-#define MAPNIK_PATCH_VERSION 24
+#define MAPNIK_MINOR_VERSION 1
+#define MAPNIK_PATCH_VERSION 0
#define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION)
=====================================
scripts/publish_release.sh
=====================================
@@ -111,8 +111,9 @@ step "release notes: $RELEASE_NOTES"
# create draft release
curl --data "{\"tag_name\": \"${MAPNIK_VERSION}\",\"target_commitish\": \"master\",\"name\": \"${MAPNIK_VERSION}\",\"body\": \"${RELEASE_NOTES}\",\"draft\": ${IS_DRAFT},\"prerelease\": ${IS_PRERELEASE}}" \
-https://api.github.com/repos/mapnik/mapnik/releases?access_token=${GITHUB_TOKEN_MAPNIK_PUBLIC_REPO} \
-> create_response.json
+ -H "Authorization: token ${GITHUB_TOKEN_MAPNIK_PUBLIC_REPO}" \
+ https://api.github.com/repos/mapnik/mapnik/releases \
+ > create_response.json
cat create_response.json
# parse out upload url and form it up to post tarball
UPLOAD_URL=$(python -c "import json;print json.load(open('create_response.json'))['upload_url'].replace('{?name,label}','?name=${TARBALL_COMPRESSED}')")
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/5c254751ea4b1005ee6832580c158be0465cb573...c6b0be1a63ecc91821c559093e46689580fd4ccf
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/5c254751ea4b1005ee6832580c158be0465cb573...c6b0be1a63ecc91821c559093e46689580fd4ccf
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210111/c2100108/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list