* tests/data/aptsources_ports/sources.list:

  - fix ports test-data
* debian/control
  - build against XS-Python-Versions: 2.6, 3.1

3 files changed, 13 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index c01286f2..fc06f186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ python-apt (0.7.94.3) UNRELEASED; urgency=low
   [ Michael Vogt ]
   * apt/cache.py:
     - make cache open silent by default (use apt.progress.base.OpProgress)
+  * tests/data/aptsources_ports/sources.list:
+    - fix ports test-data
+  * debian/control
+    - build against XS-Python-Versions: 2.6, 3.1
   
  -- Julian Andres Klode <jak@debian.org>  Mon, 15 Mar 2010 17:04:49 +0100
 
diff --git a/debian/control b/debian/control
index 904dff0a..e2cb1d29 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.4
-XS-Python-Version: 2.5, 2.6, 3.1
+XS-Python-Version: 2.6, 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
                libapt-pkg-dev (>= 0.7.22~),
diff --git a/tests/data/aptsources_ports/sources.list b/tests/data/aptsources_ports/sources.list
index a6b2f6ed..54f048b2 100644
--- a/tests/data/aptsources_ports/sources.list
+++ b/tests/data/aptsources_ports/sources.list
@@ -6,12 +6,12 @@
 # newer versions of the distribution.
 
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy main restricted
-deb-src http://archive.ubuntu.com/ubuntu hardy main restricted
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy-updates main restricted
-deb-src http://archive.ubuntu.com/ubuntu hardy-updates main restricted
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team, and may not be under a free licence. Please satisfy yourself as to
@@ -19,9 +19,9 @@ deb-src http://archive.ubuntu.com/ubuntu hardy-updates main restricted
 ## universe WILL NOT receive any review or updates from the Ubuntu security
 ## team.
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy universe
-deb-src http://archive.ubuntu.com/ubuntu hardy universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy universe
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy-updates universe
-deb-src http://archive.ubuntu.com/ubuntu hardy-updates universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team, and may not be under a free licence. Please satisfy yourself as to
@@ -29,9 +29,9 @@ deb-src http://archive.ubuntu.com/ubuntu hardy-updates universe
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy multiverse
-deb-src http://archive.ubuntu.com/ubuntu hardy multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy multiverse
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy-updates multiverse
-deb-src http://archive.ubuntu.com/ubuntu hardy-updates multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-updates multiverse
 
 ## Uncomment the following two lines to add software from the 'backports'
 ## repository.
@@ -41,7 +41,7 @@ deb-src http://archive.ubuntu.com/ubuntu hardy-updates multiverse
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
 # deb http://ports.ubuntu.com/ubuntu-ports/ hardy-backports main restricted universe multiverse
-# deb-src http://archive.ubuntu.com/ubuntu hardy-backports main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-backports main restricted universe multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
 ## 'partner' repository. This software is not part of Ubuntu, but is
@@ -56,4 +56,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ hardy-security universe
 deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-security universe
 deb http://ports.ubuntu.com/ubuntu-ports/ hardy-security multiverse
 deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-security multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ hardy-proposed restricted main multiverse universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ hardy-proposed restricted main multiverse universe