diff --git a/debian/changelog b/debian/changelog
index 818809628d01fd4053e21fea41bf9b4066aae9c0..c840be155de7eec64c84c935198a0247cf9c789c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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-4) unstable; urgency=low
[ Scott Kitterman ]
diff --git a/debian/control b/debian/control
index c01948f19abec805bbd8d569e3ad49a4dbcc2d64..87f26f55c9731a989d33a0d1a924854875655418 100644
--- a/debian/control
+++ b/debian/control
@@ -84,9 +84,9 @@ Description: Debug Build of the Python Interpreter (version 2.5)
Package: python-all
Architecture: all
Priority: optional
-Depends: python (>= ${binary:Version}), python2.4 (>= 2.4.6-2), python2.5 (>= 2.5.4-1)
+Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1)
Description: Package depending on all supported Python runtime versions
- The package currently depends on python2.4 and python2.5, in the future,
+ The package currently depends on python2.5, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
@@ -96,9 +96,9 @@ 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.4-dev (>= 2.4.6-2), python2.5-dev (>= 2.5.4-1)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dev (>= ${binary:Version}), python2.5-dev (>= 2.5.4-1)
Description: Package depending on all supported Python development packages
- The package currently depends on python2.4-dev and python2.5-dev, in the
+ The package currently depends on python2.5-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
@@ -109,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.4-dbg (>= 2.4.6-2), python2.5-dbg (>= 2.5.4-1)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dbg (>= ${binary:Version}), python2.5-dbg (>= 2.5.4-1)
Description: Package depending on all supported Python debugging packages
- The package currently depends on python2.4-dbg and python2.5-dbg, in the
+ The package currently depends on 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 467af2b3f2b93002e2648944f05bf7c46bb8ea53..dfbe89d612ed527ad62889eea4e431eec855e694 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -84,9 +84,9 @@ Description: Debug Build of the Python Interpreter (version @VER@)
Package: python-all
Architecture: all
Priority: optional
-Depends: python (>= ${binary:Version}), python2.4 (>= 2.4.6-2), python2.5 (>= 2.5.4-1)
+Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1)
Description: Package depending on all supported Python runtime versions
- The package currently depends on python2.4 and python2.5, in the future,
+ The package currently depends on python2.5, in the future,
dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
may be added.
.
@@ -96,9 +96,9 @@ 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.4-dev (>= 2.4.6-2), python2.5-dev (>= 2.5.4-1)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dev (>= ${binary:Version}), python2.5-dev (>= 2.5.4-1)
Description: Package depending on all supported Python development packages
- The package currently depends on python2.4-dev and python2.5-dev, in the
+ The package currently depends on python2.5-dev, in the
future, dependencies on jython (Python for a JVM) and ironpython (Python
for Mono) may be added.
.
@@ -109,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.4-dbg (>= 2.4.6-2), python2.5-dbg (>= 2.5.4-1)
+Depends: python (>= ${binary:Version}), python-all (>= ${binary:Version}), python-dbg (>= ${binary:Version}), python2.5-dbg (>= 2.5.4-1)
Description: Package depending on all supported Python debugging packages
- The package currently depends on python2.4-dbg and python2.5-dbg, in the
+ The package currently depends on 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/debian_defaults b/debian/debian_defaults
index 23e761ebdb056d45da889036277d128e8ea6e926..5b1144c2cd300ee4a8e45379a98629b475b455ed 100644
--- a/debian/debian_defaults
+++ b/debian/debian_defaults
@@ -3,10 +3,10 @@
default-version = python2.5
# all supported python versions
-supported-versions = python2.4, python2.5
+supported-versions = python2.5
# formerly supported python versions
-old-versions = python2.3
+old-versions = python2.3, python2.4
# unsupported versions, including older versions
-unsupported-versions = python2.3
+unsupported-versions = python2.3, python2.4
diff --git a/debian/python-policy.sgml b/debian/python-policy.sgml
index 6c2d9d16c681a8f81b3374acc087cc25b8ef1cf4..2676bf79f48724627d6e2f805c3eca12bf56c5a9 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 be
- used by other packages in the future.
+ to use this prefix for all packages with public modules as they may
+ 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 choses the
+ multiple modules. In the latter case the maintainer chooses 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 27459642abcf26b9ffe444c7bf5384f2894bc66e..5f03cdfa23c4f13d04c7a6bc54a5d7f97f443346 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/python2.3-32.xpm
+Icon=/usr/share/pixmaps/python.xpm
diff --git a/debian/pyversions.py b/debian/pyversions.py
index db8d7554d705ac8ec255998f88b6974337fcbd69..c98166ca783aa7482d1cb6cddeb016e2f9812098 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.4', 'python2.5']
+ _supported_versions = ['python2.5',]
if version_only:
return [v[6:] for v in _supported_versions]
else: