diff -Nru python3-defaults-3.10.1/debian/changelog python3-defaults-3.10.4/debian/changelog --- python3-defaults-3.10.1/debian/changelog 2022-03-07 14:56:32.000000000 +0000 +++ python3-defaults-3.10.4/debian/changelog 2022-03-25 12:41:08.000000000 +0000 @@ -1,3 +1,10 @@ +python3-defaults (3.10.4-0ubuntu2) jammy; urgency=medium + + * Bump version to 3.10.4. + * Build a python3-nopie package. + + -- Matthias Klose Fri, 25 Mar 2022 13:41:08 +0100 + python3-defaults (3.10.1-0ubuntu2) jammy; urgency=medium * Remove Python 3.9 as a supported version diff -Nru python3-defaults-3.10.1/debian/control python3-defaults-3.10.4/debian/control --- python3-defaults-3.10.1/debian/control 2022-03-07 13:23:12.000000000 +0000 +++ python3-defaults-3.10.4/debian/control 2022-03-25 12:39:23.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Matthias Klose Uploaders: Piotr Ożarowski , Stefano Rivera -Build-Depends: debhelper (>= 11), dpkg-dev (>= 1.17.11), python3.10:any (>= 3.10.1-0~), +Build-Depends: debhelper (>= 11), dpkg-dev (>= 1.17.11), python3.10:any (>= 3.10.4-1~), lsb-release, python3-minimal:any, python3-docutils, @@ -19,8 +19,8 @@ Architecture: any Multi-Arch: allowed Pre-Depends: python3-minimal (= ${binary:Version}) -Depends: python3.10 (>= 3.10.1-0~), libpython3-stdlib (= ${binary:Version}), ${misc:Depends} -Suggests: python3-doc (>= ${binary:Version}), python3-tk (>= 3.9.9-3~) , python3-venv (>= ${binary:Version}) +Depends: python3.10 (>= 3.10.4-1~), libpython3-stdlib (= ${binary:Version}), ${misc:Depends} +Suggests: python3-doc (>= ${binary:Version}), python3-tk (>= 3.9.10-2~) , python3-venv (>= ${binary:Version}) Replaces: python3-minimal (<< 3.1.2-2) Provides: python3-profiler Description: interactive high-level object-oriented language (default python3 version) @@ -34,8 +34,8 @@ Package: python3-venv Architecture: any Multi-Arch: allowed -Depends: python3.10-venv (>= 3.10.1-0~), python3 (= ${binary:Version}), - python3-distutils (>= 3.9.9-3~), ${misc:Depends} +Depends: python3.10-venv (>= 3.10.4-1~), python3 (= ${binary:Version}), + python3-distutils (>= 3.9.10-2~), ${misc:Depends} Description: venv module for python3 (default python3 version) This package contains the venv module for the Python language (default python3 version). @@ -53,7 +53,7 @@ Package: python3-minimal Architecture: any Multi-Arch: allowed -Pre-Depends: python3.10-minimal (>= 3.10.1-0~) +Pre-Depends: python3.10-minimal (>= 3.10.4-1~) Depends: dpkg (>= 1.13.20), ${misc:Depends} Description: minimal subset of the Python language (default python3 version) This package contains the interpreter and some essential modules. It's used @@ -62,10 +62,21 @@ contained in this package. XB-Cnf-Visible-Pkgname: python3 +Package: python3-nopie +Architecture: any +Multi-Arch: allowed +Depends: python3 (= ${binary:Version}), + python3.10-nopie (>= 3.10.4-1~), ${misc:Depends} +Description: Python interpreter linked without PIE (default python3 version) + This package contains the interpreter not built as position independent + executable. This interpreter is diverting the python3 executable, and making + the interpreter built with PIE available as python3-pie. +XB-Cnf-Visible-Pkgname: python3 + Package: python3-examples Architecture: all Multi-Arch: foreign -Depends: python3 (>= ${binary:Version}), python3.10-examples (>= 3.10.1-0~), ${misc:Depends} +Depends: python3 (>= ${binary:Version}), python3.10-examples (>= 3.10.4-1~), ${misc:Depends} Description: examples for the Python language (default version) Examples, Demos and Tools for Python. These are files included in the upstream Python distribution. @@ -77,7 +88,7 @@ Architecture: any Multi-Arch: allowed Depends: python3 (= ${binary:Version}), libpython3-dev (= ${binary:Version}), - python3.10-dev (>= 3.10.1-0~), python3-distutils (>= 3.9.9-3~), + python3.10-dev (>= 3.10.4-1~), python3-distutils (>= 3.9.10-2~), ${misc:Depends}, ${sphinxdoc:Depends} Breaks: python3 (<< 3.9.2-1~) Replaces: python3.1 (<< 3.1.2+20100706-3), python3 (<< 3.9.2-1~) @@ -94,7 +105,7 @@ Architecture: any Multi-Arch: same Section: libdevel -Depends: libpython3.10-dev (>= 3.10.1-0~), ${misc:Depends} +Depends: libpython3.10-dev (>= 3.10.4-1~), ${misc:Depends} Breaks: libpython3.8-dev (<< 3.8.0-2), python3-dev (<< 3.8.0-1) Replaces: libpython3.8-dev (<< 3.8.0-2), python3-dev (<< 3.8.0-1) Description: header files and a static library for Python (default) @@ -108,7 +119,7 @@ Package: libpython3-stdlib Architecture: any Multi-Arch: same -Depends: libpython3.10-stdlib (>= 3.10.1-0~), ${misc:Depends} +Depends: libpython3.10-stdlib (>= 3.10.4-1~), ${misc:Depends} Description: interactive high-level object-oriented language (default python3 version) This package contains the majority of the standard library for the Python language (default python3 version). @@ -142,7 +153,7 @@ Section: doc Architecture: all Multi-Arch: foreign -Depends: python3.10-doc (>= 3.10.1-0~), ${misc:Depends} +Depends: python3.10-doc (>= 3.10.4-1~), ${misc:Depends} Suggests: python3 (>= ${binary:Version}), python3-examples Description: documentation for the high-level object-oriented language Python 3 This is the official set of documentation for the interactive high-level @@ -166,7 +177,7 @@ Architecture: any Multi-Arch: allowed Section: debug -Depends: python3 (= ${binary:Version}), libpython3-dbg (= ${binary:Version}), python3.10-dbg (>= 3.10.1-0~), ${misc:Depends} +Depends: python3 (= ${binary:Version}), libpython3-dbg (= ${binary:Version}), python3.10-dbg (>= 3.10.4-1~), ${misc:Depends} Description: debug build of the Python 3 Interpreter (version 3.10) Python 3 interpreter configured with --pydebug. Dynamically loaded modules are searched in /usr/lib/python3.10/lib-dynload/debug first. @@ -175,7 +186,7 @@ Architecture: any Multi-Arch: same Section: debug -Depends: libpython3.10-dbg (>= 3.10.1-0~), ${misc:Depends} +Depends: libpython3.10-dbg (>= 3.10.4-1~), ${misc:Depends} Breaks: python3-dbg (<< 3.8.0-1) Replaces: python3-dbg (<< 3.8.0-1) Description: debug build of the Python 3 Interpreter (version 3.10) @@ -187,7 +198,7 @@ Multi-Arch: allowed Depends: python3 (= ${binary:Version}), ${misc:Depends}, - python3-distutils (>= 3.9.9-3~), + python3-distutils (>= 3.9.10-2~), python3.10, Description: package depending on all supported Python 3 runtime versions The package currently depends on python3.10, in the future, @@ -267,7 +278,7 @@ Package: 2to3 Architecture: all Multi-Arch: foreign -Depends: python3-lib2to3 (>= 3.9.9-3~), python3 (>= ${binary:Version}), ${misc:Depends} +Depends: python3-lib2to3 (>= 3.9.10-2~), python3 (>= ${binary:Version}), ${misc:Depends} Breaks: python (<< 2.7.14-4) Replaces: python (<< 2.7.14-4) Description: 2to3 binary using python3 @@ -285,7 +296,7 @@ Architecture: any Multi-Arch: allowed Depends: python3 (= ${binary:Version}), - python3.10-full (>= 3.10.1-0~), + python3.10-full (>= 3.10.4-1~), python3-venv (= ${binary:Version}), 2to3, idle, diff -Nru python3-defaults-3.10.1/debian/control.in python3-defaults-3.10.4/debian/control.in --- python3-defaults-3.10.1/debian/control.in 2022-03-07 13:22:58.000000000 +0000 +++ python3-defaults-3.10.4/debian/control.in 2022-03-25 12:38:33.000000000 +0000 @@ -61,6 +61,17 @@ contained in this package. XB-Cnf-Visible-Pkgname: python3 +Package: python3-nopie +Architecture: any +Multi-Arch: allowed +Depends: python3 (= ${binary:Version}), + python@VER@-nopie (>= @UPSTRVER@), ${misc:Depends} +Description: Python interpreter linked without PIE (default python3 version) + This package contains the interpreter not built as position independent + executable. This interpreter is diverting the python3 executable, and making + the interpreter built with PIE available as python3-pie. +XB-Cnf-Visible-Pkgname: python3 + Package: python3-examples Architecture: all Multi-Arch: foreign diff -Nru python3-defaults-3.10.1/debian/rules python3-defaults-3.10.4/debian/rules --- python3-defaults-3.10.1/debian/rules 2022-01-10 14:17:02.000000000 +0000 +++ python3-defaults-3.10.4/debian/rules 2022-03-24 21:04:49.000000000 +0000 @@ -21,13 +21,13 @@ distrelease := $(shell lsb_release -cs) # requiered python3.x version -UPSTRVER := 3.10.1-0~ +UPSTRVER := 3.10.4-1~ # required versions of python3-lib2to3 and python3-distutils -STDLIBVER := 3.9.9-3~ +STDLIBVER := 3.9.10-2~ ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty)) - bd_i586 = dpkg-dev (>= 1.17.11), python3.10:any (>= 3.10.1-0~), + bd_i586 = dpkg-dev (>= 1.17.11), python3.10:any (>= 3.10.4-1~), else bd_i586 = dpkg-dev (>= 1.16.1~), endif @@ -388,11 +388,15 @@ debian/libpython3-dbg/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-python3-dbg-config.1.gz endif + : # python3-nopie + mkdir -p debian/python3-nopie/usr/bin + ln -sf python$(VER)-pie debian/python3-nopie/usr/bin/python3-pie + dh_lintian -a dh_installdocs -a $(NOPKGS) --all debian/README.Debian dh_installchangelogs -a $(NOPKGS) - for p in all all-dev all-dbg dbg dev venv full; do \ + for p in all all-dev all-dbg dbg dev nopie venv full; do \ case $$p in idle*) : ;; *) p=python3-$$p; esac; \ rm -rf debian/$$p/usr/share/doc/$$p; \ ln -sf python3 debian/$$p/usr/share/doc/$$p; \