From 893b991481afb3be33a0c74a758b9291a662364a Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 15 Apr 2011 00:13:12 -0400
Subject: [PATCH] Prepare for upload to Unstable:   [ Scott Kitterman ]   *
 Drop python2.5 as a supported Python version     - Update
 debian/debian_defaults     - Update debpython/version.py     - Update
 debian/control.in

---
 debian/changelog       |  9 ++++++++-
 debian/control.in      | 12 ++++++------
 debian/debian_defaults |  6 +++---
 debpython/version.py   |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8ed703..a173f80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 python-defaults (2.6.6-14) UNRELEASED; urgency=low
 
+  [ Piotr Ożarowski ]
   * python.mk: add py_builddir macro.
     $(call py_builddir, 2.6) returns "build/lib.linux-x86_64-2.6" on amd64
   * dh_python2, pycompile, pyclean: add "namespace" feature:
@@ -10,7 +11,13 @@ python-defaults (2.6.6-14) UNRELEASED; urgency=low
     installed packages
   * Remove myself from Uploaders
 
- -- Piotr Ożarowski <piotr@debian.org>  Sun, 27 Mar 2011 16:29:05 +0200
+  [ Scott Kitterman ]
+  * Drop python2.5 as a supported Python version
+    - Update debian/debian_defaults
+    - Update debpython/version.py
+    - Update debian/control.in
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 15 Apr 2011 00:04:07 -0400
 
 python-defaults (2.6.6-13) experimental; urgency=low
 
diff --git a/debian/control.in b/debian/control.in
index 35437b3..2571e8b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -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.6 (>= 2.6.5-2), python2.7 (>= 2.7-7)
 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.6 and python2.7, 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.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
 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.6-dev and python2.7-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.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)
 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.6-dbg and python2.7-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 62f7353..7993567 100644
--- a/debian/debian_defaults
+++ b/debian/debian_defaults
@@ -3,10 +3,10 @@
 default-version = python2.6
 
 # all supported python versions
-supported-versions = python2.5, python2.6, python2.7
+supported-versions = python2.6, python2.7
 
 # formerly supported python versions
-old-versions = python2.3, python2.4
+old-versions = python2.3, python2.4, python2.5
 
 # unsupported versions, including older versions
-unsupported-versions = python2.3, python2.4
+unsupported-versions = python2.3, python2.4, python2.5
diff --git a/debpython/version.py b/debpython/version.py
index 7a858cb..df43a4a 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, 6), (2, 7)]
 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, 6), (2, 7)]
     >>> sorted(get_requested_versions('')) == sorted(SUPPORTED)
     True
     >>> sorted(get_requested_versions([None, None])) == sorted(SUPPORTED)
-- 
GitLab