Merge lp:~gary/meta-lp-deps/geoiplite into lp:meta-lp-deps

Proposed by Gary Poster
Status: Merged
Merged at revision: 89
Proposed branch: lp:~gary/meta-lp-deps/geoiplite
Merge into: lp:meta-lp-deps
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~gary/meta-lp-deps/geoiplite
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+27381@code.launchpad.net

Description of the change

This simply adds developer dependecy on geoip-data-city-lite because it is necessary for the tests, as discovered by mthaddon when he was setting up a buildbot slave.

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
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-10 15:29:17 +0000
+++ debian/changelog 2010-06-11 17:10:44 +0000
@@ -1,3 +1,10 @@
1launchpad-dependencies (0.74) lucid; urgency=low
2
3 * Make launchpad-developer-dependencies require geoip-data-city-lite
4 because it is necessary for the tests (the production data will not work).
5
6 -- Gary Poster (Gerbrand Poster IV) <gary.poster@canonical.com> Fri, 11 Jun 2010 13:01:57 -0500
7
1launchpad-dependencies (0.73) lucid; urgency=low8launchpad-dependencies (0.73) lucid; urgency=low
29
3 * Recommend python-boto (necessary for ec2). (LP: #591970) (Jelmer)10 * Recommend python-boto (necessary for ec2). (LP: #591970) (Jelmer)
411
=== modified file 'debian/control'
--- debian/control 2010-06-10 15:29:17 +0000
+++ debian/control 2010-06-11 17:10:44 +0000
@@ -40,7 +40,7 @@
40Depends: launchpad-dependencies (= ${source:Version}),40Depends: launchpad-dependencies (= ${source:Version}),
41 launchpad-database-dependencies (= ${source:Version}),41 launchpad-database-dependencies (= ${source:Version}),
42 launchpad-soyuz-dependencies (= ${source:Version}),42 launchpad-soyuz-dependencies (= ${source:Version}),
43 exuberant-ctags, bzr-pqm,43 exuberant-ctags, bzr-pqm, geoip-data-city-lite,
44 postgresql-doc-8.3, postgresql-autodoc, tidy,44 postgresql-doc-8.3, postgresql-autodoc, tidy,
45 python-codespeak-lib, pylint, mhonarc, python-imaging (>= 1.1.7),45 python-codespeak-lib, pylint, mhonarc, python-imaging (>= 1.1.7),
46 fakeroot, rsync, spidermonkey-bin, git-core, memcached,46 fakeroot, rsync, spidermonkey-bin, git-core, memcached,

Subscribers

People subscribed via source and target branches