launchpad-reviewers team mailing list archive

[Max Bowsher <maxb@xxxxxxx>]

Max Bowsher has proposed merging lp:~maxb/meta-lp-deps/pg8.4 into lp:meta-lp-deps.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

-- 
https://code.launchpad.net/~maxb/meta-lp-deps/pg8.4/+merge/32200
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~maxb/meta-lp-deps/pg8.4 into lp:meta-lp-deps.

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-29 12:59:44 +0000
+++ debian/changelog	2010-08-10 13:45:58 +0000
@@ -1,8 +1,16 @@
 launchpad-dependencies (0.81) lucid; urgency=low
 
+  [ Jelmer Vernooij ]
   * Suggest python-pydoctor (used by 'make pydoctor').
 
- -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Thu, 29 Jul 2010 14:59:32 +0200
+  [ Max Bowsher ]
+  * Require PostgreSQL 8.4 only, not 8.4 | 8.3.
+  * lp-db-deps: Remove duplicated python-psycopg2 dependency and unnecessary
+    python-support dependency.
+  * Begin to employ a pattern of one dependency per line, to make diffs
+    clearer, where editing dependency lists.
+
+ -- Max Bowsher <maxb@xxxxxxx>  Tue, 10 Aug 2010 14:40:34 +0100
 
 launchpad-dependencies (0.80) lucid; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-07-29 12:59:44 +0000
+++ debian/control	2010-08-10 13:45:58 +0000
@@ -43,7 +43,7 @@
   launchpad-messagequeue-dependencies (= ${source:Version}),
   launchpad-soyuz-dependencies (= ${source:Version}),
   exuberant-ctags, bzr-pqm, geoip-data-city-lite,
-  postgresql-doc-8.4 | postgresql-doc-8.3, postgresql-autodoc, tidy,
+  postgresql-doc-8.4, postgresql-autodoc, tidy,
   python-codespeak-lib, pylint, mhonarc, python-imaging (>= 1.1.7),
   fakeroot, rsync, spidermonkey-bin, git-core, memcached,
   xvfb, firefox, xfonts-base, intltool, python-pocket-lint
@@ -55,12 +55,13 @@
 
 Package: launchpad-database-dependencies
 Architecture: all
-Depends: python-psycopg2, python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
-  postgresql-8.4 | postgresql-8.3,
-  postgresql-contrib-8.4 | postgresql-contrib-8.3,
-  postgresql-plpython-8.4 | postgresql-plpython-8.3,
-  postgresql-client-8.4 | postgresql-client-8.3, python-support,
-  postgresql-8.4-slony1 | postgresql-8.3-slony1, slony1-bin
+Depends: python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04),
+  postgresql-8.4,
+  postgresql-contrib-8.4,
+  postgresql-plpython-8.4,
+  postgresql-client-8.4,
+  postgresql-8.4-slony1,
+  slony1-bin
 Description: Metapackage for Launchpad database packages
  This package depends on all of the packages necessary to run a Launchpad
  database.