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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-06-09 23:41:49 +0000
3+++ debian/changelog 2010-06-10 17:44:28 +0000
4@@ -1,8 +1,10 @@
5-launchpad-dependencies (0.73) UNRELEASED; urgency=low
6-
7- * Recommend python-boto (necessary for ec2). (LP: #591970)
8-
9- -- Jelmer Vernooij <jelmer@canonical.com> Wed, 09 Jun 2010 17:58:57 +0200
10+launchpad-dependencies (0.73) lucid; urgency=low
11+
12+ * Recommend python-boto (necessary for ec2). (LP: #591970) (Jelmer)
13+ * Change from relying on python-2.5 to relying on generic python
14+ dependencies in preparation for a switch to Python 2.6 and Lucid.
15+
16+ -- Gary Poster (Gerbrand Poster IV) <gary.poster@canonical.com> Thu, 10 Jun 2010 11:26:15 -0500
17
18 launchpad-dependencies (0.72) lucid; urgency=low
19
20@@ -59,7 +61,7 @@
21
22 launchpad-dependencies (0.66) karmic; urgency=low
23
24- * add postgresql-8.3-slony1 and slony1-bin to launchpad-database-dependencies
25+ * add postgresql-8.3-slony1 and slony1-bin to launchpad-database-dependencies
26
27 -- Michael Barnett <michael.barnett@canonical.com> Fri, 05 Feb 2010 17:02:44 -0600
28
29@@ -119,18 +121,18 @@
30 launchpad-dependencies (0.58) hardy; urgency=low
31
32 * Depend on 2.5 packages, not 2.4 ones.
33- * Except depend on python-support, not python2.5-support.
34+ * Except depend on python-support, not python2.5-support.
35
36 -- Michael Hudson <michael.hudson@canonical.com> Fri, 20 Nov 2009 12:12:01 +1300
37
38 launchpad-dependencies (0.57) karmic; urgency=low
39
40- * Add magic for bzr-builddeb to recognize launchpad-dependencies as native
41+ * Add magic for bzr-builddeb to recognize launchpad-dependencies as native
42 package.
43 * Bump standards version to 3.8.3.
44- * Use at least compatibility level 5 of debhelper, as earlier versions are
45+ * Use at least compatibility level 5 of debhelper, as earlier versions are
46 deprecated in current versions of debhelper.
47- * Add dependencies required for building subvertpy to
48+ * Add dependencies required for building subvertpy to
49 launchpad-developer-dependencies dependencies.
50 -- Jelmer Vernooij <jelmer@ubuntu.com> Wed, 18 Nov 2009 22:39:26 -0600
51
52
53=== modified file 'debian/control'
54--- debian/control 2010-06-09 15:59:14 +0000
55+++ debian/control 2010-06-10 17:44:28 +0000
56@@ -7,21 +7,21 @@
57
58 Package: launchpad-dependencies
59 Architecture: all
60-Depends: bzr, python2.5-dev, gettext, build-essential,
61- ncompress, python2.5-psycopg2, python2.5-apt, python2.5-geoip,
62- python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python2.5-svn,
63- python2.5-subversion, python-sqlite, ubuntu-keyring,
64- python2.5-imaging, python-imaging,
65+Depends: bzr, python-dev, gettext, build-essential,
66+ ncompress, python-psycopg2, python-apt, python-geoip,
67+ python-profiler, libgpgme11-dev (>= 1.1.0), cvs, python-svn,
68+ python-subversion, python-sqlite, ubuntu-keyring,
69+ python-imaging, python-imaging,
70 bison, graphviz,
71- python2.5-tickcount, libxml2-utils, patchutils,
72+ python-tickcount, libxml2-utils, patchutils,
73 openssh-blacklist, openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,
74 python-magic, geoip-data | geoip-data-city-lite,
75 python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,
76 python-subunit (>= 0.0.4),
77- python-support, python2.5-pysqlite2, zlib1g-dev,
78+ python-support, python-pysqlite2, zlib1g-dev,
79 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
80- openssh-client, python-debian, python2.5-egenix-mxdatetime,
81- python2.5-egenix-mxtools
82+ openssh-client, python-debian, python-egenix-mxdatetime,
83+ python-egenix-mxtools
84 Recommends: launchpad-database-dependencies (= ${source:Version})
85 Suggests:
86 Description: Metapackage for dependencies of Launchpad
87@@ -53,7 +53,7 @@
88
89 Package: launchpad-database-dependencies
90 Architecture: all
91-Depends: python2.5-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
92+Depends: python-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
93 postgresql-8.3, postgresql-contrib-8.3, postgresql-plpython-8.3,
94 postgresql-client-8.3, python-support, postgresql-8.3-slony1, slony1-bin
95 Description: Metapackage for Launchpad database packages

Subscribers

People subscribed via source and target branches