Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: python-mapnik

python-mapnik (1:0.0~20180723-588fc9062-3ubuntu3) focal; urgency=medium * No-change rebuild for icu ABI compatibility (LP: #1873670) -- Trent Lloyd <trent.lloyd@canonical.com> Mon, 20 Apr 2020 10:48:03 +0800 python-mapnik (1:0.0~20180723-588fc9062-3ubuntu2) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 03 Mar 2020 21:22:54 +0100 python-mapnik (1:0.0~20180723-588fc9062-3ubuntu1) focal; urgency=medium * Fix boost_pythonXY detection. -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 20 Feb 2020 11:08:41 +0000 python-mapnik (1:0.0~20180723-588fc9062-3build4) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 13 Feb 2020 08:31:59 +0100 python-mapnik (1:0.0~20180723-588fc9062-3build3) focal; urgency=medium * No change rebuild against new boost1.71 ABI -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 03 Feb 2020 21:26:41 +0000 python-mapnik (1:0.0~20180723-588fc9062-3build2) focal; urgency=medium * No-change upload to build with proj from the release pocket. -- Matthias Klose <doko@ubuntu.com> Mon, 21 Oct 2019 11:41:12 +0200 python-mapnik (1:0.0~20180723-588fc9062-3build1) focal; urgency=medium * No-change rebuild to build with python3.8. -- Matthias Klose <doko@ubuntu.com> Fri, 18 Oct 2019 18:27:42 +0000

Modifications :
  1. Download patch debian/patches/4be2ecd773050e10b2c81822576d89d0e444830f.patch

    --- 1:0.0~20180723-588fc9062-3/debian/patches/4be2ecd773050e10b2c81822576d89d0e444830f.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:0.0~20180723-588fc9062-3ubuntu3/debian/patches/4be2ecd773050e10b2c81822576d89d0e444830f.patch 2020-02-20 11:00:23.000000000 +0000 @@ -0,0 +1,73 @@ +From 61dfa0622bf4fa95312ad427d1c7cf96c05533f5 Mon Sep 17 00:00:00 2001 +From: Tom Hughes <tom@compton.nu> +Date: Thu, 2 May 2019 19:03:14 +0100 +Subject: [PATCH] Fix various Python 3.8 warnings + +--- + test/python_tests/filter_test.py | 8 ++++---- + test/python_tests/json_feature_properties_test.py | 2 +- + test/python_tests/mapnik_test_data_test.py | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/test/python_tests/filter_test.py b/test/python_tests/filter_test.py +index f9a1010f1..39deb5b2f 100644 +--- a/test/python_tests/filter_test.py ++++ b/test/python_tests/filter_test.py +@@ -174,13 +174,13 @@ def test_regex_replace(): + context.push('name') + f = mapnik.Feature(context, 0) + f["name"] = 'test' +- expr = mapnik.Expression("[name].replace('(\B)|( )','$1 ')") ++ expr = mapnik.Expression("[name].replace('(\\B)|( )','$1 ')") + eq_(expr.evaluate(f), 't e s t') + + + def test_unicode_regex_replace_to_str(): +- expr = mapnik.Expression("[name].replace('(\B)|( )','$1 ')") +- eq_(str(expr), "[name].replace('(\B)|( )','$1 ')") ++ expr = mapnik.Expression("[name].replace('(\\B)|( )','$1 ')") ++ eq_(str(expr), "[name].replace('(\\B)|( )','$1 ')") + + + def test_unicode_regex_replace(): +@@ -188,7 +188,7 @@ def test_unicode_regex_replace(): + context.push('name') + f = mapnik.Feature(context, 0) + f["name"] = 'Québec' +- expr = mapnik.Expression("[name].replace('(\B)|( )','$1 ')") ++ expr = mapnik.Expression("[name].replace('(\\B)|( )','$1 ')") + # will fail if -DBOOST_REGEX_HAS_ICU is not defined + eq_(expr.evaluate(f), u'Q u é b e c') + +diff --git a/test/python_tests/json_feature_properties_test.py b/test/python_tests/json_feature_properties_test.py +index 41557455c..1d65acf62 100644 +--- a/test/python_tests/json_feature_properties_test.py ++++ b/test/python_tests/json_feature_properties_test.py +@@ -35,7 +35,7 @@ + { + "name": "reverse_solidus", # backslash + "test": "string with \\ quote", +- "json": '{"type":"Feature","id":1,"geometry":null,"properties":{"name":"string with \\\ quote"}}' ++ "json": '{"type":"Feature","id":1,"geometry":null,"properties":{"name":"string with \\\\ quote"}}' + }, + { + "name": "solidus", # forward slash +diff --git a/test/python_tests/mapnik_test_data_test.py b/test/python_tests/mapnik_test_data_test.py +index c0efff684..d407ac33b 100644 +--- a/test/python_tests/mapnik_test_data_test.py ++++ b/test/python_tests/mapnik_test_data_test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python + # -*- coding: utf-8 -*- + + from __future__ import print_function +@@ -55,7 +55,7 @@ def test_opening_data(): + else: + for plugin in plugin_mapping[ext]: + kwargs = {'type': plugin, 'file': filepath} +- if plugin is 'ogr': ++ if plugin == 'ogr': + kwargs['layer_by_index'] = 0 + try: + mapnik.Datasource(**kwargs)
  2. Download patch debian/control

    --- 1:0.0~20180723-588fc9062-3/debian/control 2019-07-21 07:00:41.000000000 +0000 +++ 1:0.0~20180723-588fc9062-3ubuntu3/debian/control 2020-02-03 21:26:41.000000000 +0000 @@ -1,5 +1,6 @@ Source: python-mapnik -Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Bas Couwenberg <sebastic@debian.org> Section: python Priority: optional
  3. Download patch debian/patches/fix-boost-detection.patch

    --- 1:0.0~20180723-588fc9062-3/debian/patches/fix-boost-detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:0.0~20180723-588fc9062-3ubuntu3/debian/patches/fix-boost-detection.patch 2020-02-20 11:08:37.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Fix boost_pythonXY detection + +--- python-mapnik-0.0~20180723-588fc9062.orig/setup.py ++++ python-mapnik-0.0~20180723-588fc9062/setup.py +@@ -41,7 +41,8 @@ def find_boost_library(_id): + suffixes.insert(0, "-py%d%d" % (sys.version_info.major, + sys.version_info.minor)) + # standard suffix for Python3 +- suffixes.insert(1, sys.version_info.major) ++ suffixes.insert(1, "%d%d" % (sys.version_info.major, ++ sys.version_info.minor)) + for suf in suffixes: + name = "%s%s" % (_id, suf) + lib = find_library(name)
  4. Download patch debian/patches/series

    --- 1:0.0~20180723-588fc9062-3/debian/patches/series 2017-02-06 18:41:36.000000000 +0000 +++ 1:0.0~20180723-588fc9062-3ubuntu3/debian/patches/series 2020-02-20 11:08:20.000000000 +0000 @@ -1 +1,4 @@ skip-tests-for-missing-data.patch +fff0b9c1f37a896f09d7d694b20a0d610a0f14b9.patch +4be2ecd773050e10b2c81822576d89d0e444830f.patch +fix-boost-detection.patch
  5. Download patch debian/patches/fff0b9c1f37a896f09d7d694b20a0d610a0f14b9.patch

    --- 1:0.0~20180723-588fc9062-3/debian/patches/fff0b9c1f37a896f09d7d694b20a0d610a0f14b9.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:0.0~20180723-588fc9062-3ubuntu3/debian/patches/fff0b9c1f37a896f09d7d694b20a0d610a0f14b9.patch 2020-02-20 10:50:02.000000000 +0000 @@ -0,0 +1,56 @@ +From fff0b9c1f37a896f09d7d694b20a0d610a0f14b9 Mon Sep 17 00:00:00 2001 +From: Artem Pavlenko <artem@mapnik.org> +Date: Tue, 5 Nov 2019 15:13:58 +0000 +Subject: [PATCH] remove unused SVG generator codex + +--- + setup.py | 1 - + src/mapnik_svg_generator_grammar.cpp | 27 --------------------------- + 2 files changed, 28 deletions(-) + delete mode 100644 src/mapnik_svg_generator_grammar.cpp + +diff --git a/setup.py b/setup.py +index 38a4e5c79..82dff3961 100755 +--- a/setup.py ++++ b/setup.py +@@ -303,7 +303,6 @@ def run(self): + 'src/mapnik_rule.cpp', + 'src/mapnik_scaling_method.cpp', + 'src/mapnik_style.cpp', +- 'src/mapnik_svg_generator_grammar.cpp', + 'src/mapnik_symbolizer.cpp', + 'src/mapnik_view_transform.cpp', + 'src/python_grid_utils.cpp', +diff --git a/src/mapnik_svg_generator_grammar.cpp b/src/mapnik_svg_generator_grammar.cpp +deleted file mode 100644 +index 5c02b6e4a..000000000 +--- a/src/mapnik_svg_generator_grammar.cpp ++++ /dev/null +@@ -1,27 +0,0 @@ +-/***************************************************************************** +- * +- * This file is part of Mapnik (c++ mapping toolkit) +- * +- * Copyright (C) 2015 Artem Pavlenko, Jean-Francois Doyon +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +- * +- *****************************************************************************/ +- +-#include <mapnik/svg/geometry_svg_generator_impl.hpp> +-#include <string> +- +-using sink_type = std::back_insert_iterator<std::string>; +-template struct mapnik::svg::svg_path_generator<sink_type, mapnik::vertex_adapter>;
  1. python-mapnik