Skip to content
Snippets Groups Projects
Commit c14aee98 authored by Apertis CI's avatar Apertis CI
Browse files

Merge updates from debian/buster

parents 633fb016 9c71e98e
No related branches found
No related tags found
1 merge request!1Update from debian/buster for apertis/v2020dev0
Pipeline #92855 failed
python-defaults (2.7.16-1) unstable; urgency=medium
* Bump version to 2.7.16.
-- Matthias Klose <doko@debian.org> Mon, 04 Mar 2019 16:48:56 +0100
python-defaults (2.7.15-4) unstable; urgency=medium
[ Matthias Klose ]
* Fix some lintian warnings.
* Fix typo in dh_python2(1) (Chris Lamb). Closes: #901079.
* Bump standards version.
* python-minimal: Make the python-central conflict unversioned.
Closes: #910234.
[ Scott Kitterman ]
* Remove myself from uploaders
-- Matthias Klose <doko@debian.org> Fri, 18 Jan 2019 11:56:03 +0100
python-defaults (2.7.15-3) unstable; urgency=medium python-defaults (2.7.15-3) unstable; urgency=medium
* Fix pyversions -d invocation. Closes: #900983. * Fix pyversions -d invocation. Closes: #900983.
......
...@@ -2,12 +2,12 @@ Source: python-defaults ...@@ -2,12 +2,12 @@ Source: python-defaults
Section: python Section: python
Priority: optional Priority: optional
Maintainer: Matthias Klose <doko@debian.org> Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org> Uploaders: Piotr Ożarowski <piotr@debian.org>
Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.11), python2.7:any (>= 2.7.15-1), Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.11), python2.7:any (>= 2.7.16-1~),
lsb-release, lsb-release,
python-all:any, python-all:any,
python2.7:any (>= 2.7.15-1~), python2.7:any (>= 2.7.16-1~),
Standards-Version: 4.1.4 Standards-Version: 4.3.0
Homepage: https://www.python.org/ Homepage: https://www.python.org/
Vcs-Git: https://salsa.debian.org/cpython-team/python-defaults.git Vcs-Git: https://salsa.debian.org/cpython-team/python-defaults.git
Vcs-Browser: https://salsa.debian.org/cpython-team/python-defaults Vcs-Browser: https://salsa.debian.org/cpython-team/python-defaults
...@@ -17,8 +17,8 @@ Architecture: any ...@@ -17,8 +17,8 @@ Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Priority: optional Priority: optional
Pre-Depends: python-minimal (= ${binary:Version}) Pre-Depends: python-minimal (= ${binary:Version})
Depends: ${misc:Depends}, python2.7 (>= 2.7.15-1~), libpython-stdlib (= ${binary:Version}), python2 (= ${binary:Version}) Depends: ${misc:Depends}, python2.7 (>= 2.7.16-1~), libpython-stdlib (= ${binary:Version}), python2 (= ${binary:Version})
Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.15-1~) Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.16-1~)
Conflicts: python-central (<< 0.5.5) Conflicts: python-central (<< 0.5.5)
Breaks: update-manager-core (<< 0.200.5-2) Breaks: update-manager-core (<< 0.200.5-2)
Replaces: python-dev (<< 2.6.5-2) Replaces: python-dev (<< 2.6.5-2)
...@@ -37,9 +37,9 @@ Package: python-minimal ...@@ -37,9 +37,9 @@ Package: python-minimal
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Priority: optional Priority: optional
Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.15-1~), dpkg (>= 1.13.20), python2-minimal (= ${binary:Version}) Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.16-1~), dpkg (>= 1.13.20), python2-minimal (= ${binary:Version})
Recommends: python Recommends: python
Conflicts: python-central (<< 0.5.5) Conflicts: python-central
Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2) Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2)
Replaces: python (<= 2.7.3-1~) Replaces: python (<= 2.7.3-1~)
Description: minimal subset of the Python2 language Description: minimal subset of the Python2 language
...@@ -52,7 +52,7 @@ Cnf-Visible-Pkgname: python ...@@ -52,7 +52,7 @@ Cnf-Visible-Pkgname: python
Package: python-dev Package: python-dev
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.15-1~), python2-dev (= ${binary:Version}) Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.16-1~), python2-dev (= ${binary:Version})
Description: header files and a static library for Python2 Description: header files and a static library for Python2
Header files, a static library and development tools for building Header files, a static library and development tools for building
Python2 modules, extending the Python2 interpreter or embedding Python2 Python2 modules, extending the Python2 interpreter or embedding Python2
...@@ -65,7 +65,7 @@ Package: libpython-dev ...@@ -65,7 +65,7 @@ Package: libpython-dev
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Section: libdevel Section: libdevel
Depends: libpython2.7-dev (>= 2.7.15-1~), ${misc:Depends}, libpython2-dev (= ${binary:Version}) Depends: libpython2.7-dev (>= 2.7.16-1~), ${misc:Depends}, libpython2-dev (= ${binary:Version})
Description: header files and a static library for Python2 Description: header files and a static library for Python2
Header files, a static library and development tools for building Header files, a static library and development tools for building
Python2 modules, extending the Python2 interpreter or embedding Python2 Python2 modules, extending the Python2 interpreter or embedding Python2
...@@ -78,7 +78,7 @@ Package: libpython-stdlib ...@@ -78,7 +78,7 @@ Package: libpython-stdlib
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Priority: optional Priority: optional
Depends: libpython2.7-stdlib (>= 2.7.15-1~), ${misc:Depends}, libpython2-stdlib (= ${binary:Version}) Depends: libpython2.7-stdlib (>= 2.7.16-1~), ${misc:Depends}, libpython2-stdlib (= ${binary:Version})
Description: interactive high-level object-oriented language (Python2) Description: interactive high-level object-oriented language (Python2)
Python2, the high-level, interactive object oriented language, Python2, the high-level, interactive object oriented language,
includes an extensive class library with lots of goodies for includes an extensive class library with lots of goodies for
...@@ -91,7 +91,7 @@ Package: python-doc ...@@ -91,7 +91,7 @@ Package: python-doc
Section: doc Section: doc
Architecture: all Architecture: all
Multi-Arch: foreign Multi-Arch: foreign
Depends: ${misc:Depends}, python2.7-doc (>= 2.7.15-1~), python2-doc (= ${binary:Version}) Depends: ${misc:Depends}, python2.7-doc (>= 2.7.16-1~), python2-doc (= ${binary:Version})
Suggests: python-examples, python (= ${binary:Version}) Suggests: python-examples, python (= ${binary:Version})
Breaks: python (<< 2.3.5) Breaks: python (<< 2.3.5)
Replaces: python (<< 2.3.5) Replaces: python (<< 2.3.5)
...@@ -117,7 +117,7 @@ Package: python-dbg ...@@ -117,7 +117,7 @@ Package: python-dbg
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Section: debug Section: debug
Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.15-1~), python2-dbg (= ${binary:Version}) Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.16-1~), python2-dbg (= ${binary:Version})
Description: debug build of the Python Interpreter2 (version 2.7) Description: debug build of the Python Interpreter2 (version 2.7)
Python2 interpreter configured with --pydebug. Dynamically loaded modules are Python2 interpreter configured with --pydebug. Dynamically loaded modules are
searched in /usr/lib/python2.7/lib-dynload/debug first. searched in /usr/lib/python2.7/lib-dynload/debug first.
...@@ -126,7 +126,7 @@ Package: libpython-dbg ...@@ -126,7 +126,7 @@ Package: libpython-dbg
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Section: debug Section: debug
Depends: libpython2.7-dbg (>= 2.7.15-1~), ${misc:Depends}, libpython2-dbg (= ${binary:Version}) Depends: libpython2.7-dbg (>= 2.7.16-1~), ${misc:Depends}, libpython2-dbg (= ${binary:Version})
Description: debug build of the Python2 Interpreter (version 2.7) Description: debug build of the Python2 Interpreter (version 2.7)
Python2 interpreter configured with --pydebug. Dynamically loaded modules Python2 interpreter configured with --pydebug. Dynamically loaded modules
are searched in /usr/lib/python2.7/lib-dynload/debug first. are searched in /usr/lib/python2.7/lib-dynload/debug first.
...@@ -203,8 +203,8 @@ Architecture: any ...@@ -203,8 +203,8 @@ Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Priority: optional Priority: optional
Pre-Depends: python2-minimal (= ${binary:Version}) Pre-Depends: python2-minimal (= ${binary:Version})
Depends: ${misc:Depends}, python2.7 (>= 2.7.15-1~), libpython2-stdlib (= ${binary:Version}) Depends: ${misc:Depends}, python2.7 (>= 2.7.16-1~), libpython2-stdlib (= ${binary:Version})
Suggests: python2-doc (= ${binary:Version}), python-tk (>= 2.7.15-1~) Suggests: python2-doc (= ${binary:Version}), python-tk (>= 2.7.16-1~)
Conflicts: python-central (<< 0.5.5) Conflicts: python-central (<< 0.5.5)
Breaks: update-manager-core (<< 0.200.5-2), python (<< 2.7.15-2) Breaks: update-manager-core (<< 0.200.5-2), python (<< 2.7.15-2)
Replaces: python-dev (<< 2.6.5-2), python (<< 2.7.15-2) Replaces: python-dev (<< 2.6.5-2), python (<< 2.7.15-2)
...@@ -223,7 +223,7 @@ Package: python2-minimal ...@@ -223,7 +223,7 @@ Package: python2-minimal
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Priority: optional Priority: optional
Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.15-1~), dpkg (>= 1.13.20) Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.16-1~), dpkg (>= 1.13.20)
Recommends: python2 Recommends: python2
Conflicts: python-central (<< 0.5.5) Conflicts: python-central (<< 0.5.5)
Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2), python-minimal (<< 2.7.15-2) Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2), python-minimal (<< 2.7.15-2)
...@@ -238,7 +238,7 @@ Cnf-Visible-Pkgname: python2 ...@@ -238,7 +238,7 @@ Cnf-Visible-Pkgname: python2
Package: python2-dev Package: python2-dev
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Depends: ${misc:Depends}, python2 (= ${binary:Version}), libpython2-dev (= ${binary:Version}), python2.7-dev (>= 2.7.15-1~) Depends: ${misc:Depends}, python2 (= ${binary:Version}), libpython2-dev (= ${binary:Version}), python2.7-dev (>= 2.7.16-1~)
Breaks: python-dev (<< 2.7.15-2) Breaks: python-dev (<< 2.7.15-2)
Replaces: python-dev (<< 2.7.15-2) Replaces: python-dev (<< 2.7.15-2)
Description: header files and a static library for Python2 Description: header files and a static library for Python2
...@@ -253,7 +253,7 @@ Package: libpython2-dev ...@@ -253,7 +253,7 @@ Package: libpython2-dev
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Section: libdevel Section: libdevel
Depends: libpython2.7-dev (>= 2.7.15-1~), ${misc:Depends} Depends: libpython2.7-dev (>= 2.7.16-1~), ${misc:Depends}
Breaks: libpython-dev (<< 2.7.15-2) Breaks: libpython-dev (<< 2.7.15-2)
Replaces: libpython-dev (<< 2.7.15-2) Replaces: libpython-dev (<< 2.7.15-2)
Description: header files and a static library for Python2 Description: header files and a static library for Python2
...@@ -268,7 +268,7 @@ Package: libpython2-stdlib ...@@ -268,7 +268,7 @@ Package: libpython2-stdlib
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Priority: optional Priority: optional
Depends: libpython2.7-stdlib (>= 2.7.15-1~), ${misc:Depends} Depends: libpython2.7-stdlib (>= 2.7.16-1~), ${misc:Depends}
Breaks: libpython-stdlib (<< 2.7.15-2) Breaks: libpython-stdlib (<< 2.7.15-2)
Replaces: libpython-stdlib (<< 2.7.15-2) Replaces: libpython-stdlib (<< 2.7.15-2)
Description: interactive high-level object-oriented language (Python2) Description: interactive high-level object-oriented language (Python2)
...@@ -283,7 +283,7 @@ Package: python2-doc ...@@ -283,7 +283,7 @@ Package: python2-doc
Section: doc Section: doc
Architecture: all Architecture: all
Multi-Arch: foreign Multi-Arch: foreign
Depends: ${misc:Depends}, python2.7-doc (>= 2.7.15-1~) Depends: ${misc:Depends}, python2.7-doc (>= 2.7.16-1~)
Suggests: python2 (= ${binary:Version}) Suggests: python2 (= ${binary:Version})
Breaks: python-doc (<< 2.7.15-2) Breaks: python-doc (<< 2.7.15-2)
Replaces: python-doc (<< 2.7.15-2) Replaces: python-doc (<< 2.7.15-2)
...@@ -309,7 +309,7 @@ Package: python2-dbg ...@@ -309,7 +309,7 @@ Package: python2-dbg
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Section: debug Section: debug
Depends: ${misc:Depends}, python2 (= ${binary:Version}), libpython2-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.15-1~) Depends: ${misc:Depends}, python2 (= ${binary:Version}), libpython2-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.16-1~)
Breaks: python-dbg (<< 2.7.15-2) Breaks: python-dbg (<< 2.7.15-2)
Replaces: python-dbg (<< 2.7.15-2) Replaces: python-dbg (<< 2.7.15-2)
Description: debug build of the Python2 interpreter (version 2.7) Description: debug build of the Python2 interpreter (version 2.7)
...@@ -320,7 +320,7 @@ Package: libpython2-dbg ...@@ -320,7 +320,7 @@ Package: libpython2-dbg
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Section: debug Section: debug
Depends: libpython2.7-dbg (>= 2.7.15-1~), ${misc:Depends} Depends: libpython2.7-dbg (>= 2.7.16-1~), ${misc:Depends}
Breaks: libpython-dbg (<< 2.7.15-2) Breaks: libpython-dbg (<< 2.7.15-2)
Replaces: libpython-dbg (<< 2.7.15-2) Replaces: libpython-dbg (<< 2.7.15-2)
Description: debug build of the Python2 interpreter (version 2.7) Description: debug build of the Python2 interpreter (version 2.7)
......
...@@ -2,12 +2,12 @@ Source: python-defaults ...@@ -2,12 +2,12 @@ Source: python-defaults
Section: python Section: python
Priority: optional Priority: optional
Maintainer: Matthias Klose <doko@debian.org> Maintainer: Matthias Klose <doko@debian.org>
Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org> Uploaders: Piotr Ożarowski <piotr@debian.org>
Build-Depends: debhelper (>= 9~), @bd_i586@, Build-Depends: debhelper (>= 9~), @bd_i586@,
lsb-release, lsb-release,
python-all:any, python-all:any,
@PVER@:any (>= @PREVVER@), @PVER@:any (>= @PREVVER@),
Standards-Version: 4.1.4 Standards-Version: 4.3.0
Homepage: https://www.python.org/ Homepage: https://www.python.org/
Vcs-Git: https://salsa.debian.org/cpython-team/python-defaults.git Vcs-Git: https://salsa.debian.org/cpython-team/python-defaults.git
Vcs-Browser: https://salsa.debian.org/cpython-team/python-defaults Vcs-Browser: https://salsa.debian.org/cpython-team/python-defaults
...@@ -39,7 +39,7 @@ Multi-Arch: allowed ...@@ -39,7 +39,7 @@ Multi-Arch: allowed
Priority: optional Priority: optional
Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20), python2-minimal (= ${binary:Version}) Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20), python2-minimal (= ${binary:Version})
Recommends: python Recommends: python
Conflicts: python-central (<< 0.5.5) Conflicts: python-central
Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2) Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2)
Replaces: python (<= 2.7.3-1~) Replaces: python (<= 2.7.3-1~)
Description: minimal subset of the Python2 language Description: minimal subset of the Python2 language
......
...@@ -24,13 +24,13 @@ export PVER=python2.7 ...@@ -24,13 +24,13 @@ export PVER=python2.7
PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog) PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
# first version with Multi-Arch: allowed # first version with Multi-Arch: allowed
PREVVER := 2.7.15-1~ PREVVER := 2.7.16-1~
# not yet allowed # not yet allowed
ma_allowed = yes ma_allowed = yes
ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty)) ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty))
bd_i586 = dpkg-dev (>= 1.17.11), python2.7:any (>= 2.7.15-1) bd_i586 = dpkg-dev (>= 1.17.11), python2.7:any (>= 2.7.16-1~)
endif endif
......
#! /usr/bin/python #! /usr/bin/python2
# -*- coding: UTF-8 -*- vim: et ts=4 sw=4 # -*- coding: UTF-8 -*- vim: et ts=4 sw=4
# Copyright © 2010-2012 Piotr Ożarowski <piotr@debian.org> # Copyright © 2010-2012 Piotr Ożarowski <piotr@debian.org>
......
...@@ -82,7 +82,7 @@ more strict dependencies (f.e. to avoid ABI problems) create ...@@ -82,7 +82,7 @@ more strict dependencies (f.e. to avoid ABI problems) create
debian/python\-foo.pydist file. See /usr/share/doc/python\-doc/README.PyDist debian/python\-foo.pydist file. See /usr/share/doc/python\-doc/README.PyDist
(provided by python\-doc package) for more information. If the pydist file (provided by python\-doc package) for more information. If the pydist file
contains PEP386 flag or set of (uscan like) rules, dh_python2 will make the contains PEP386 flag or set of (uscan like) rules, dh_python2 will make the
depedency versioned (version requirements are ignored by default). dependency versioned (version requirements are ignored by default).
.SS namespace feature .SS namespace feature
.sp .sp
dh_python2 parses Egg\(aqs namespace_packages.txt files (in addition to dh_python2 parses Egg\(aqs namespace_packages.txt files (in addition to
......
...@@ -52,7 +52,7 @@ more strict dependencies (f.e. to avoid ABI problems) create ...@@ -52,7 +52,7 @@ more strict dependencies (f.e. to avoid ABI problems) create
debian/python-foo.pydist file. See /usr/share/doc/python-doc/README.PyDist debian/python-foo.pydist file. See /usr/share/doc/python-doc/README.PyDist
(provided by python-doc package) for more information. If the pydist file (provided by python-doc package) for more information. If the pydist file
contains PEP386 flag or set of (uscan like) rules, dh_python2 will make the contains PEP386 flag or set of (uscan like) rules, dh_python2 will make the
depedency versioned (version requirements are ignored by default). dependency versioned (version requirements are ignored by default).
namespace feature namespace feature
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment