diff --git a/debian/changelog b/debian/changelog index a0fcdf1bfecf1f2d91dd564945b1547c12c94584..3ae4aa7fbfba4c71f31eeb3bbf81553aebd0451e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-defaults (2.7.5-1) UNRELEASED; urgency=low + + * Bump version to 2.7.5. + * Drop python2.6 as a supported python version. + * Bump standards version to 3.9.4. + * Start building the libpython-stdlib, libpython-all-dev, libpython-all-dbg + packages. + + -- Matthias Klose <doko@debian.org> Wed, 15 May 2013 21:55:11 +0200 + python-defaults (2.7.3-13) experimental; urgency=low * Always build the policy files. @@ -29,6 +39,12 @@ python-defaults (2.7.3-10) experimental; urgency=low -- Matthias Klose <doko@debian.org> Wed, 12 Dec 2012 00:25:00 +0100 +python-defaults (2.7.3-5) unstable; urgency=low + + * Drop Python 2.6 as a supported Python version. + + -- Matthias Klose <doko@debian.org> Mon, 06 May 2013 02:48:48 +0200 + python-defaults (2.7.3-4) unstable; urgency=low [ Dmitry Shachnev ] diff --git a/debian/control b/debian/control index b5d0ede568ba04ec1160c92ae9110d1e3e4a4615..5ebbe853958c372b753c01fd6ea433e3da5f2f6a 100644 --- a/debian/control +++ b/debian/control @@ -5,17 +5,16 @@ Maintainer: Matthias Klose <doko@debian.org> Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org> Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3), libhtml-tree-perl, debiandoc-sgml, lsb-release -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.python.org/ Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/files Package: python Architecture: any -Multi-Arch: allowed Priority: standard -Depends: ${misc:Depends}, python2.7 (>= 2.7.3-10~), python-minimal (= ${binary:Version}) -#Depends: ${misc:Depends}, python2.7 (>= 2.7.3-10~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version}) +Depends: ${misc:Depends}, python2.7 (>= 2.7.5-1~), python-minimal (= ${binary:Version}) +#Depends: ${misc:Depends}, python2.7 (>= 2.7.5-1~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version}) Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version}) Conflicts: python-central (<< 0.5.5) Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3), update-manager-core (<< 0.200.5-2) @@ -31,9 +30,8 @@ Description: interactive high-level object-oriented language (default version) Package: python-minimal Architecture: any -Multi-Arch: allowed Priority: standard -Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.3-10~), dpkg (>= 1.13.20) +Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.5-1~), dpkg (>= 1.13.20) Recommends: python 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) @@ -46,7 +44,7 @@ Description: minimal subset of the Python language (default version) Package: python-examples Architecture: all -Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-examples (>= 2.7.3-10~) +Depends: ${misc:Depends}, python (= ${binary:Version}), python2.7-examples (>= 2.7.5-1~) Description: examples for the Python language (default version) Examples, Demos and Tools for Python. These are files included in the upstream Python distribution. @@ -56,8 +54,7 @@ Description: examples for the Python language (default version) Package: python-dev Architecture: any -Multi-Arch: allowed -Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.3-10~) +Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.5-1~) Description: header files and a static library for Python (default) Header files, a static library and development tools for building Python modules, extending the Python interpreter or embedding Python @@ -69,7 +66,7 @@ Description: header files and a static library for Python (default) Package: libpython-dev Architecture: any Multi-Arch: same -Depends: libpython2.7-dev (>= 2.7.3-10~), ${misc:Depends} +Depends: libpython2.7-dev (>= 2.7.5-1~), ${misc:Depends} Description: header files and a static library for Python (default) Header files, a static library and development tools for building Python modules, extending the Python interpreter or embedding Python @@ -78,17 +75,17 @@ Description: header files and a static library for Python (default) This package is a dependency package, which depends on Debian's default Python version (currently v2.7). -#Package: libpython-stdlib -#Architecture: any -#Multi-Arch: same -#Depends: libpython2.7-stdlib (>= 2.7.3-10~), ${misc:Depends} -#Description: interactive high-level object-oriented language (default python version) -# Python, the high-level, interactive object oriented language, -# includes an extensive class library with lots of goodies for -# network programming, system administration, sounds and graphics. -# . -# This package is a dependency package, which depends on Debian's default -# Python version (currently v2.7). +Package: libpython-stdlib +Architecture: any +Multi-Arch: same +Depends: libpython2.7-stdlib (>= 2.7.5-1~), ${misc:Depends} +Description: interactive high-level object-oriented language (default python version) + Python, the high-level, interactive object oriented language, + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package is a dependency package, which depends on Debian's default + Python version (currently v2.7). Package: idle Architecture: all @@ -106,7 +103,7 @@ Description: IDE for Python using Tkinter (default version) Package: python-doc Section: doc Architecture: all -Depends: ${misc:Depends}, python2.7-doc (>= 2.7.3-10~) +Depends: ${misc:Depends}, python2.7-doc (>= 2.7.5-1~) Suggests: python-examples, python (= ${binary:Version}) Breaks: python (<< 2.3.5) Replaces: python (<< 2.3.5) @@ -130,10 +127,9 @@ Description: documentation for the high-level object-oriented language Python Package: python-dbg Architecture: any -Multi-Arch: allowed Section: debug Priority: extra -Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~) +Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.5-1~) Description: debug build of the Python Interpreter (version 2.7) Python interpreter configured with --pydebug. Dynamically loaded modules are searched in /usr/lib/python2.7/lib-dynload/debug first. @@ -143,7 +139,7 @@ Architecture: any Multi-Arch: same Section: debug Priority: extra -Depends: libpython2.7-dbg (>= 2.7.3-10~), ${misc:Depends} +Depends: libpython2.7-dbg (>= 2.7.5-1~), ${misc:Depends} Description: debug build of the Python Interpreter (version 2.7) Python interpreter configured with --pydebug. Dynamically loaded modules are searched in /usr/lib/python2.7/lib-dynload/debug first. @@ -183,31 +179,31 @@ Description: package depending on all supported Python debugging packages This package is used as a build dependency for other packages to avoid hardcoded dependencies on specific Python development packages. -#Package: libpython-all-dev -#Architecture: any -#Multi-Arch: same -#Depends: libpython-dev (= ${binary:Version}), ${misc:Depends}, -# libpython2.7-dev -#Description: package depending on all supported Python development packages -# The package currently depends on libpython2.7-dev, in the -# future, dependencies on jython (Python for a JVM) and ironpython (Python -# for Mono) may be added. -# . -# This package is a dependency package used as a build dependency for other -# packages to avoid hardcoded dependencies on specific Python development -# packages. +Package: libpython-all-dev +Architecture: any +Multi-Arch: same +Depends: libpython-dev (= ${binary:Version}), ${misc:Depends}, + libpython2.7-dev +Description: package depending on all supported Python development packages + The package currently depends on libpython2.7-dev, in the + future, dependencies on jython (Python for a JVM) and ironpython (Python + for Mono) may be added. + . + This package is a dependency package used as a build dependency for other + packages to avoid hardcoded dependencies on specific Python development + packages. -#Package: libpython-all-dbg -#Architecture: any -#Multi-Arch: same -#Section: debug -#Priority: extra -#Depends: libpython-dbg (= ${binary:Version}), ${misc:Depends}, -# libpython2.7-dbg -#Description: package depending on all supported Python debugging packages -# The package currently depends on libpython2.7-dbg, in the -# future, dependencies on jython (Python for a JVM) and ironpython (Python -# for Mono) may be added. -# . -# This package is a dependency package used as a build dependency for other -# packages to avoid hardcoded dependencies on specific Python debug packages. +Package: libpython-all-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: libpython-dbg (= ${binary:Version}), ${misc:Depends}, + libpython2.7-dbg +Description: package depending on all supported Python debugging packages + The package currently depends on libpython2.7-dbg, in the + future, dependencies on jython (Python for a JVM) and ironpython (Python + for Mono) may be added. + . + This package is a dependency package used as a build dependency for other + packages to avoid hardcoded dependencies on specific Python debug packages. diff --git a/debian/control.in b/debian/control.in index 5098e2c38b841a79ccf9b94ec3236d917052f97b..f0943b4db0e43c8f507d935c232e30e20aebd33d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,7 +5,7 @@ Maintainer: Matthias Klose <doko@debian.org> Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org> Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3), libhtml-tree-perl, debiandoc-sgml, lsb-release -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.python.org/ Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian Vcs-Browser: http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/files @@ -78,17 +78,17 @@ Description: header files and a static library for Python (default) This package is a dependency package, which depends on Debian's default Python version (currently v@VER@). -#Package: libpython-stdlib -#Architecture: any -#Multi-Arch: same -#Depends: libpython@VER@-stdlib (>= @PREVVER@), ${misc:Depends} -#Description: interactive high-level object-oriented language (default python version) -# Python, the high-level, interactive object oriented language, -# includes an extensive class library with lots of goodies for -# network programming, system administration, sounds and graphics. -# . -# This package is a dependency package, which depends on Debian's default -# Python version (currently v@VER@). +Package: libpython-stdlib +Architecture: any +Multi-Arch: same +Depends: libpython@VER@-stdlib (>= @PREVVER@), ${misc:Depends} +Description: interactive high-level object-oriented language (default python version) + Python, the high-level, interactive object oriented language, + includes an extensive class library with lots of goodies for + network programming, system administration, sounds and graphics. + . + This package is a dependency package, which depends on Debian's default + Python version (currently v@VER@). Package: idle Architecture: all @@ -183,31 +183,31 @@ Description: package depending on all supported Python debugging packages This package is used as a build dependency for other packages to avoid hardcoded dependencies on specific Python development packages. -#Package: libpython-all-dev -#Architecture: any -#Multi-Arch: same -#Depends: libpython-dev (= ${binary:Version}), ${misc:Depends}, -# libpython2.7-dev -#Description: package depending on all supported Python development packages -# The package currently depends on libpython2.7-dev, in the -# future, dependencies on jython (Python for a JVM) and ironpython (Python -# for Mono) may be added. -# . -# This package is a dependency package used as a build dependency for other -# packages to avoid hardcoded dependencies on specific Python development -# packages. +Package: libpython-all-dev +Architecture: any +Multi-Arch: same +Depends: libpython-dev (= ${binary:Version}), ${misc:Depends}, + libpython2.7-dev +Description: package depending on all supported Python development packages + The package currently depends on libpython2.7-dev, in the + future, dependencies on jython (Python for a JVM) and ironpython (Python + for Mono) may be added. + . + This package is a dependency package used as a build dependency for other + packages to avoid hardcoded dependencies on specific Python development + packages. -#Package: libpython-all-dbg -#Architecture: any -#Multi-Arch: same -#Section: debug -#Priority: extra -#Depends: libpython-dbg (= ${binary:Version}), ${misc:Depends}, -# libpython2.7-dbg -#Description: package depending on all supported Python debugging packages -# The package currently depends on libpython2.7-dbg, in the -# future, dependencies on jython (Python for a JVM) and ironpython (Python -# for Mono) may be added. -# . -# This package is a dependency package used as a build dependency for other -# packages to avoid hardcoded dependencies on specific Python debug packages. +Package: libpython-all-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: libpython-dbg (= ${binary:Version}), ${misc:Depends}, + libpython2.7-dbg +Description: package depending on all supported Python debugging packages + The package currently depends on libpython2.7-dbg, in the + future, dependencies on jython (Python for a JVM) and ironpython (Python + for Mono) may be added. + . + This package is a dependency package used as a build dependency for other + packages to avoid hardcoded dependencies on specific Python debug packages. diff --git a/debian/debian_defaults b/debian/debian_defaults index ddb5386c04da3427b9f03809f277b05727f9f39b..605cdab1ca1477b2b2bcb395b97dfaf823cfb5ba 100644 --- a/debian/debian_defaults +++ b/debian/debian_defaults @@ -3,10 +3,10 @@ default-version = python2.7 # all supported python versions -supported-versions = python2.6, python2.7 +supported-versions = python2.7 # formerly supported python versions -old-versions = python2.3, python2.4, python2.5 +old-versions = python2.3, python2.4, python2.5, python2.6 # unsupported versions, including older versions -unsupported-versions = python2.3, python2.4, python2.5 +unsupported-versions = python2.3, python2.4, python2.5, python2.6 diff --git a/debian/rules b/debian/rules index b9046640e36af88f9cdd8f1e591fa708f73872c2..3a893d7a5f268831c3b42d6bcad7050b20c47b45 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,10 @@ export PVER=python2.7 PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog) # first version with Multi-Arch: allowed -PREVVER := 2.7.3-10~ +PREVVER := 2.7.5-1~ + +# not yet allowed +#ma_allowed = yes PWD := $(shell pwd) @@ -61,7 +64,9 @@ control-file: -e "s/@NVER@/$(NVER)/g" \ -e "s/@VER@/$(VER)/g" \ -e "s/@PREVVER@/$(PREVVER)/g" \ - <debian/control.in >debian/control.tmp + <debian/control.in \ + $(if $(ma_allowed),,| grep -v '^Multi-Arch: allowed$$') \ + >debian/control.tmp ifeq ($(distribution),Ubuntu) ifneq (,$(findstring ubuntu, $(PKGVERSION))) m='Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>'; \ diff --git a/debpython/version.py b/debpython/version.py index 23d2503766cdf0a36317d3514d3b333a199c971a..68ba9cd62f4f26b0bfab10516cbfaddd8f254857 100644 --- a/debpython/version.py +++ b/debpython/version.py @@ -27,7 +27,7 @@ from os.path import exists, dirname, join from types import GeneratorType # will be overriden via debian_defaults file few lines later -SUPPORTED = [(2, 6), (2, 7)] +SUPPORTED = [(2, 7)] DEFAULT = (2, 7) RANGE_PATTERN = r'(-)?(\d\.\d+)(?:(-)(\d\.\d+)?)?'