This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit 7db4f1501afa766b4fb1290faf194bb29a482087
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Nov 29 20:54:19 2017 +0100
Drop scons-3.0.patch, fixed upstream.
---
debian/changelog | 1 +
debian/patches/scons-3.0.patch | 144 -----------------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 145 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e978d9..341809b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mapnik (3.0.17+ds-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop scons-3.0.patch, fixed upstream.
-- Bas Couwenberg <sebas...@debian.org> Wed, 29 Nov 2017 20:52:05 +0100
diff --git a/debian/patches/scons-3.0.patch b/debian/patches/scons-3.0.patch
deleted file mode 100644
index d27f1a5..0000000
--- a/debian/patches/scons-3.0.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Description: Add support for scons 3.0.0.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: https://github.com/mapnik/mapnik/pull/3774
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -145,15 +145,15 @@ def color_print(color,text,newline=True)
- # 4 - blue
- text = "\033[9%sm%s\033[0m" % (color,text)
- if not newline:
-- print text,
-+ print(text,)
- else:
-- print text
-+ print(text)
-
- def regular_print(color,text,newline=True):
- if not newline:
-- print text,
-+ print(text,)
- else:
-- print text
-+ print(text)
-
- def call(cmd, silent=False):
- stdin, stderr = Popen(cmd, shell=True, stdout=PIPE,
stderr=PIPE).communicate()
-@@ -509,7 +509,7 @@ elif HELP_REQUESTED:
- # https://github.com/mapnik/mapnik/issues/2112
- if not os.path.exists(SCONS_LOCAL_LOG) and not
os.path.exists(SCONS_CONFIGURE_CACHE) \
- and ('-c' in command_line_args or '--clean' in command_line_args):
-- print 'all good: nothing to clean, but you might want to run "make
distclean"'
-+ print('all good: nothing to clean, but you might want to run "make
distclean"')
- Exit(0)
-
- # initially populate environment with defaults and any possible custom
arguments
-@@ -534,7 +534,7 @@ if not force_configure:
- # rebuilds, e.g. for folks following trunk
- for opt in pickle_store:
- if not opt in env:
-- #print 'missing opt', opt
-+ #print('missing opt', opt)
- preconfigured = False
-
- # if custom arguments are supplied make sure to accept them
-@@ -622,7 +622,7 @@ def parse_config(context, config, checks
- parsed = True
- except OSError, e:
- ret = False
-- print ' (xml2-config not found!)'
-+ print(' (xml2-config not found!)')
- if not parsed:
- if config in ('GDAL_CONFIG'):
- # optional deps...
-@@ -658,7 +658,7 @@ def get_pkg_lib(context, config, lib):
- libname = 'gdal'
- except Exception, e:
- ret = False
-- print ' unable to determine library name:'# %s' % str(e)
-+ print(' unable to determine library name:\'# %s' % str(e))
- return None
- context.Result( libname )
- return libname
-@@ -1235,7 +1235,7 @@ if not preconfigured:
- opts.files.append(conf)
- color_print(4,"SCons CONFIG found: '%s', variables will
be inherited..." % conf)
- optfile = file(conf)
-- #print optfile.read().replace("\n", "
").replace("'","").replace(" = ","=")
-+ #print(optfile.read().replace("\n", "
").replace("'","").replace(" = ","="))
- optfile.close()
-
- elif not conf == SCONS_LOCAL_CONFIG:
-@@ -1785,7 +1785,7 @@ if not preconfigured:
- env['HAS_CAIRO'] = False
- env['SKIPPED_DEPS'].append('cairo')
- else:
-- print 'Checking for cairo lib and include paths... ',
-+ print('Checking for cairo lib and include paths... ',)
- cmd = 'pkg-config --libs --cflags cairo'
- if env['RUNTIME_LINK'] == 'static':
- cmd += ' --static'
-@@ -1802,7 +1802,7 @@ if not preconfigured:
- if not inc in env['CPPPATH']:
- env["CAIRO_CPPPATHS"].append(inc)
- env['HAS_CAIRO'] = True
-- print 'yes'
-+ print('yes')
- except OSError,e:
- color_print(1,'no')
- env['SKIPPED_DEPS'].append('cairo')
---- a/src/build.py
-+++ b/src/build.py
-@@ -35,7 +35,7 @@ def call(cmd, silent=True):
- if not stderr:
- return stdin.strip()
- elif not silent:
-- print stderr
-+ print(stderr)
-
- def ldconfig(*args,**kwargs):
- call('ldconfig')
---- a/plugins/input/csv/build.py
-+++ b/plugins/input/csv/build.py
-@@ -29,7 +29,7 @@ if env.get('BOOST_LIB_VERSION_FROM_HEADE
- can_build = True
-
- if not can_build:
-- print 'WARNING: skipping building the optional CSV datasource plugin
which requires boost >= 1.56'
-+ print('WARNING: skipping building the optional CSV datasource plugin
which requires boost >= 1.56')
- else:
- Import ('plugin_base')
-
---- a/plugins/input/geojson/build.py
-+++ b/plugins/input/geojson/build.py
-@@ -29,7 +29,7 @@ if env.get('BOOST_LIB_VERSION_FROM_HEADE
- can_build = True
-
- if not can_build:
-- print 'WARNING: skipping building the optional geojson datasource plugin
which requires boost >= 1.56'
-+ print('WARNING: skipping building the optional geojson datasource plugin
which requires boost >= 1.56')
- else:
-
- Import ('plugin_base')
---- a/plugins/input/topojson/build.py
-+++ b/plugins/input/topojson/build.py
-@@ -29,7 +29,7 @@ if env.get('BOOST_LIB_VERSION_FROM_HEADE
- can_build = True
-
- if not can_build:
-- print 'WARNING: skipping building the optional topojson datasource plugin
which requires boost >= 1.56'
-+ print('WARNING: skipping building the optional topojson datasource plugin
which requires boost >= 1.56')
- else:
- Import ('plugin_base')
-
---- a/utils/mapnik-config/build.py
-+++ b/utils/mapnik-config/build.py
-@@ -43,7 +43,7 @@ def GetMapnikLibVersion():
- return version_string
-
- if (GetMapnikLibVersion() != config_env['MAPNIK_VERSION_STRING']):
-- print 'Error: version.hpp mismatch (%s) to cached value (%s): please
reconfigure mapnik' %
(GetMapnikLibVersion(),config_env['MAPNIK_VERSION_STRING'])
-+ print('Error: version.hpp mismatch (%s) to cached value (%s): please
reconfigure mapnik' %
(GetMapnikLibVersion(),config_env['MAPNIK_VERSION_STRING']))
- Exit(1)
-
- config_variables = '''#!/usr/bin/env bash
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e1e916a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-scons-3.0.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mapnik.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
