Merge lp:~mwhudson/meta-lp-deps/bye-2.4-hello-2.5 into lp:meta-lp-deps

[Michael Hudson-Doyle]

[Michael Hudson-Doyle (mwhudson)]

This branch basically does sed -i -e 's/python2.4/python2.5/g' debian/control

It should now build and install on hardy, which will get rid of a long standing little irritation.

[Gary Poster (gary)]

I'm not clear on why this allows us to work on Hardy--I guess python2.5-support is installable on Hardy, while python2.4-support was not?--but if you are confident about this then I'm comfortable.

Looks good. Thank you!

Gary

review: Approve

[lp:~mwhudson/meta-lp-deps/bye-2.4-hello-2.5]

65. By Michael Hudson-Doyle on 2009-11-19

depend on python-support, not python2.5-support

66. By Michael Hudson-Doyle on 2009-11-19

changelog...

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-19 04:45:15 +0000
+++ debian/changelog	2009-11-19 23:16:09 +0000
@@ -1,3 +1,10 @@
+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. 
+
+ -- 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 

=== modified file 'debian/control'
--- debian/control	2009-11-19 04:45:15 +0000
+++ debian/control	2009-11-19 23:16:09 +0000
@@ -7,18 +7,18 @@
 
 Package: launchpad-dependencies
 Architecture: all
-Depends: bzr, python2.5-dev, python2.4-dev, gettext, build-essential,
-  ncompress, python2.4-psycopg2, python2.4-apt, python2.4-geoip,
-  python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python2.4-svn,
-  python2.4-subversion, python-sqlite, ubuntu-keyring,
-  python2.4-imaging, bison, python-paramiko, python-mechanize,
+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, bison, python-paramiko, python-mechanize,
   python-openssl, graphviz, python-zopeinterface, python-celementtree,
-  python2.4-tickcount, germinate, devscripts, libxml2-utils,
+  python2.5-tickcount, germinate, devscripts, libxml2-utils,
   python-epydoc, 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,
-  python2.4-support, python-openid, python2.4-pysqlite2, zlib1g-dev,
+  python-support, python-openid, python2.5-pysqlite2, zlib1g-dev,
   ca-certificates, python-pyrex, libapr1-dev, libsvn-dev
 Recommends: launchpad-database-dependencies (= ${source:Version})
 Suggests:
@@ -41,9 +41,9 @@
 
 Package: launchpad-database-dependencies
 Architecture: all
-Depends: python2.4-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
+Depends: python2.5-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, python2.4-support
+  postgresql-client-8.3, python-support
 Description: Metapackage for Launchpad database packages
  This package depends on all of the packages necessary to run a Launchpad
  database.