diff -Nru python-stdlib-extensions-2.7.15~rc1/2.7/Modules/_tkinter.c python-stdlib-extensions-2.7.16/2.7/Modules/_tkinter.c --- python-stdlib-extensions-2.7.15~rc1/2.7/Modules/_tkinter.c 2018-04-14 22:06:30.000000000 +0000 +++ python-stdlib-extensions-2.7.16/2.7/Modules/_tkinter.c 2019-03-02 18:17:42.000000000 +0000 @@ -1205,10 +1205,8 @@ } #endif - if(PyTclObject_Check(value)) { - Tcl_Obj *v = ((PyTclObject*)value)->value; - Tcl_IncrRefCount(v); - return v; + if (PyTclObject_Check(value)) { + return ((PyTclObject*)value)->value; } { @@ -2107,7 +2105,7 @@ if (PyTuple_Size(args) == 1) { PyObject* o = PyTuple_GetItem(args, 0); - if (PyInt_Check(o) || PyLong_Check(o)) { + if (_PyAnyInt_Check(o)) { Py_INCREF(o); return o; } diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/changelog python-stdlib-extensions-2.7.16/debian/changelog --- python-stdlib-extensions-2.7.15~rc1/debian/changelog 2018-04-16 14:23:00.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/changelog 2019-04-09 04:54:11.000000000 +0000 @@ -1,8 +1,43 @@ +python-stdlib-extensions (2.7.16-2~18.04) bionic-proposed; urgency=medium + + * SRU: LP: #1822993. + + -- Matthias Klose Tue, 09 Apr 2019 06:54:11 +0200 + +python-stdlib-extensions (2.7.16-2) unstable; urgency=medium + + * Re-pack the orig tarball without the VCS repo. + + -- Matthias Klose Mon, 18 Mar 2019 13:19:16 +0100 + +python-stdlib-extensions (2.7.16-1) unstable; urgency=medium + + * Python 2.7.16 release. + + -- Matthias Klose Mon, 04 Mar 2019 16:41:09 +0100 + +python-stdlib-extensions (2.7.16~rc1-1) unstable; urgency=medium + + * Python 2.7.16 release candidate. + * Bump standards version. + * Fix FTCBFS (Helmut Grohne). Closes: #913417. + + Multiarchify Build-Depends. + + Set up PYTHONPATH for cross compilation. + + cross.patch: Don't import built modules. + + -- Matthias Klose Fri, 22 Feb 2019 16:52:18 +0100 + +python-stdlib-extensions (2.7.15-1) unstable; urgency=medium + + * Python 2.7.15 release. + + -- Matthias Klose Wed, 02 May 2018 10:47:10 +0200 + python-stdlib-extensions (2.7.15~rc1-1) unstable; urgency=medium * Python 2.7.15 release candidate 1. - -- Matthias Klose Mon, 16 Apr 2018 16:23:00 +0200 + -- Matthias Klose Mon, 16 Apr 2018 16:23:00 +0200 python-stdlib-extensions (2.7.14-3) unstable; urgency=medium diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/control python-stdlib-extensions-2.7.16/debian/control --- python-stdlib-extensions-2.7.15~rc1/debian/control 2018-04-16 14:23:00.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/control 2019-02-21 13:26:39.000000000 +0000 @@ -3,52 +3,50 @@ Priority: optional Maintainer: Matthias Klose Build-Depends: debhelper (>= 9), - python-all-dev (>= 2.7.14-1~), python-all-dbg, + libpython-all-dev (>= 2.7.14-1~), python-all-dev:any (>= 2.7.14-1~), libpython-all-dbg, python-all-dbg:any, tk8.6-dev, blt-dev (>= 2.4z-9), libgdbm-dev Build-Conflicts: tcl8.4-dev, tk8.4-dev, tcl8.5-dev, tk8.5-dev XS-Python-Version: 2.7 -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 +Vcs-Git: https://salsa.debian.org/cpython-team/python-stdlib.git +Vcs-Browser: https://salsa.debian.org/cpython-team/python-stdlib Package: python-tk Architecture: any Depends: ${python:Depends}, blt (>= 2.4z-9), ${shlibs:Depends}, ${misc:Depends} -Conflicts: python2.3-tk, python2.4-tk -Replaces: python2.3-tk, python2.4-tk Provides: ${python:Provides} Suggests: tix, python-tk-dbg -Description: Tkinter - Writing Tk applications with Python - A module for writing portable GUI applications with Python using Tk. +Description: Tkinter - Writing Tk applications with Python2 + A module for writing portable GUI applications with Python2 using Tk. Also known as Tkinter. Package: python-gdbm Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python2.3-gdbm, python2.4-gdbm -Replaces: python2.3-gdbm, python2.4-gdbm, python2.6 (<< 2.6.1-0ubuntu6) Provides: ${python:Provides} Suggests: python-gdbm-dbg -Description: GNU dbm database support for Python - GNU dbm database module for Python. Install this if you want to - create or read GNU dbm database files with Python. +Description: GNU dbm database support for Python2 + GNU dbm database module for Python2. Install this if you want to + create or read GNU dbm database files with Python2. Package: python-tk-dbg Architecture: any Section: debug Priority: optional Depends: ${python:Depends}, python-tk (= ${binary:Version}), blt (>= 2.4z-9), ${shlibs:Depends}, ${misc:Depends} -Description: Tkinter - Writing Tk applications with Python (debug extension) - A module for writing portable GUI applications with Python using Tk. +Description: Tkinter - Writing Tk applications with Python2 (debug extension) + A module for writing portable GUI applications with Python2 using Tk. Also known as Tkinter. . - This package contains the extensions built for the Python debug interpreter. + This package contains the extensions built for the Python2 debug interpreter. Package: python-gdbm-dbg Architecture: any Section: debug Priority: optional Depends: ${python:Depends}, python-gdbm (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: GNU dbm database support for Python (debug extension) - GNU dbm database module for Python. Install this if you want to - create or read GNU dbm database files with Python. +Description: GNU dbm database support for Python2 (debug extension) + GNU dbm database module for Python2. Install this if you want to + create or read GNU dbm database files with Python2. . - This package contains the extensions built for the Python debug interpreter. + This package contains the extensions built for the Python2 debug interpreter. diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/patches/cross.patch python-stdlib-extensions-2.7.16/debian/patches/cross.patch --- python-stdlib-extensions-2.7.15~rc1/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/patches/cross.patch 2019-02-21 13:26:39.000000000 +0000 @@ -0,0 +1,11 @@ +--- python-stdlib-extensions-2.7.15.orig/2.7/setup.py ++++ python-stdlib-extensions-2.7.15/2.7/setup.py +@@ -288,6 +288,8 @@ + ext_filename = os.path.join( + self.build_lib, + self.get_ext_filename(self.get_ext_fullname(ext.name))) ++ if "/plat-" in os.environ.get("PYTHONPATH", ""): ++ return # cross compiling + try: + imp.load_dynamic(ext.name, ext_filename) + except ImportError, why: diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/patches/series python-stdlib-extensions-2.7.16/debian/patches/series --- python-stdlib-extensions-2.7.15~rc1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/patches/series 2019-02-21 13:26:39.000000000 +0000 @@ -0,0 +1 @@ +cross.patch diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/rules python-stdlib-extensions-2.7.16/debian/rules --- python-stdlib-extensions-2.7.15~rc1/debian/rules 2015-12-09 12:34:08.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/rules 2019-02-21 13:26:39.000000000 +0000 @@ -13,7 +13,10 @@ #pkgver = 2.4.3-$(shell expr $(rel_ext) + 0) #pkgver = 2.4.3-3ubuntu1 +include /usr/share/dpkg/architecture.mk + PYVERS = $(shell pyversions -vs) +export PYTHONPATH:=/usr/lib/python2.7/plat-$(DEB_HOST_MULTIARCH)$(if $(PYTHONPATH),:$(PYTHONPATH)) p_tk = python-tk p_gdbm = python-gdbm diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/source/format python-stdlib-extensions-2.7.16/debian/source/format --- python-stdlib-extensions-2.7.15~rc1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/source/format 2014-11-13 02:45:40.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/source/lintian-overrides python-stdlib-extensions-2.7.16/debian/source/lintian-overrides --- python-stdlib-extensions-2.7.15~rc1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/source/lintian-overrides 2018-05-02 08:52:11.000000000 +0000 @@ -0,0 +1,5 @@ +# lintian gets it wrong ... +python-stdlib-extensions source: missing-python-build-dependency + +# packaged separately +python-stdlib-extensions source: python-foo-but-no-python3-foo diff -Nru python-stdlib-extensions-2.7.15~rc1/debian/source.lintian-overrides python-stdlib-extensions-2.7.16/debian/source.lintian-overrides --- python-stdlib-extensions-2.7.15~rc1/debian/source.lintian-overrides 2013-03-24 23:58:34.000000000 +0000 +++ python-stdlib-extensions-2.7.16/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# upstream package, split out from the python2.x sources -python-stdlib-extensions source: native-package-with-dash-version