diff -Nru jinja2-2.10.1/debian/changelog jinja2-2.10.1/debian/changelog --- jinja2-2.10.1/debian/changelog 2020-02-19 21:35:57.000000000 +0000 +++ jinja2-2.10.1/debian/changelog 2020-02-27 10:49:32.000000000 +0000 @@ -1,12 +1,14 @@ -jinja2 (2.10.1-1ubuntu1) focal; urgency=low +jinja2 (2.10.1-2) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Runtime packages already suggest documentation, there is no need for - documentation to recommend opinionated (python2) runtime package. Drop - the recommends from the documentation package, to keep python2 demoted - in universe. + [ Ondřej Nový ] + * Use debhelper-compat instead of debian/compat. + * Bump Standards-Version to 4.4.1. + + [ Thomas Goirand ] + * Team upload. + * Add py3.9-fix-collections-import.patch (Closes: #949018). - -- Steve Langasek Wed, 19 Feb 2020 13:35:57 -0800 + -- Thomas Goirand Thu, 27 Feb 2020 11:49:32 +0100 jinja2 (2.10.1-1) unstable; urgency=medium @@ -23,21 +25,6 @@ -- Piotr Ożarowski Wed, 10 Jul 2019 22:34:15 +0200 -jinja2 (2.10-2ubuntu2) focal; urgency=medium - - * No-change rebuild to generate dependencies on python2. - - -- Matthias Klose Tue, 17 Dec 2019 12:34:40 +0000 - -jinja2 (2.10-2ubuntu1) eoan; urgency=medium - - * Runtime packages already suggest documentation, there is no need for - documentation to recommend opinionated (python2) runtime package. Drop - the recommends from the documentation package, to keep python2 demoted - in universe. - - -- Dimitri John Ledkov Tue, 21 May 2019 23:02:39 +0100 - jinja2 (2.10-2) unstable; urgency=high [ Thomas Goirand ] @@ -371,4 +358,3 @@ * Initial release (this package is an successor of jinja package) -- Piotr Ożarowski Sun, 20 Jul 2008 23:01:02 +0200 - diff -Nru jinja2-2.10.1/debian/compat jinja2-2.10.1/debian/compat --- jinja2-2.10.1/debian/compat 2019-12-31 19:11:28.000000000 +0000 +++ jinja2-2.10.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru jinja2-2.10.1/debian/control jinja2-2.10.1/debian/control --- jinja2-2.10.1/debian/control 2019-12-31 19:11:28.000000000 +0000 +++ jinja2-2.10.1/debian/control 2020-02-27 10:49:32.000000000 +0000 @@ -1,14 +1,13 @@ Source: jinja2 Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Piotr Ożarowski +Maintainer: Piotr Ożarowski Uploaders: Debian Python Modules Team -Build-Depends: debhelper (>= 9), dh-python, +Build-Depends: debhelper-compat (= 9), dh-python, python-all (>= 2.6.6-3), python3-all, python-setuptools (>= 0.6b3-1~), python3-setuptools, python3-sphinx, python3-pygments -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Homepage: http://jinja.pocoo.org/ Vcs-Git: https://salsa.debian.org/python-team/modules/jinja2.git Vcs-Browser: https://salsa.debian.org/python-team/modules/jinja2 @@ -42,6 +41,7 @@ Section: doc Architecture: all Depends: ${sphinxdoc:Depends}, ${misc:Depends} +Recommends: python3-jinja2 Description: documentation for the Jinja2 Python library Jinja2 is a small but fast and easy to use stand-alone template engine . diff -Nru jinja2-2.10.1/debian/patches/py3.9-fix-collections-import.patch jinja2-2.10.1/debian/patches/py3.9-fix-collections-import.patch --- jinja2-2.10.1/debian/patches/py3.9-fix-collections-import.patch 1970-01-01 00:00:00.000000000 +0000 +++ jinja2-2.10.1/debian/patches/py3.9-fix-collections-import.patch 2020-02-27 10:49:32.000000000 +0000 @@ -0,0 +1,171 @@ +Description: Python 3.9: fix collections import + As collections has moved to collections.abc, this produces a warning which + may lead to unit testing errors: this is the case when building Rally. + . + This patch attempts to import from collections.abc, and if it fails, falls + back to collections. This should be harmless. + . + Note that this patch is probably useless with future version, as hopefully, + upstream will fix it (I didn't check). However, I didn't dare upgrading the + package to the major upstream release 3.x. +Author: Thomas Goirand +Bug-Debian: https://bugs.debian.org/949018 +Forwarded: no +Last-Update: 2020-02-27 + +--- jinja2-2.10.1.orig/jinja2/filters.py ++++ jinja2-2.10.1/jinja2/filters.py +@@ -14,7 +14,12 @@ import random + import warnings + + from itertools import groupby, chain +-from collections import namedtuple ++ ++try: ++ from collections.abc import namedtuple ++except: ++ from collections import namedtuple ++ + from jinja2.utils import Markup, escape, pformat, urlize, soft_unicode, \ + unicode_urlencode, htmlsafe_json_dumps + from jinja2.runtime import Undefined +--- jinja2-2.10.1.orig/jinja2/lexer.py ++++ jinja2-2.10.1/jinja2/lexer.py +@@ -15,7 +15,12 @@ + :license: BSD, see LICENSE for more details. + """ + import re +-from collections import deque ++ ++try: ++ from collections.abc import deque ++except: ++ from collections import deque ++ + from operator import itemgetter + + from jinja2._compat import implements_iterator, intern, iteritems, text_type +--- jinja2-2.10.1.orig/jinja2/nodes.py ++++ jinja2-2.10.1/jinja2/nodes.py +@@ -15,7 +15,11 @@ + import types + import operator + +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque ++ + from jinja2.utils import Markup + from jinja2._compat import izip, with_metaclass, text_type, PY2 + +--- jinja2-2.10.1.orig/jinja2/runtime.py ++++ jinja2-2.10.1/jinja2/runtime.py +@@ -315,10 +315,14 @@ class Context(with_metaclass(ContextMeta + + # register the context as mapping if possible + try: +- from collections import Mapping ++ from collections.abc import Mapping + Mapping.register(Context) + except ImportError: +- pass ++ try: ++ from collections import Mapping ++ Mapping.register(Context) ++ except ImportError: ++ pass + + + class BlockReference(object): +--- jinja2-2.10.1.orig/jinja2/sandbox.py ++++ jinja2-2.10.1/jinja2/sandbox.py +@@ -14,7 +14,12 @@ + """ + import types + import operator +-from collections import Mapping ++ ++try: ++ from collections import Mapping ++except: ++ from collections.abc import Mapping ++ + from jinja2.environment import Environment + from jinja2.exceptions import SecurityError + from jinja2._compat import string_types, PY2 +@@ -55,7 +60,10 @@ import warnings + warnings.filterwarnings('ignore', 'the sets module', DeprecationWarning, + module='jinja2.sandbox') + +-from collections import deque ++try: ++ from collections.abc import deque ++except ImportError: ++ from collections import deque + + _mutable_set_types = (set,) + _mutable_mapping_types = (dict,) +@@ -79,7 +87,11 @@ except ImportError: + pass + + #: register Python 2.6 abstract base classes +-from collections import MutableSet, MutableMapping, MutableSequence ++try: ++ from collections.abc import MutableSet, MutableMapping, MutableSequence ++except: ++ from collections import MutableSet, MutableMapping, MutableSequence ++ + _mutable_set_types += (MutableSet,) + _mutable_mapping_types += (MutableMapping,) + _mutable_sequence_types += (MutableSequence,) +--- jinja2-2.10.1.orig/jinja2/tests.py ++++ jinja2-2.10.1/jinja2/tests.py +@@ -10,7 +10,12 @@ + """ + import operator + import re +-from collections import Mapping ++ ++try: ++ from collections.abc import Mapping ++except: ++ from collections import Mapping ++ + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +--- jinja2-2.10.1.orig/jinja2/utils.py ++++ jinja2-2.10.1/jinja2/utils.py +@@ -11,7 +11,12 @@ + import re + import json + import errno +-from collections import deque ++ ++try: ++ from collections.abc import deque ++except: ++ from collections import deque ++ + from threading import Lock + from jinja2._compat import text_type, string_types, implements_iterator, \ + url_quote +@@ -482,10 +487,14 @@ class LRUCache(object): + + # register the LRU cache as mutable mapping if possible + try: +- from collections import MutableMapping ++ from collections.abc import MutableMapping + MutableMapping.register(LRUCache) + except ImportError: +- pass ++ try: ++ from collections import MutableMapping ++ MutableMapping.register(LRUCache) ++ except ImportError: ++ pass + + + def select_autoescape(enabled_extensions=('html', 'htm', 'xml'), diff -Nru jinja2-2.10.1/debian/patches/series jinja2-2.10.1/debian/patches/series --- jinja2-2.10.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ jinja2-2.10.1/debian/patches/series 2020-02-27 10:49:32.000000000 +0000 @@ -0,0 +1 @@ +py3.9-fix-collections-import.patch