Launchpad Dependencies

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

  1. generic-python
  2. Merge into trunk
Proposed by Gary Poster
Status: Merged
Merged at revision: 88
Proposed branch: lp:~gary/meta-lp-deps/generic-python
Merge into: lp:meta-lp-deps
Diff against target: 95 lines (+22/-20)
2 files modified
debian/changelog (+12/-10)
debian/control (+10/-10)
To merge this branch: bzr merge lp:~gary/meta-lp-deps/generic-python
Reviewer Review Type Date Requested Status
Paul Hummer (community) code Approve
Review via email: mp+27292@code.launchpad.net

Description of the change

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).

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

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

Thanks

Revision history for this message
Paul Hummer (rockstar) wrote :

A BIG +1

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1launchpad-dependencies (0.73) UNRELEASED; urgency=low1launchpad-dependencies (0.73) lucid; urgency=low
22
3 * Recommend python-boto (necessary for ec2). (LP: #591970)3 * Recommend python-boto (necessary for ec2). (LP: #591970) (Jelmer)
44 * Change from relying on python-2.5 to relying on generic python
5 -- Jelmer Vernooij <jelmer@canonical.com> Wed, 09 Jun 2010 17:58:57 +02005 dependencies in preparation for a switch to Python 2.6 and Lucid.
6
7 -- Gary Poster (Gerbrand Poster IV) <gary.poster@canonical.com> Thu, 10 Jun 2010 11:26:15 -0500
68
7launchpad-dependencies (0.72) lucid; urgency=low9launchpad-dependencies (0.72) lucid; urgency=low
810
@@ -59,7 +61,7 @@
5961
60launchpad-dependencies (0.66) karmic; urgency=low62launchpad-dependencies (0.66) karmic; urgency=low
6163
62 * add postgresql-8.3-slony1 and slony1-bin to launchpad-database-dependencies 64 * add postgresql-8.3-slony1 and slony1-bin to launchpad-database-dependencies
6365
64 -- Michael Barnett <michael.barnett@canonical.com> Fri, 05 Feb 2010 17:02:44 -060066 -- Michael Barnett <michael.barnett@canonical.com> Fri, 05 Feb 2010 17:02:44 -0600
6567
@@ -119,18 +121,18 @@
119launchpad-dependencies (0.58) hardy; urgency=low121launchpad-dependencies (0.58) hardy; urgency=low
120122
121 * Depend on 2.5 packages, not 2.4 ones.123 * Depend on 2.5 packages, not 2.4 ones.
122 * Except depend on python-support, not python2.5-support. 124 * Except depend on python-support, not python2.5-support.
123125
124 -- Michael Hudson <michael.hudson@canonical.com> Fri, 20 Nov 2009 12:12:01 +1300126 -- Michael Hudson <michael.hudson@canonical.com> Fri, 20 Nov 2009 12:12:01 +1300
125127
126launchpad-dependencies (0.57) karmic; urgency=low128launchpad-dependencies (0.57) karmic; urgency=low
127129
128 * Add magic for bzr-builddeb to recognize launchpad-dependencies as native 130 * Add magic for bzr-builddeb to recognize launchpad-dependencies as native
129 package.131 package.
130 * Bump standards version to 3.8.3.132 * Bump standards version to 3.8.3.
131 * Use at least compatibility level 5 of debhelper, as earlier versions are 133 * Use at least compatibility level 5 of debhelper, as earlier versions are
132 deprecated in current versions of debhelper.134 deprecated in current versions of debhelper.
133 * Add dependencies required for building subvertpy to 135 * Add dependencies required for building subvertpy to
134 launchpad-developer-dependencies dependencies.136 launchpad-developer-dependencies dependencies.
135 -- Jelmer Vernooij <jelmer@ubuntu.com> Wed, 18 Nov 2009 22:39:26 -0600137 -- Jelmer Vernooij <jelmer@ubuntu.com> Wed, 18 Nov 2009 22:39:26 -0600
136138
137139
=== 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 @@
77
8Package: launchpad-dependencies8Package: launchpad-dependencies
9Architecture: all9Architecture: all
10Depends: bzr, python2.5-dev, gettext, build-essential,10Depends: bzr, python-dev, gettext, build-essential,
11 ncompress, python2.5-psycopg2, python2.5-apt, python2.5-geoip,11 ncompress, python-psycopg2, python-apt, python-geoip,
12 python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python2.5-svn,12 python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python-svn,
13 python2.5-subversion, python-sqlite, ubuntu-keyring,13 python-subversion, python-sqlite, ubuntu-keyring,
14 python2.5-imaging, python-imaging,14 python-imaging, python-imaging,
15 bison, graphviz,15 bison, graphviz,
16 python2.5-tickcount, libxml2-utils, patchutils,16 python-tickcount, libxml2-utils, patchutils,
17 openssh-blacklist, openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,17 openssh-blacklist, openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,
18 python-magic, geoip-data | geoip-data-city-lite,18 python-magic, geoip-data | geoip-data-city-lite,
19 python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,19 python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,
20 python-subunit (>= 0.0.4),20 python-subunit (>= 0.0.4),
21 python-support, python2.5-pysqlite2, zlib1g-dev,21 python-support, python-pysqlite2, zlib1g-dev,
22 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,22 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
23 openssh-client, python-debian, python2.5-egenix-mxdatetime,23 openssh-client, python-debian, python-egenix-mxdatetime,
24 python2.5-egenix-mxtools24 python-egenix-mxtools
25Recommends: launchpad-database-dependencies (= ${source:Version})25Recommends: launchpad-database-dependencies (= ${source:Version})
26Suggests:26Suggests:
27Description: Metapackage for dependencies of Launchpad27Description: Metapackage for dependencies of Launchpad
@@ -53,7 +53,7 @@
5353
54Package: launchpad-database-dependencies54Package: launchpad-database-dependencies
55Architecture: all55Architecture: all
56Depends: python2.5-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),56Depends: python-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
57 postgresql-8.3, postgresql-contrib-8.3, postgresql-plpython-8.3,57 postgresql-8.3, postgresql-contrib-8.3, postgresql-plpython-8.3,
58 postgresql-client-8.3, python-support, postgresql-8.3-slony1, slony1-bin58 postgresql-client-8.3, python-support, postgresql-8.3-slony1, slony1-bin
59Description: Metapackage for Launchpad database packages59Description: Metapackage for Launchpad database packages

Subscribers

People subscribed via source and target branches