Merge lp:~cjwatson/meta-lp-deps/python-germinate into lp:meta-lp-deps

Proposed by Colin Watson
Status: Merged
Approved by: Gavin Panella
Approved revision: 130
Merged at revision: 150
Proposed branch: lp:~cjwatson/meta-lp-deps/python-germinate
Merge into: lp:meta-lp-deps
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/meta-lp-deps/python-germinate
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+84763@code.launchpad.net

Description of the change

Add python-germinate as a Soyuz dependency. This change is needed in order to land lp:~cjwatson/launchpad/refactor-cron-germinate. See bug 899972 for more details.

Please note that you need to import germinate 2.1 from my PPA into the Launchpad PPA before merging this branch. https://lists.launchpad.net/launchpad-dev/msg08608.html has the details.

To post a comment you must log in.
Revision history for this message
j.c.sackett (jcsackett) wrote :

Taking a quick look at this, I see that lp:~cjwatson/launchpad/refactor-cron-germinate has been merged with lp:launchpad, but this has not been landed. I would have assumed that buildbot would have chocked if this was required.

Revision history for this message
Colin Watson (cjwatson) wrote :

On Thu, Dec 15, 2011 at 10:25:26PM -0000, j.c.sackett wrote:
> Taking a quick look at this, I see that
> lp:~cjwatson/launchpad/refactor-cron-germinate has been merged with
> lp:launchpad, but this has not been landed. I would have assumed that
> buildbot would have chocked if this was required.

I have already arranged for both buildbot and production
(cocoplum/germanium) to be upgraded to the new version of germinate,
which depends on python-germinate; so the lack of this branch won't
cause any production deployment problems.

However, without this branch, developers may have the newest version of
launchpad-developer-dependencies installed and yet they'll find that
tests fail on devel because they have an old germinate installed without
python-germinate, so I think it would still be a good idea to land this
branch.

Revision history for this message
Gavin Panella (allenap) wrote :

Do you want germinate 2.3 from your PPA into the LP PPA? 2.1 has
already been copied.

Revision history for this message
Colin Watson (cjwatson) wrote :

On Fri, Dec 23, 2011 at 11:02:25AM -0000, Gavin Panella wrote:
> Do you want germinate 2.3 from your PPA into the LP PPA? 2.1 has
> already been copied.

Yes please. It'll be needed for later work
(https://code.launchpad.net/~cjwatson/launchpad/germinate-from-db, work
in progress).

--
Colin Watson [<email address hidden>]

Revision history for this message
Gavin Panella (allenap) :
review: Approve
Revision history for this message
Gavin Panella (allenap) wrote :

Sorry for being clueless, but do I need to do any build-related
jiggery pokery with this, or is merging it into trunk enough?

Revision history for this message
Colin Watson (cjwatson) wrote :

My memory is that merging this into trunk triggers recipe builds.

Revision history for this message
Colin Watson (cjwatson) wrote :

I'm a bit late with this, but I'm going to merge it now for completeness, and to get it off https://code.launchpad.net/launchpad-project/+activereviews.

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 2011-11-11 06:41:13 +0000
3+++ debian/changelog 2011-12-07 13:45:42 +0000
4@@ -1,3 +1,9 @@
5+launchpad-dependencies (0.103) oneiric; urgency=low
6+
7+ * Add python-germinate to launchpad-soyuz-dependencies (LP: #899972).
8+
9+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 07 Dec 2011 13:36:22 +0000
10+
11 launchpad-dependencies (0.102) oneiric; urgency=low
12
13 * Add python-lpbuildd to launchpad-developer-dependencies, so it can
14
15=== modified file 'debian/control'
16--- debian/control 2011-11-11 06:41:13 +0000
17+++ debian/control 2011-12-07 13:45:42 +0000
18@@ -34,7 +34,7 @@
19 Package: launchpad-soyuz-dependencies
20 Architecture: all
21 Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
22- germinate, devscripts,
23+ germinate, python-germinate, devscripts,
24 apt-utils (>= ${apt-utils-version}),
25 ${misc:Depends}
26 Description: Meta-package for Launchpad Soyuz packages

Subscribers

People subscribed via source and target branches