package version python-defaults-2.5.4-6

debian/changelog

+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)

debian/control

@@ -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/python-minimal/README.Debian for a list of the modules
+ See /usr/share/doc/python2.5-minimal/README.Debian for a list of the modules
  contained in this package.
 
 Package: python-examples
@@ -71,6 +71,31 @@ 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
@@ -84,9 +109,9 @@ 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)
+Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1), python2.6 (>= 2.6.4-2)
 Description: Package depending on all supported Python runtime versions
- The package currently depends on python2.5, 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.
  .
@@ -96,9 +121,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.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), python2.5-dev (>= 2.6.4-2)
 Description: Package depending on all supported Python development packages
- The package currently depends on python2.5-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.
  .
@@ -109,9 +134,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)
+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)
 Description: Package depending on all supported Python debugging packages
- The package currently depends on python2.5-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.
  .

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/python-minimal/README.Debian for a list of the modules
+ See /usr/share/doc/@PVER@-minimal/README.Debian for a list of the modules
  contained in this package.
 
 Package: python-examples
@@ -71,6 +71,31 @@ 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
@@ -84,9 +109,9 @@ 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)
+Depends: python (>= ${binary:Version}), python2.5 (>= 2.5.4-1), python2.6 (>= 2.6.4-2)
 Description: Package depending on all supported Python runtime versions
- The package currently depends on python2.5, 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.
  .
@@ -96,9 +121,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.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), python2.5-dev (>= 2.6.4-2)
 Description: Package depending on all supported Python development packages
- The package currently depends on python2.5-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.
  .
@@ -109,9 +134,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)
+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)
 Description: Package depending on all supported Python debugging packages
- The package currently depends on python2.5-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.
  .

debian/debian_defaults

@@ -3,7 +3,7 @@
 default-version = python2.5
 
 # all supported python versions
-supported-versions = python2.5
+supported-versions = python2.5, python2.6
 
 # formerly supported python versions
 old-versions = python2.3, python2.4

debian/python.postinst.in

@@ -14,6 +14,30 @@ 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