Merge lp:~maxb/meta-lp-deps/pg8.4 into lp:meta-lp-deps

[Max Bowsher]

[Jelmer Vernooij (jelmer)]

Production still uses 8.3, so we can't drop 8.3 support just yet.

The other changes are fine.

review: Needs Fixing (code)

[Max Bowsher (maxb)]

On hold, then.

Sad, because a new version that enforced 8.4 would be a perfect way to encourage and assist with the developer migration to 8.4 as mentioned on launchpad-dev@.

[Max Bowsher (maxb)]

It has been confirmed that production is now all nicely 8.4. Ready for approval.

[lp:~maxb/meta-lp-deps/pg8.4]

102. By Max Bowsher on 2010-10-12

Merge trunk, resolve changelog conflict.

[Jelmer Vernooij (jelmer)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-30 21:04:35 +0000
+++ debian/changelog	2010-10-12 23:18:40 +0000
@@ -1,3 +1,13 @@
+launchpad-dependencies (0.83) maverick; urgency=low
+
+  * 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 <[e-mail]>  Wed, 13 Oct 2010 00:15:34 +0100
+
 launchpad-dependencies (0.82) maverick; urgency=low
 
   * Broken with python-psycopg2 2.2+ (LP: #631010)
 
=== modified file 'debian/control'
--- debian/control	2010-09-30 21:04:35 +0000
+++ debian/control	2010-10-12 23:18:40 +0000
@@ -46,7 +46,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,
@@ -59,12 +59,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,
   ${misc:Depends}
 Description: Meta-package for Launchpad database packages
  This meta-package depends on all of the packages necessary to run a Launchpad