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

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Gary Poster
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mwhudson/meta-lp-deps/bye-2.4-hello-2.5
Merge into: lp:meta-lp-deps
Diff against target: 56 lines (+16/-9)
2 files modified
debian/changelog (+7/-0)
debian/control (+9/-9)
To merge this branch: bzr merge lp:~mwhudson/meta-lp-deps/bye-2.4-hello-2.5
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Review via email: mp+15058@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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.

Revision history for this message
Gary Poster (gary) wrote :

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
65. By Michael Hudson-Doyle

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

66. By Michael Hudson-Doyle

changelog...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1launchpad-dependencies (0.58) hardy; urgency=low
2
3 * Depend on 2.5 packages, not 2.4 ones.
4 * Except depend on python-support, not python2.5-support.
5
6 -- Michael Hudson <michael.hudson@canonical.com> Fri, 20 Nov 2009 12:12:01 +1300
7
1launchpad-dependencies (0.57) karmic; urgency=low8launchpad-dependencies (0.57) karmic; urgency=low
29
3 * Add magic for bzr-builddeb to recognize launchpad-dependencies as native 10 * Add magic for bzr-builddeb to recognize launchpad-dependencies as native
411
=== 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 @@
77
8Package: launchpad-dependencies8Package: launchpad-dependencies
9Architecture: all9Architecture: all
10Depends: bzr, python2.5-dev, python2.4-dev, gettext, build-essential,10Depends: bzr, python2.5-dev, gettext, build-essential,
11 ncompress, python2.4-psycopg2, python2.4-apt, python2.4-geoip,11 ncompress, python2.5-psycopg2, python2.5-apt, python2.5-geoip,
12 python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python2.4-svn,12 python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python2.5-svn,
13 python2.4-subversion, python-sqlite, ubuntu-keyring,13 python2.5-subversion, python-sqlite, ubuntu-keyring,
14 python2.4-imaging, bison, python-paramiko, python-mechanize,14 python2.5-imaging, bison, python-paramiko, python-mechanize,
15 python-openssl, graphviz, python-zopeinterface, python-celementtree,15 python-openssl, graphviz, python-zopeinterface, python-celementtree,
16 python2.4-tickcount, germinate, devscripts, libxml2-utils,16 python2.5-tickcount, germinate, devscripts, libxml2-utils,
17 python-epydoc, patchutils, openssh-blacklist,17 python-epydoc, patchutils, openssh-blacklist,
18 openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc, python-magic,18 openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc, python-magic,
19 geoip-data | geoip-data-city-lite,19 geoip-data | geoip-data-city-lite,
20 python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,20 python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,
21 python2.4-support, python-openid, python2.4-pysqlite2, zlib1g-dev,21 python-support, python-openid, python2.5-pysqlite2, zlib1g-dev,
22 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev22 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev
23Recommends: launchpad-database-dependencies (= ${source:Version})23Recommends: launchpad-database-dependencies (= ${source:Version})
24Suggests:24Suggests:
@@ -41,9 +41,9 @@
4141
42Package: launchpad-database-dependencies42Package: launchpad-database-dependencies
43Architecture: all43Architecture: all
44Depends: python2.4-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),44Depends: python2.5-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
45 postgresql-8.3, postgresql-contrib-8.3, postgresql-plpython-8.3,45 postgresql-8.3, postgresql-contrib-8.3, postgresql-plpython-8.3,
46 postgresql-client-8.3, python2.4-support46 postgresql-client-8.3, python-support
47Description: Metapackage for Launchpad database packages47Description: Metapackage for Launchpad database packages
48 This package depends on all of the packages necessary to run a Launchpad48 This package depends on all of the packages necessary to run a Launchpad
49 database.49 database.

Subscribers

People subscribed via source and target branches