diff --git a/debian/changelog b/debian/changelog
index 889aa2b9611c9eabcc87b87f866844f4e32ddf84..6f35d7e7ed522edfc649e9164e8c139c11e5b221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,8 @@
-python-defaults (2.5.4-6) unstable; urgency=low
-
- * Add python2.6 as a supported Python version.
- * python-all{,-dev,-dbg}: Depend on the 2.6 packages.
- * Run the rtinstall script, when 2.5 became a supported version (2.4.4-3)
- and python2.5 is installed.
- * Run the rtinstall script, when 2.6 became a supported version (2.5.4-6)
- and python2.6 is installed. Closes: #565952.
- * Fix reference to list of modules in the python-minimal package.
- Closes: #558403.
-
- -- Matthias Klose <doko@debian.org> Sun, 17 Jan 2010 01:38:21 +0100
-
-python-defaults (2.5.4-5) unstable; urgency=low
-
- * Fix typos from policy update (Closes: #561091, #561093)
- * Drop python2.4 as a supported Python
- - Remove python2.4 depends and update descriptions for python-all,
- python-all-dev, and python-all-dbg
- - Drop python2.4 from supported versions and add to old and unsupported
- versions
- - Update pyversions.py to drop python2.4 from the supported list
- * Correct path to Konsole Python desktop file (Closes: #381659)
-
- -- Scott Kitterman <scott@kitterman.com> Wed, 23 Dec 2009 19:59:15 -0500
+python-defaults (2.5.4-7) experimental; urgency=low
+
+ * Add 2.6 as a supported version, remove 2.4 as a supported version.
+
+ -- Scott Kitterman <scott@kitterman.com> Mon, 14 Dec 2009 09:55:33 -0500
python-defaults (2.5.4-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5aec88db27ef55175a2a6db4539af25f4d372f84..74b1c5d10457ef97aa471064238eb5d214c5b301 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.8.3
Package: python
Architecture: all
Priority: standard
-Depends: python2.5 (>= 2.5.4), python-minimal (>= ${binary:Version})
+Depends: python2.5-1 (>= 2.5.4), python-minimal (>= ${binary:Version})
Conflicts: python2.3 (<< 2.3.5-14), python2.1 (<= 2.1.2), python-xmlbase, python-csv, python-bz2, python-base, python-central (<< 0.5.5)
Replaces: python2.3 (<= 2.3.2-6), python-xmlbase, python-base
Provides: python-email, python-xmlbase, python-plistlib, python-ctypes, python-wsgiref
@@ -26,19 +26,19 @@ Description: An interactive high-level object-oriented language (default version
Package: python-minimal
Architecture: all
Priority: standard
-Depends: python2.5-minimal (>= 2.5.4), dpkg (>= 1.13.20)
+Depends: python2.5-1-minimal (>= 2.5.4), dpkg (>= 1.13.20)
Conflicts: python (<= 2.4-1), python-central (<< 0.5.5)
Replaces: python (<= 2.4-1)
Recommends: python
Description: A minimal subset of the Python language (default version)
This package contains the interpreter and some essential modules. It's used
in the boot process for some basic tasks.
- See /usr/share/doc/python2.5-minimal/README.Debian for a list of the modules
+ See /usr/share/doc/python-minimal/README.Debian for a list of the modules
contained in this package.
Package: python-examples
Architecture: all
-Depends: python (>= ${binary:Version}), python2.5-examples (>= 2.5.4)
+Depends: python (>= ${binary:Version}), python2.5-1-examples (>= 2.5.4)
Description: Examples for the Python language (default version)
Examples, Demos and Tools for Python. These are files included in
the upstream Python distribution.
@@ -48,7 +48,7 @@ Description: Examples for the Python language (default version)
Package: python-dev
Architecture: all
-Depends: python (>= ${binary:Version}), python2.5-dev (>= 2.5.4)
+Depends: python (>= ${binary:Version}), python2.5-1-dev (>= 2.5.4)
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
@@ -62,7 +62,7 @@ Description: Header files and a static library for Python (default)
Package: idle
Architecture: all
-Depends: python (>= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.5
+Depends: python (>= ${binary:Version}), python-tk (>= 2.4.3-3), idle-python2.5-1
Enhances: python
Description: An IDE for Python using Tkinter (default version)
IDLE is an Integrated Development Environment for Python.
@@ -71,31 +71,6 @@ Description: An IDE for Python using Tkinter (default version)
This package is a dependency package, which depends on Debian's default
Python version (currently v2.5) of IDLE.
-#Package: python-doc
-#Section: doc
-#Architecture: all
-#Depends: python2.5-doc (>= 2.5.4)
-#Suggests: python (>= ${binary:Version})
-#Conflicts: python-doc-info, python (<< 2.3.5)
-#Replaces: python-doc-info, python (<< 2.3.5)
-#Description: Documentation for the high-level object-oriented language Python
-# This is the official set of documentation for the interactive high-level
-# object-oriented language Python (v2.5). All documents are provided
-# in HTML format, some in info format. The package consists of nine documents:
-# .
-# * Tutorial
-# * Python Library Reference
-# * Macintosh Module Reference
-# * Python Language Reference
-# * Extending and Embedding Python
-# * Python/C API Reference
-# * Installing Python Modules
-# * Documenting Python
-# * Distributing Python Modules
-# .
-# This package is a dependency package, which depends on Debian's default
-# Python version (currently v2.5).
-
Package: python-dbg
Architecture: all
Section: debug
@@ -109,7 +84,7 @@ Description: Debug Build of the Python Interpreter (version 2.5)
Package: python-all
Architecture: all
Priority: optional
-Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1), python2.6 (>= 2.6.4-2)
+Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1), python2.6 (>= 2.6.1-1)
Description: Package depending on all supported Python runtime versions
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)
@@ -121,7 +96,7 @@ Description: Package depending on all supported Python runtime versions
Package: python-all-dev
Architecture: all
Priority: optional
-Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dev (>= ${binary:Version}), python2.5-dev (>= 2.5.4-1), python2.5-dev (>= 2.6.4-2)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dev (>= ${binary:Version}), python2.5-dev (>= 2.5.4-1), python2.6-dev (>= 2.6.1-1)
Description: Package depending on all supported Python development packages
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
@@ -134,9 +109,9 @@ Package: python-all-dbg
Architecture: all
Section: debug
Priority: extra
-Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dbg (>= ${binary:Version}), python2.5-dbg (>= 2.5.4-1), python2.6-dbg (>= 2.6.4-2)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dbg (>= ${binary:Version}), python2.5-dbg (>= 2.5.4-1), python2.6-dbg (>= 2.6.1-1)
Description: Package depending on all supported Python debugging packages
- The package currently depends on python2.5-dbg and python2.6-dbg, in the
+ The package currently depends on python2.4-dbg and python2.5-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 cb042aa9b74a574fad375d772f3666b293627819..e9ec17baf0da7bbeee8201f8e9841253b3338f66 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,7 +33,7 @@ Recommends: python
Description: A minimal subset of the Python language (default version)
This package contains the interpreter and some essential modules. It's used
in the boot process for some basic tasks.
- See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules
+ See /usr/share/doc/python-minimal/README.Debian for a list of the modules
contained in this package.
Package: python-examples
@@ -71,31 +71,6 @@ Description: An IDE for Python using Tkinter (default version)
This package is a dependency package, which depends on Debian's default
Python version (currently v@VER@) of IDLE.
-#Package: python-doc
-#Section: doc
-#Architecture: all
-#Depends: python@VER@-doc (>= @PREVVER@)
-#Suggests: python (>= ${binary:Version})
-#Conflicts: python-doc-info, python (<< 2.3.5)
-#Replaces: python-doc-info, python (<< 2.3.5)
-#Description: Documentation for the high-level object-oriented language Python
-# This is the official set of documentation for the interactive high-level
-# object-oriented language Python (v@VER@). All documents are provided
-# in HTML format, some in info format. The package consists of nine documents:
-# .
-# * Tutorial
-# * Python Library Reference
-# * Macintosh Module Reference
-# * Python Language Reference
-# * Extending and Embedding Python
-# * Python/C API Reference
-# * Installing Python Modules
-# * Documenting Python
-# * Distributing Python Modules
-# .
-# This package is a dependency package, which depends on Debian's default
-# Python version (currently v@VER@).
-
Package: python-dbg
Architecture: all
Section: debug
@@ -109,7 +84,7 @@ Description: Debug Build of the Python Interpreter (version @VER@)
Package: python-all
Architecture: all
Priority: optional
-Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1), python2.6 (>= 2.6.4-2)
+Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1), python2.6 (>= 2.6.1-1)
Description: Package depending on all supported Python runtime versions
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)
@@ -121,7 +96,7 @@ Description: Package depending on all supported Python runtime versions
Package: python-all-dev
Architecture: all
Priority: optional
-Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dev (>= ${binary:Version}), python2.5-dev (>= 2.5.4-1), python2.5-dev (>= 2.6.4-2)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dev (>= ${binary:Version}), python2.5-dev (>= 2.5.4-1), python2.6-dev (>= 2.6.1-1)
Description: Package depending on all supported Python development packages
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
@@ -134,9 +109,9 @@ Package: python-all-dbg
Architecture: all
Section: debug
Priority: extra
-Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dbg (>= ${binary:Version}), python2.5-dbg (>= 2.5.4-1), python2.6-dbg (>= 2.6.4-2)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dbg (>= ${binary:Version}), python2.5-dbg (>= 2.5.4-1), python2.6-dbg (>= 2.6.1-1)
Description: Package depending on all supported Python debugging packages
- The package currently depends on python2.5-dbg and python2.6-dbg, in the
+ The package currently depends on python2.4-dbg and python2.5-dbg, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
diff --git a/debian/python-policy.sgml b/debian/python-policy.sgml
index 2676bf79f48724627d6e2f805c3eca12bf56c5a9..6c2d9d16c681a8f81b3374acc087cc25b8ef1cf4 100644
--- a/debian/python-policy.sgml
+++ b/debian/python-policy.sgml
@@ -394,13 +394,13 @@
<p>
Public modules used by other packages must have their binary
package name prefixed with <var>python-</var>. It is recommended
- to use this prefix for all packages with public modules as they may
- be used by other packages in the future.
+ to use this prefix for all packages with public modules as they be
+ used by other packages in the future.
The binary package for module foo should preferably be named
<package>python-<var>foo</var></package>, if the module name
allows, but this is not required if the binary package ships
- multiple modules. In the latter case the maintainer chooses the
+ multiple modules. In the latter case the maintainer choses the
name of the module which represents the package the most.
Such a package should support the current Debian Python version,
diff --git a/debian/python.desktop b/debian/python.desktop
index 5f03cdfa23c4f13d04c7a6bc54a5d7f97f443346..27459642abcf26b9ffe444c7bf5384f2894bc66e 100644
--- a/debian/python.desktop
+++ b/debian/python.desktop
@@ -3,4 +3,4 @@ Type=KonsoleApplication
Name=Python Interpreter
Comment=Python
Exec=/usr/bin/python
-Icon=/usr/share/pixmaps/python.xpm
+Icon=/usr/share/pixmaps/python2.3-32.xpm
diff --git a/debian/python.postinst.in b/debian/python.postinst.in
index 9c50a94bd0b78b1d66c9c0614d245bfe62b7cc8c..035d1bdab6c872e645b3caa8a66d4f38860471d5 100644
--- a/debian/python.postinst.in
+++ b/debian/python.postinst.in
@@ -14,30 +14,6 @@ case "$1" in
[ -d /etc/python ] || mkdir /etc/python
[ -f /etc/python/debian_config ] || new_config_file
- # run the rtinstall script, when 2.5 became a supported version
- if [ -x /usr/bin/python2.5 ] && [ -n "$2" ] && dpkg --compare-versions $2 lt 2.4.4-3; then
- if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
- echo "Linking and byte-compiling packages for runtime @PVER@..."
- fi
- version=$(dpkg -s python2.5-minimal | awk '/^Version:/ {print $2}')
- for hook in /usr/share/python/runtime.d/*.rtinstall; do
- [ -x $hook ] || continue
- $hook rtinstall python2.5 "$2" "$version"
- done
- fi
-
- # run the rtinstall script, when 2.6 became a supported version
- if [ -x /usr/bin/python2.6 ] && [ -n "$2" ] && dpkg --compare-versions $2 lt 2.5.4-6; then
- if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
- echo "Linking and byte-compiling packages for runtime @PVER@..."
- fi
- version=$(dpkg -s python2.6-minimal | awk '/^Version:/ {print $2}')
- for hook in /usr/share/python/runtime.d/*.rtinstall; do
- [ -x $hook ] || continue
- $hook rtinstall python2.6 "$2" "$version"
- done
- fi
-
if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.5.2-1; then
oldv=$(echo $2 | sed 's/^\(...\).*/\1/')
if [ "$DEBIAN_FRONTEND" != noninteractive ]; then
diff --git a/debian/pyversions.py b/debian/pyversions.py
index c98166ca783aa7482d1cb6cddeb016e2f9812098..db8d7554d705ac8ec255998f88b6974337fcbd69 100644
--- a/debian/pyversions.py
+++ b/debian/pyversions.py
@@ -128,7 +128,7 @@ def supported_versions(version_only=False):
if not _supported_versions:
# last resort: python-minimal not installed, apt-cache
# not available, hard code the value, #394084
- _supported_versions = ['python2.5',]
+ _supported_versions = ['python2.4', 'python2.5']
if version_only:
return [v[6:] for v in _supported_versions]
else:
diff --git a/debian/rules b/debian/rules
index 3752fe346e90f6db06fad303d09846513a583e80..bcd89d1b0d899bb2c8c79539cd17aaaa8f7a262b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ distribution := $(shell lsb_release -is)
export VER=2.5
export NVER=2.6
-export PVER=python2.5
+export PVER=python2.5-1
PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog)
PREVVER := 2.5.4