diff --git a/debian/changelog b/debian/changelog
index 8cf5dc36138e4ee8b4128f83dc70a40347ce8cde..b984c07e45f0cdc76ac2c717e74dc6b94209c1ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-defaults (2.6.6-12) UNRELEASED; urgency=low
+python-defaults (2.6.6-12) unstable; urgency=low
[ Piotr Ożarowski ]
* dh_python2:
@@ -8,7 +8,7 @@ python-defaults (2.6.6-12) UNRELEASED; urgency=low
- do not try to check dangling symlinks's shebang (closes: 619005)
[ Scott Kitterman ]
- * Start Python Policy updates for Wheezy
+ * Start Python Policy updates for Wheezy:
- Document current practice to not provide /usr/bin/python2
- Strengthen warning aginst using /usr/bin/env python
- Update paths section for python2.7 and python3
@@ -16,8 +16,11 @@ python-defaults (2.6.6-12) UNRELEASED; urgency=low
- Clarify use of {python:Provides}
- Clarify that build-dependencies on -dev packages should not be used
except when required
+ * Upload to unstable:
+ - Drop python2.7 from supported versions, not ready for Python transition
+ yet
- -- Piotr Ożarowski <piotr@debian.org> Fri, 18 Mar 2011 22:48:06 -0400
+ -- Scott Kitterman <scott@kitterman.com> Mon, 21 Mar 2011 10:22:06 -0400
python-defaults (2.6.6-11) experimental; urgency=low
@@ -116,6 +119,51 @@ python-defaults (2.6.6-4) experimental; urgency=low
-- Matthias Klose <doko@debian.org> Sat, 16 Oct 2010 11:58:31 +0200
+python-defaults (2.6.6-3+squeeze5) unstable; urgency=low
+
+ * dh_python2: fix moving files from old debug locations
+ * pycompile: skip dangling symlinks to fix upgrade problem introduced in
+ -3+squeeze3 (closes: 607988)
+
+ -- Piotr Ożarowski <piotr@debian.org> Tue, 11 Jan 2011 22:14:56 +0100
+
+python-defaults (2.6.6-3+squeeze4) unstable; urgency=medium
+
+ * dh_python2: fix a crash in packages with private extension (closes: 607555)
+
+ -- Piotr Ożarowski <piotr@debian.org> Sun, 19 Dec 2010 21:12:38 +0100
+
+python-defaults (2.6.6-3+squeeze3) unstable; urgency=medium
+
+ * pycompile:
+ - Don't over-optimize, check the timestamps of byte-code files.
+ - Add options -f/--force, -O.
+ - Propagate the exit value of the py_compile processes.
+ - Update manual page.
+ * Bump depends to require the fixed pycompile for dh_python2 based package
+ builds.
+ * Don't touch the standard python library in rtupdate scripts.
+
+ -- Matthias Klose <doko@debian.org> Sun, 12 Dec 2010 22:23:03 +0100
+
+python-defaults (2.6.6-3+squeeze2) unstable; urgency=low
+
+ * pycompile:
+ - `pycompile $DESTDIR/usr/lib/python*` will recognize public
+ site-packages directories and use the right interpreter instead of
+ raising KeyError
+ - do not try to check if interpreter is present when version range is
+ empty (closes: 605356)
+
+ -- Piotr Ożarowski <piotr@debian.org> Tue, 30 Nov 2010 19:57:51 +0100
+
+python-defaults (2.6.6-3+squeeze1) unstable; urgency=medium
+
+ * pycompile: if installed Python is requested via -V option, use it even if
+ it's not in a list of supported Python versions
+
+ -- Piotr Ożarowski <piotr@debian.org> Mon, 18 Oct 2010 19:04:55 +0200
+
python-defaults (2.6.6-3) unstable; urgency=low
* Upload to unstable
diff --git a/debian/control b/debian/control
index 3d4625e6b4f1ec57c87a859974b6f630de38337f..38fecbff620ee6119349c42fc2548dc22405058b 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Priority: standard
Depends: ${misc:Depends}, python2.6-minimal (>= 2.6.6-1~), dpkg (>= 1.13.20)
Recommends: python
Conflicts: python-central (<< 0.5.5)
-Breaks: python (<= 2.4-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.12)
+Breaks: python (<= 2.4-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)
Replaces: python (<= 2.4-1)
Description: minimal subset of the Python language (default version)
This package contains the interpreter and some essential modules. It's used
@@ -110,9 +110,9 @@ Description: debug build of the Python Interpreter (version 2.6)
Package: python-all
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.5 (>= 2.5.5-6), python2.6 (>= 2.6.5-2), python2.7 (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.5 (>= 2.5.5-6), python2.6 (>= 2.6.5-2)
Description: package depending on all supported Python runtime versions
- The package currently depends on python2.5, python2.6 and python2.7, in the future,
+ The package currently depends on python2.5 and python2.6, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
@@ -121,9 +121,9 @@ Description: package depending on all supported Python runtime versions
Package: python-all-dev
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.5-dev (>= 2.5.5-6), python2.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.5-dev (>= 2.5.5-6), python2.6-dev (>= 2.6.5-2)
Description: package depending on all supported Python development packages
- The package currently depends on python2.5-dev, python2.6-dev and python2.7-dev, in the
+ The package currently depends on python2.5-dev and python2.6-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
@@ -134,9 +134,9 @@ Package: python-all-dbg
Architecture: all
Section: debug
Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.5-dbg (>= 2.5.5-6), python2.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.5-dbg (>= 2.5.5-6), python2.6-dbg (>= 2.6.5-2)
Description: package depending on all supported Python debugging packages
- The package currently depends on python2.5-dbg, python2.6-dbg and python2.7-dbg, in the
+ The package currently depends on python2.5-dbg and python2.6-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
diff --git a/debian/control.in b/debian/control.in
index a248ce6c1c19cb6c0975e5a55fca25d396c3ada4..a90bdb74cbda2bf15f2508f906370b194831e382 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,7 +33,7 @@ Priority: standard
Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20)
Recommends: python
Conflicts: python-central (<< 0.5.5)
-Breaks: python (<= 2.4-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.12)
+Breaks: python (<= 2.4-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)
Replaces: python (<= 2.4-1)
Description: minimal subset of the Python language (default version)
This package contains the interpreter and some essential modules. It's used
@@ -110,9 +110,9 @@ Description: debug build of the Python Interpreter (version @VER@)
Package: python-all
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python2.5 (>= 2.5.5-6), python2.6 (>= 2.6.5-2), python2.7 (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python2.5 (>= 2.5.5-6), python2.6 (>= 2.6.5-2)
Description: package depending on all supported Python runtime versions
- The package currently depends on python2.5, python2.6 and python2.7, in the future,
+ The package currently depends on python2.5 and python2.6, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
@@ -121,9 +121,9 @@ Description: package depending on all supported Python runtime versions
Package: python-all-dev
Architecture: all
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.5-dev (>= 2.5.5-6), python2.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.5-dev (>= 2.5.5-6), python2.6-dev (>= 2.6.5-2)
Description: package depending on all supported Python development packages
- The package currently depends on python2.5-dev, python2.6-dev and python2.7-dev, in the
+ The package currently depends on python2.5-dev and python2.6-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
@@ -134,9 +134,9 @@ Package: python-all-dbg
Architecture: all
Section: debug
Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.5-dbg (>= 2.5.5-6), python2.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)
+Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.5-dbg (>= 2.5.5-6), python2.6-dbg (>= 2.6.5-2)
Description: package depending on all supported Python debugging packages
- The package currently depends on python2.5-dbg, python2.6-dbg and python2.7-dbg, in the
+ The package currently depends on python2.5-dbg and python2.6-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
diff --git a/debian/debian_defaults b/debian/debian_defaults
index 62f7353ff9fa8500a25c90889097e3eb5d96f4fd..60564eb0bc99df5d7e7d25e6fd149c0bab44b889 100644
--- a/debian/debian_defaults
+++ b/debian/debian_defaults
@@ -3,7 +3,7 @@
default-version = python2.6
# all supported python versions
-supported-versions = python2.5, python2.6, python2.7
+supported-versions = python2.5, python2.6
# formerly supported python versions
old-versions = python2.3, python2.4
diff --git a/debian/python.postinst.in b/debian/python.postinst.in
index 826d9cec5b73f6a360b46d897b7261d60aeb432a..a00cd24caffa27aca6f47f6bb5e4cac4e8d68dc9 100644
--- a/debian/python.postinst.in
+++ b/debian/python.postinst.in
@@ -39,18 +39,6 @@ case "$1" in
done
fi
- # run the rtinstall script, when 2.7 became a supported version
- if [ -x /usr/bin/python2.7 ] && [ -n "$2" ] && dpkg --compare-versions $2 lt 2.6.6-4; then
- if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
- echo "Linking and byte-compiling packages for runtime python2.7..."
- fi
- version=$(dpkg -s python2.7-minimal | awk '/^Version:/ {print $2}')
- for hook in /usr/share/python/runtime.d/*.rtinstall; do
- [ -x $hook ] || continue
- $hook rtinstall python2.7 "$2" "$version"
- done
- fi
-
if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.6.4-1~; then
oldv=$(echo $2 | sed 's/^\(...\).*/\1/')
if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
@@ -108,22 +96,7 @@ case "$1" in
$hook rtinstall python2.6 "$oldversion" "$newversion"
done
fi
- rm -f /var/lib/python/python2.6_already_installed
-
- if [ -f /var/lib/python/python2.7_already_installed ] \
- && [ ! -f /var/lib/python/python2.7_installed ]
- then
- if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
- echo "Linking and byte-compiling packages for runtime python2.7..."
- fi
- oldversion=$(cat /var/lib/python/python2.7_already_installed)
- newversion=$(dpkg -s python2.7-minimal | awk '/^Version:/ {print $2}')
- for hook in /usr/share/python/runtime.d/*.rtinstall; do
- [ -x $hook ] || continue
- $hook rtinstall python2.7 "$oldversion" "$newversion"
- done
- fi
- rm -f /var/lib/python/python2.7_already_installed
+ rm -f /var/lib/python/python2.5_already_installed
rmdir --ignore-fail-on-non-empty /var/lib/python 2>/dev/null || true
esac
diff --git a/debian/python.preinst.in b/debian/python.preinst.in
index 47c7290bd3ca918db2e028cdeb79f4431b51ff28..720a6feea7bfead3e2d5b7dc17963ad2224de4c6 100644
--- a/debian/python.preinst.in
+++ b/debian/python.preinst.in
@@ -46,14 +46,6 @@ case "$1" in
mkdir -p /var/lib/python
echo "$version" > /var/lib/python/python2.6_already_installed
fi
-
- # 2.6.6-4 is the first version, which adds python2.7 as supported
- # version; need to run an rtinstall python2.7 in the postinst.
- if dpkg --compare-versions $2 lt 2.6.6-4 && [ -x /usr/bin/python2.7 ]; then
- version=$(dpkg -s python2.7-minimal | awk '/^Version:/ {print $2}')
- mkdir -p /var/lib/python
- echo "$version" > /var/lib/python/python2.7_already_installed
- fi
esac
#DEBHELPER#
diff --git a/debpython/version.py b/debpython/version.py
index 7a858cb65fc1da3979ef8797bab4716a4a30fbf1..4afb96223ca4367350110d0d5c971e636e8f10a6 100644
--- a/debpython/version.py
+++ b/debpython/version.py
@@ -26,7 +26,7 @@ from os.path import exists, dirname, join
from types import GeneratorType
# will be overriden via debian_defaults file few lines later
-SUPPORTED = [(2, 5), (2, 6), (2, 7)]
+SUPPORTED = [(2, 5), (2, 6)]
DEFAULT = (2, 6)
RANGE_PATTERN = r'(-)?(\d\.\d+)(?:(-)(\d\.\d+)?)?'
@@ -61,7 +61,7 @@ def get_requested_versions(vrange=None, available=None):
:type available: bool
>>> sorted(get_requested_versions([(2, 5), (3, 0)]))
- [(2, 5), (2, 6), (2, 7)]
+ [(2, 5), (2, 6)]
>>> sorted(get_requested_versions('')) == sorted(SUPPORTED)
True
>>> sorted(get_requested_versions([None, None])) == sorted(SUPPORTED)