Merge lp:~jelmer/meta-lp-deps/python-debian into lp:meta-lp-deps

[Jelmer Vernooij]

Add dependencies to make sure a fix for Debian bug #573592 is present.

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.

[Max Bowsher (maxb)]

Interesting... I think this is fine, but am confused what the motivation is to bother with a backported python-debian, given bug 521110 is merely removal of about-to-be-unnecessary code.

Please mention your newly created ~launchpad-pqm/python-debian/devel branch on https://dev.launchpad.net/LaunchpadPpa, and you might like to comment on launchpad-dev@ regarding your thoughts on making this branch PQM-managed, given everything else in the PPA does not use PQM-managed branches.

[Jelmer Vernooij (jelmer)]

On Mon, 2010-08-02 at 22:38 +0000, Max Bowsher wrote:
> Interesting... I think this is fine, but am confused what the
> motivation is to bother with a backported python-debian, given bug
> 521110 is merely removal of about-to-be-unnecessary code.
This branch has already bitrotted a couple of times so I wanted to
actually get these changes in rather than letting it bitrot for a couple
of months more until we have Lucid.

We're almost certainly going to rely even more on python-debian in the
future, e.g. for parsing dsc files, other rfc822-like files, changelog
files and the removals file. Given we're always running Launchpad on a
LTS release and the next version of python-debian already has a couple
of fixes that might be useful to cherrypick it seemed reasonable to just
do all of the setup now.

> Please mention your newly created ~launchpad-pqm/python-debian/devel
> branch on https://dev.launchpad.net/LaunchpadPpa, and you might like
> to comment on launchpad-dev@ regarding your thoughts on making this
> branch PQM-managed, given everything else in the PPA does not use
> PQM-managed branches.
I was originally going to put it in sourcedeps.conf, but was eventually
recommended to put the changes into the PPA instead. It seemed like a
good idea to use PQM here, similar to most of the other branches we use
for our dependencies in sourcedeps.conf. I'll update the wiki, thanks.

Cheers,

Jelmer

[Max Bowsher (maxb)]

Looks good, conditional on https://dev.launchpad.net/LaunchpadPpa getting updated, and conditional on https://code.edge.launchpad.net/~jelmer/meta-lp-deps/lintian/+merge/31745 landing successfully first.

There is still an inconsistency in that this package's packaging branch goes via PQM, but none of the rest of the PPA's content does. Personally I'd rather ditch PQM since I don't have submit access :-) But, that conversation does not need to block this merge.

review: Approve

Unmerged revisions

102. By Jelmer Vernooij on 2010-07-29

Depend on a version of apt with a fix for Debian bug #573592 or a
python-debian that contains a workaround.

101. By Jelmer Vernooij on 2010-07-29

Add misc:Depends since we're using debhelper.

100. By Jelmer Vernooij on 2010-07-29

Add dependency on python-chardet, required for python-debian.

99. By Jelmer Vernooij on 2010-07-29

Bump standards version to 3.9.0.

=== 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 <[e-mail]>  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 <[e-mail]>
 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.