Merge lp:~gary/meta-lp-deps/generic-python into lp:meta-lp-deps

[Gary Poster]

This makes our dependencies rely on the local python rather than python2.5. It's intended to make the dependencies be correct for both Hardy (2.5) and Lucid (2.6).

[Gary Poster (gary)]

My editor eliminated trailing whitespace in the changelog. I hope that's not an issue, but if it is, I'll address.

Thanks

[Paul Hummer (rockstar)]

A BIG +1

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-09 23:41:49 +0000
+++ debian/changelog	2010-06-10 17:44:28 +0000
@@ -1,8 +1,10 @@
-launchpad-dependencies (0.73) UNRELEASED; urgency=low
-
-  * Recommend python-boto (necessary for ec2). (LP: #591970)
-
- -- Jelmer Vernooij <[e-mail]>  Wed, 09 Jun 2010 17:58:57 +0200
+launchpad-dependencies (0.73) lucid; urgency=low
+
+  * Recommend python-boto (necessary for ec2). (LP: #591970) (Jelmer)
+  * Change from relying on python-2.5 to relying on generic python
+    dependencies in preparation for a switch to Python 2.6 and Lucid.
+
+ -- Gary Poster (Gerbrand Poster IV) <[e-mail]>  Thu, 10 Jun 2010 11:26:15 -0500
 
 launchpad-dependencies (0.72) lucid; urgency=low
 
@@ -59,7 +61,7 @@
 
 launchpad-dependencies (0.66) karmic; urgency=low
 
-  * add postgresql-8.3-slony1 and slony1-bin to launchpad-database-dependencies 
+  * add postgresql-8.3-slony1 and slony1-bin to launchpad-database-dependencies
 
  -- Michael Barnett <[e-mail]>  Fri, 05 Feb 2010 17:02:44 -0600
 
@@ -119,18 +121,18 @@
 launchpad-dependencies (0.58) hardy; urgency=low
 
   * Depend on 2.5 packages, not 2.4 ones.
-  * Except depend on python-support, not python2.5-support. 
+  * Except depend on python-support, not python2.5-support.
 
  -- Michael Hudson <[e-mail]>  Fri, 20 Nov 2009 12:12:01 +1300
 
 launchpad-dependencies (0.57) karmic; urgency=low
 
-  * Add magic for bzr-builddeb to recognize launchpad-dependencies as native 
+  * Add magic for bzr-builddeb to recognize launchpad-dependencies as native
     package.
   * Bump standards version to 3.8.3.
-  * Use at least compatibility level 5 of debhelper, as earlier versions are 
+  * Use at least compatibility level 5 of debhelper, as earlier versions are
     deprecated in current versions of debhelper.
-  * Add dependencies required for building subvertpy to 
+  * Add dependencies required for building subvertpy to
     launchpad-developer-dependencies dependencies.
  -- Jelmer Vernooij <[e-mail]>  Wed, 18 Nov 2009 22:39:26 -0600
 

=== modified file 'debian/control'
--- debian/control	2010-06-09 15:59:14 +0000
+++ debian/control	2010-06-10 17:44:28 +0000
@@ -7,21 +7,21 @@
 
 Package: launchpad-dependencies
 Architecture: all
-Depends: bzr, python2.5-dev, gettext, build-essential,
-  ncompress, python2.5-psycopg2, python2.5-apt, python2.5-geoip,
-  python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python2.5-svn,
-  python2.5-subversion, python-sqlite, ubuntu-keyring,
-  python2.5-imaging, python-imaging,
+Depends: bzr, python-dev, gettext, build-essential,
+  ncompress, python-psycopg2, python-apt, python-geoip,
+  python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python-svn,
+  python-subversion, python-sqlite, ubuntu-keyring,
+  python-imaging, python-imaging,
   bison, graphviz,
-  python2.5-tickcount, libxml2-utils, patchutils,
+  python-tickcount, libxml2-utils, patchutils,
   openssh-blacklist, openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,
   python-magic, geoip-data | geoip-data-city-lite,
   python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,
   python-subunit (>= 0.0.4),
-  python-support, python2.5-pysqlite2, zlib1g-dev,
+  python-support, python-pysqlite2, zlib1g-dev,
   ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
-  openssh-client, python-debian, python2.5-egenix-mxdatetime,
-  python2.5-egenix-mxtools
+  openssh-client, python-debian, python-egenix-mxdatetime,
+  python-egenix-mxtools
 Recommends: launchpad-database-dependencies (= ${source:Version})
 Suggests:
 Description: Metapackage for dependencies of Launchpad
@@ -53,7 +53,7 @@
 
 Package: launchpad-database-dependencies
 Architecture: all
-Depends: python2.5-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
+Depends: python-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
   postgresql-8.3, postgresql-contrib-8.3, postgresql-plpython-8.3,
   postgresql-client-8.3, python-support, postgresql-8.3-slony1, slony1-bin
 Description: Metapackage for Launchpad database packages