launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/meta-lp-deps/python-debian into lp:meta-lp-deps.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers): code


This adds a dependency on a version of apt that contains a fix for Debian bug #573592 or a python-debian that contains a workaround for that bug. This is a prerequisite for the fix for bug 521110.

This branch also fixes some lintian warnings.
-- 
https://code.launchpad.net/~jelmer/meta-lp-deps/python-debian/+merge/31274
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/meta-lp-deps/python-debian into lp:meta-lp-deps.

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-23 21:37:53 +0000
+++ debian/changelog	2010-07-29 12:53:41 +0000
@@ -1,3 +1,11 @@
+launchpad-dependencies (0.81) lucid; urgency=low
+
+  * Bump standards version to 3.9.1.
+  * Depend on a version of apt with a fix for Debian bug #573592 or a
+    python-debian that contains a workaround.
+
+ -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Thu, 29 Jul 2010 12:23:36 +0200
+
 launchpad-dependencies (0.80) lucid; urgency=low
 
   * Add back python-openid, python-paramiko and python-openssl as dependency

=== modified file 'debian/control'
--- debian/control	2010-07-23 21:37:53 +0000
+++ debian/control	2010-07-29 12:53:41 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Launchpad package maintainers <launchpad@xxxxxxxxxxxxxxxxxxx>
 Build-Depends: debhelper (>= 5.0.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: launchpad-dependencies
 Architecture: all
@@ -22,9 +22,10 @@
   python-support, python-pysqlite2, zlib1g-dev,
   ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
   openssh-client, python-debian, python-egenix-mxdatetime,
-  python-egenix-mxtools, python-amqplib
+  python-egenix-mxtools, python-amqplib,
+  python-debian (>= 0.1.17~bzr184~launchpad1) | apt (>= 0.7.26~exp3),
+  ${misc:Depends}
 Recommends: launchpad-database-dependencies (= ${source:Version})
-Suggests:
 Description: Metapackage for dependencies of Launchpad
  This package depends on all of the packages necessary to run the Launchpad
  application.
@@ -32,7 +33,7 @@
 Package: launchpad-soyuz-dependencies
 Architecture: all
 Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
-  germinate, devscripts
+  germinate, devscripts, ${misc:Depends}
 Description: Metapackage for Launchpad Soyuz packages
  This package depends on all of the packages necessary to run Soyuz.
 
@@ -46,7 +47,7 @@
   postgresql-doc-8.4 | postgresql-doc-8.3, 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
+  xvfb, firefox, xfonts-base, intltool, python-pocket-lint, ${misc:Depends}
 Recommends: pyflakes, subunit, python-boto
 Suggests: apache2
 Description: Metapackage for dependencies of Launchpad
@@ -60,14 +61,14 @@
   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
+  postgresql-8.4-slony1 | postgresql-8.3-slony1, slony1-bin, ${misc:Depends}
 Description: Metapackage for Launchpad database packages
  This package depends on all of the packages necessary to run a Launchpad
  database.
 
 Package: launchpad-messagequeue-dependencies
 Architecture: all
-Depends: python-amqplib, rabbitmq-server, stunnel4
+Depends: python-amqplib, rabbitmq-server, stunnel4, ${misc:Depends}
 Description: Metapackage for Launchpad messagequeue packages
  This package depends on all of the packages necessary to run a Launchpad
  messagequeue server.