Launchpad Dependencies

Merge lp:~jelmer/meta-lp-deps/lintian into lp:meta-lp-deps

  1. lintian
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Max Bowsher
Approved revision: 101
Merged at revision: 101
Proposed branch: lp:~jelmer/meta-lp-deps/lintian
Merge into: lp:meta-lp-deps
Diff against target: 116 lines (+29/-19)
3 files modified
debian/changelog (+4/-1)
debian/control (+21/-16)
debian/copyright (+4/-2)
To merge this branch: bzr merge lp:~jelmer/meta-lp-deps/lintian
Reviewer Review Type Date Requested Status
Max Bowsher (community) Approve
Launchpad code reviewers code Pending
Review via email: mp+31745@code.launchpad.net

Commit message

Fix a couple of lintian warnings.

Description of the change

This fixes a couple of minor issues, pointed out by lintian:

Bump standards version to 3.9.1.
Update description to mention that the packages are metapackages.
Update copyright file to include copyright.

To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote :

On Standards-Version ... is anyone checking or caring whether we are compliant? On never-for-distro packages, I sometimes set Standards-Version to 0. If we are updating it, there should be words in the debian/changelog entry stating that no changes were required, or what changes were needed.

On the description changes... is "meta-package", hyphenated, the standard? I've only seen it hyphenless.

On the copyright file changes... the debian/changelog declares the package dates back to 2005 - from what source to you derive 2009-2010 ?

On the ${misc:Depends} addition... harmless and pacifies lintian, though a bit redundant in a metapackage. Might be better to place it on a final line on its own, so it doesn't keep getting involved in the diffs when people add packages.

review: Needs Fixing
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Hi Max,

On Tue, 2010-08-10 at 13:23 +0000, Max Bowsher wrote:
> Review: Needs Fixing On Standards-Version ... is anyone checking or
> caring whether we are compliant? On never-for-distro packages, I
> sometimes set Standards-Version to 0. If we are updating it, there
> should be words in the debian/changelog entry stating that no changes
> were required, or what changes were needed.
 It means we can use the various tools for quality assurance (like
lintian) without too much noise.

> On the description changes... is "meta-package", hyphenated, the standard? I've only seen it hyphenless.
It's meta-package (with hyphen). See http://lintian.debian.org/tags/empty-binary-package.html

> On the copyright file changes... the debian/changelog declares the package dates back to 2005 - from what source to you derive 2009-2010 ?
I had based it on the output of "bzr log". The first revision is from
2009. I've updated the copyright file to use 2005.

> On the ${misc:Depends} addition... harmless and pacifies lintian,
> though a bit redundant in a metapackage. Might be better to place it
> on a final line on its own, so it doesn't keep getting involved in the
> diffs when people add packages.
Clearly we need a custom merger/differ for Debian control files in
Bazaar. :-)

Anyway, updated.

Cheers,

Jelmer

Revision history for this message
Max Bowsher (maxb) wrote :

OK then :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-07-29 12:59:44 +0000
+++ debian/changelog 2010-08-10 14:32:46 +0000
@@ -1,8 +1,11 @@
1launchpad-dependencies (0.81) lucid; urgency=low1launchpad-dependencies (0.81) lucid; urgency=low
22
3 * Suggest python-pydoctor (used by 'make pydoctor').3 * Suggest python-pydoctor (used by 'make pydoctor').
4 * Bump standards version to 3.9.1, no changes.
5 * Update description to mention that the packages are meta-packages.
6 * Update copyright file to include copyright.
47
5 -- Jelmer Vernooij <jelmer@debian.org> Thu, 29 Jul 2010 14:59:32 +02008 -- Jelmer Vernooij <jelmer@debian.org> Wed, 04 Aug 2010 14:18:23 +0200
69
7launchpad-dependencies (0.80) lucid; urgency=low10launchpad-dependencies (0.80) lucid; urgency=low
811
912
=== modified file 'debian/control'
--- debian/control 2010-07-29 12:59:44 +0000
+++ debian/control 2010-08-10 14:32:46 +0000
@@ -3,7 +3,7 @@
3Priority: optional3Priority: optional
4Maintainer: Launchpad package maintainers <launchpad@lists.canonical.com>4Maintainer: Launchpad package maintainers <launchpad@lists.canonical.com>
5Build-Depends: debhelper (>= 5.0.0)5Build-Depends: debhelper (>= 5.0.0)
6Standards-Version: 3.8.36Standards-Version: 3.9.1
77
8Package: launchpad-dependencies8Package: launchpad-dependencies
9Architecture: all9Architecture: all
@@ -22,19 +22,21 @@
22 python-support, python-pysqlite2, zlib1g-dev,22 python-support, python-pysqlite2, zlib1g-dev,
23 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,23 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
24 openssh-client, python-debian, python-egenix-mxdatetime,24 openssh-client, python-debian, python-egenix-mxdatetime,
25 python-egenix-mxtools, python-amqplib25 python-egenix-mxtools, python-amqplib,
26 ${misc:Depends}
26Recommends: launchpad-database-dependencies (= ${source:Version})27Recommends: launchpad-database-dependencies (= ${source:Version})
27Suggests:28Suggests:
28Description: Metapackage for dependencies of Launchpad29Description: Meta-package for dependencies of Launchpad
29 This package depends on all of the packages necessary to run the Launchpad30 This meta-package depends on all of the packages necessary to run the Launchpad
30 application.31 application.
3132
32Package: launchpad-soyuz-dependencies33Package: launchpad-soyuz-dependencies
33Architecture: all34Architecture: all
34Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),35Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
35 germinate, devscripts36 germinate, devscripts,
36Description: Metapackage for Launchpad Soyuz packages37 ${misc:Depends}
37 This package depends on all of the packages necessary to run Soyuz.38Description: Meta-package for Launchpad Soyuz packages
39 This meta-package depends on all of the packages necessary to run Soyuz.
3840
39Package: launchpad-developer-dependencies41Package: launchpad-developer-dependencies
40Architecture: all42Architecture: all
@@ -46,11 +48,12 @@
46 postgresql-doc-8.4 | postgresql-doc-8.3, postgresql-autodoc, tidy,48 postgresql-doc-8.4 | postgresql-doc-8.3, postgresql-autodoc, tidy,
47 python-codespeak-lib, pylint, mhonarc, python-imaging (>= 1.1.7),49 python-codespeak-lib, pylint, mhonarc, python-imaging (>= 1.1.7),
48 fakeroot, rsync, spidermonkey-bin, git-core, memcached,50 fakeroot, rsync, spidermonkey-bin, git-core, memcached,
49 xvfb, firefox, xfonts-base, intltool, python-pocket-lint51 xvfb, firefox, xfonts-base, intltool, python-pocket-lint,
52 ${misc:Depends}
50Recommends: pyflakes, subunit, python-boto53Recommends: pyflakes, subunit, python-boto
51Suggests: apache2, python-pydoctor54Suggests: apache2, python-pydoctor
52Description: Metapackage for dependencies of Launchpad55Description: Meta-package for dependencies of Launchpad
53 This package depends on all of the packages required to do development56 This meta-package depends on all of the packages required to do development
54 for the Launchpad application.57 for the Launchpad application.
5558
56Package: launchpad-database-dependencies59Package: launchpad-database-dependencies
@@ -60,14 +63,16 @@
60 postgresql-contrib-8.4 | postgresql-contrib-8.3,63 postgresql-contrib-8.4 | postgresql-contrib-8.3,
61 postgresql-plpython-8.4 | postgresql-plpython-8.3,64 postgresql-plpython-8.4 | postgresql-plpython-8.3,
62 postgresql-client-8.4 | postgresql-client-8.3, python-support,65 postgresql-client-8.4 | postgresql-client-8.3, python-support,
63 postgresql-8.4-slony1 | postgresql-8.3-slony1, slony1-bin66 postgresql-8.4-slony1 | postgresql-8.3-slony1, slony1-bin,
64Description: Metapackage for Launchpad database packages67 ${misc:Depends}
65 This package depends on all of the packages necessary to run a Launchpad68Description: Meta-package for Launchpad database packages
69 This meta-package depends on all of the packages necessary to run a Launchpad
66 database.70 database.
6771
68Package: launchpad-messagequeue-dependencies72Package: launchpad-messagequeue-dependencies
69Architecture: all73Architecture: all
70Depends: python-amqplib, rabbitmq-server, stunnel474Depends: python-amqplib, rabbitmq-server, stunnel4,
71Description: Metapackage for Launchpad messagequeue packages75 ${misc:Depends}
72 This package depends on all of the packages necessary to run a Launchpad76Description: Meta-package for Launchpad messagequeue packages
77 This meta-package depends on all of the packages necessary to run a Launchpad
73 messagequeue server.78 messagequeue server.
7479
=== modified file 'debian/copyright'
--- debian/copyright 2009-08-31 11:00:32 +0000
+++ debian/copyright 2010-08-10 14:32:46 +0000
@@ -1,3 +1,5 @@
1Copyright (C) 2005-2010 Canonical Ltd.
2
1The files in this package are free software; you can redistribute them3The files in this package are free software; you can redistribute them
2and/or modify them under the terms of the GNU General Public License4and/or modify them under the terms of the GNU General Public License
3as published by the Free Software Foundation; either version 2, or (at5as published by the Free Software Foundation; either version 2, or (at
@@ -9,8 +11,8 @@
9General Public License for more details.11General Public License for more details.
1012
11You should have received a copy of the GNU General Public License13You should have received a copy of the GNU General Public License
12with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, 14with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL,
13or with the Debian GNU/Linux bash source package as the file COPYING. 15or with the Debian GNU/Linux bash source package as the file COPYING.
14If not, write to the Free Software Foundation, Inc., 51 Franklin St,16If not, write to the Free Software Foundation, Inc., 51 Franklin St,
15Fifth Floor, Boston, MA 02110-1301, USA.17Fifth Floor, Boston, MA 02110-1301, USA.
1618

Subscribers

People subscribed via source and target branches