This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-mapnik.
commit ccde47476d5d90697480a263e653cf670a33bc9b Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Aug 25 22:31:01 2015 +0200 Drop patches applied upstream. --- debian/changelog | 1 + debian/patches/link-boost.patch | 4 +- debian/patches/python3-print.patch | 18 ------ debian/patches/python3-setup.patch | 114 ------------------------------------- debian/patches/series | 2 - 5 files changed, 3 insertions(+), 136 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b7a3bd..641a75f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-mapnik (1:0.0~20150817-da1d9dd-1) UNRELEASED; urgency=medium * New upstream Git snapshot. + * Drop patches applied upstream. -- Bas Couwenberg <sebas...@debian.org> Tue, 25 Aug 2015 22:25:45 +0200 diff --git a/debian/patches/link-boost.patch b/debian/patches/link-boost.patch index 1fa160e..7671c73 100644 --- a/debian/patches/link-boost.patch +++ b/debian/patches/link-boost.patch @@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebas...@debian.org> --- a/setup.py +++ b/setup.py -@@ -30,9 +30,9 @@ else: +@@ -48,9 +48,9 @@ else: mapnik_config = 'mapnik-config' mason_build = False @@ -15,4 +15,4 @@ Author: Bas Couwenberg <sebas...@debian.org> +boost_thread_lib = os.environ.get("BOOST_THREAD_LIB", 'boost_thread') try: - linkflags = subprocess.check_output([mapnik_config, '--libs']).rstrip('\n').split(' ') + linkflags = check_output([mapnik_config, '--libs']).split(' ') diff --git a/debian/patches/python3-print.patch b/debian/patches/python3-print.patch deleted file mode 100644 index edbc675..0000000 --- a/debian/patches/python3-print.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Add missing parentheses in call to 'print'. - With Python 3 the missing parentheses are a SyntaxError. -Author: Bas Couwenberg <sebas...@debian.org> -Bug: https://github.com/mapnik/python-mapnik/issues/36 -Forwarded: https://github.com/mapnik/python-mapnik/issues/40 -Applied-Upstream: https://github.com/mapnik/python-mapnik/commit/c96e2fe120f971e95ea2f62d3320c99aeb5253b3 - ---- a/mapnik/printing.py -+++ b/mapnik/printing.py -@@ -942,7 +942,7 @@ class PDFPrinter: - try: - sym.avoid_edges=False - except: -- print "**** Cant set avoid edges for rule", r.name -+ print("**** Cant set avoid edges for rule", r.name) - if r.min_scale <= m.scale_denominator() and m.scale_denominator() < r.max_scale: - lerule = r - lerule.min_scale = 0 diff --git a/debian/patches/python3-setup.patch b/debian/patches/python3-setup.patch deleted file mode 100644 index d3964ac..0000000 --- a/debian/patches/python3-setup.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 9f4b6e02e88a97f217d9fa12c5cc217d47f5f415 Mon Sep 17 00:00:00 2001 -From: Yohan Boniface <y...@enix.org> -Date: Thu, 16 Jul 2015 23:20:59 +0200 -Subject: [PATCH] python2/3 compliant setup.py - ---- - setup.py | 36 ++++++++++++++++++++++++------------ - 1 file changed, 24 insertions(+), 12 deletions(-) - ---- a/setup.py -+++ b/setup.py -@@ -8,6 +8,18 @@ import sys - import shutil - import re - -+P3 = sys.version_info[0] == 3 -+ -+ -+# Utils -+def check_output(args): -+ output = subprocess.check_output(args) -+ if P3: -+ # check_output returns bytes in P3. -+ output = output.decode() -+ return output.rstrip('\n') -+ -+ - cflags = sysconfig.get_config_var('CFLAGS') - sysconfig._config_vars['CFLAGS'] = re.sub(' +', ' ', cflags.replace('-g', '').replace('-Os', '').replace('-arch i386', '')) - opt = sysconfig.get_config_var('OPT') -@@ -35,13 +47,13 @@ boost_system_lib = os.environ.get("BOOST - boost_thread_lib = os.environ.get("BOOST_THREAD_LIB", 'boost_thread') - - try: -- linkflags = subprocess.check_output([mapnik_config, '--libs']).rstrip('\n').split(' ') -+ linkflags = check_output([mapnik_config, '--libs']).split(' ') - lib_path = linkflags[0][2:] -- linkflags.extend(subprocess.check_output([mapnik_config, '--ldflags']).rstrip('\n').split(' ')) -+ linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' ')) - except: -- raise Exception("Failed to find proper linking flags from mapnik config"); -+ raise Exception("Failed to find proper linking flags from mapnik config") - --## Dynamically make the mapnik/paths.py file if it doesn't exist. -+# Dynamically make the mapnik/paths.py file if it doesn't exist. - if os.path.isfile('mapnik/paths.py'): - create_paths = False - else: -@@ -60,7 +72,7 @@ if mason_build: - shutil.copyfile(f, os.path.join('mapnik', base_f)) - except shutil.Error: - pass -- input_plugin_path = subprocess.check_output([mapnik_config, '--input-plugins']).rstrip('\n') -+ input_plugin_path = check_output([mapnik_config, '--input-plugins']) - input_plugin_files = os.listdir(input_plugin_path) - input_plugin_files = [os.path.join(input_plugin_path, f) for f in input_plugin_files] - if not os.path.exists(os.path.join('mapnik','plugins','input')): -@@ -70,7 +82,7 @@ if mason_build: - shutil.copyfile(f, os.path.join('mapnik', 'plugins', 'input', os.path.basename(f))) - except shutil.Error: - pass -- font_path = subprocess.check_output([mapnik_config, '--fonts']).rstrip('\n') -+ font_path = check_output([mapnik_config, '--fonts']) - font_files = os.listdir(font_path) - font_files = [os.path.join(font_path, f) for f in font_files] - if not os.path.exists(os.path.join('mapnik','plugins','fonts')): -@@ -94,7 +106,7 @@ if create_paths: - - - if not mason_build: -- icu_path = subprocess.check_output([mapnik_config, '--icu-data']).rstrip('\n') -+ icu_path = check_output([mapnik_config, '--icu-data']) - else: - icu_path = 'mason_packages/.link/share/icu/' - if icu_path: -@@ -109,7 +121,7 @@ if icu_path: - pass - - if not mason_build: -- gdal_path = subprocess.check_output([mapnik_config, '--gdal-data']).rstrip('\n') -+ gdal_path = check_output([mapnik_config, '--gdal-data']) - else: - gdal_path = 'mason_packages/.link/share/gdal/' - if os.path.exists('mason_packages/.link/share/gdal/gdal/'): -@@ -126,7 +138,7 @@ if gdal_path: - pass - - if not mason_build: -- proj_path = subprocess.check_output([mapnik_config, '--proj-lib']).rstrip('\n') -+ proj_path = check_output([mapnik_config, '--proj-lib']) - else: - proj_path = 'mason_packages/.link/share/proj/' - if os.path.exists('mason_packages/.link/share/proj/proj/'): -@@ -142,7 +154,7 @@ if proj_path: - except shutil.Error: - pass - --extra_comp_args = subprocess.check_output([mapnik_config, '--cflags']).rstrip('\n').split(' ') -+extra_comp_args = check_output([mapnik_config, '--cflags']).split(' ') - - if sys.platform == 'darwin': - extra_comp_args.append('-mmacosx-version-min=10.8') -@@ -153,9 +165,9 @@ else: - linkflags.append('-Wl,-rpath=$ORIGIN') - - if os.environ.get("CC",False) == False: -- os.environ["CC"] = subprocess.check_output([mapnik_config, '--cxx']).rstrip('\n') -+ os.environ["CC"] = check_output([mapnik_config, '--cxx']) - if os.environ.get("CXX",False) == False: -- os.environ["CXX"] = subprocess.check_output([mapnik_config, '--cxx']).rstrip('\n') -+ os.environ["CXX"] = check_output([mapnik_config, '--cxx']) - - setup( - name = "mapnik", diff --git a/debian/patches/series b/debian/patches/series index 9843b63..9df6f28 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ link-boost.patch -python3-setup.patch -python3-print.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-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