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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-29 12:59:44 +0000
3+++ debian/changelog 2010-08-10 14:32:46 +0000
4@@ -1,8 +1,11 @@
5 launchpad-dependencies (0.81) lucid; urgency=low
6
7 * Suggest python-pydoctor (used by 'make pydoctor').
8+ * Bump standards version to 3.9.1, no changes.
9+ * Update description to mention that the packages are meta-packages.
10+ * Update copyright file to include copyright.
11
12- -- Jelmer Vernooij <jelmer@debian.org> Thu, 29 Jul 2010 14:59:32 +0200
13+ -- Jelmer Vernooij <jelmer@debian.org> Wed, 04 Aug 2010 14:18:23 +0200
14
15 launchpad-dependencies (0.80) lucid; urgency=low
16
17
18=== modified file 'debian/control'
19--- debian/control 2010-07-29 12:59:44 +0000
20+++ debian/control 2010-08-10 14:32:46 +0000
21@@ -3,7 +3,7 @@
22 Priority: optional
23 Maintainer: Launchpad package maintainers <launchpad@lists.canonical.com>
24 Build-Depends: debhelper (>= 5.0.0)
25-Standards-Version: 3.8.3
26+Standards-Version: 3.9.1
27
28 Package: launchpad-dependencies
29 Architecture: all
30@@ -22,19 +22,21 @@
31 python-support, python-pysqlite2, zlib1g-dev,
32 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
33 openssh-client, python-debian, python-egenix-mxdatetime,
34- python-egenix-mxtools, python-amqplib
35+ python-egenix-mxtools, python-amqplib,
36+ ${misc:Depends}
37 Recommends: launchpad-database-dependencies (= ${source:Version})
38 Suggests:
39-Description: Metapackage for dependencies of Launchpad
40- This package depends on all of the packages necessary to run the Launchpad
41+Description: Meta-package for dependencies of Launchpad
42+ This meta-package depends on all of the packages necessary to run the Launchpad
43 application.
44
45 Package: launchpad-soyuz-dependencies
46 Architecture: all
47 Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
48- germinate, devscripts
49-Description: Metapackage for Launchpad Soyuz packages
50- This package depends on all of the packages necessary to run Soyuz.
51+ germinate, devscripts,
52+ ${misc:Depends}
53+Description: Meta-package for Launchpad Soyuz packages
54+ This meta-package depends on all of the packages necessary to run Soyuz.
55
56 Package: launchpad-developer-dependencies
57 Architecture: all
58@@ -46,11 +48,12 @@
59 postgresql-doc-8.4 | postgresql-doc-8.3, postgresql-autodoc, tidy,
60 python-codespeak-lib, pylint, mhonarc, python-imaging (>= 1.1.7),
61 fakeroot, rsync, spidermonkey-bin, git-core, memcached,
62- xvfb, firefox, xfonts-base, intltool, python-pocket-lint
63+ xvfb, firefox, xfonts-base, intltool, python-pocket-lint,
64+ ${misc:Depends}
65 Recommends: pyflakes, subunit, python-boto
66 Suggests: apache2, python-pydoctor
67-Description: Metapackage for dependencies of Launchpad
68- This package depends on all of the packages required to do development
69+Description: Meta-package for dependencies of Launchpad
70+ This meta-package depends on all of the packages required to do development
71 for the Launchpad application.
72
73 Package: launchpad-database-dependencies
74@@ -60,14 +63,16 @@
75 postgresql-contrib-8.4 | postgresql-contrib-8.3,
76 postgresql-plpython-8.4 | postgresql-plpython-8.3,
77 postgresql-client-8.4 | postgresql-client-8.3, python-support,
78- postgresql-8.4-slony1 | postgresql-8.3-slony1, slony1-bin
79-Description: Metapackage for Launchpad database packages
80- This package depends on all of the packages necessary to run a Launchpad
81+ postgresql-8.4-slony1 | postgresql-8.3-slony1, slony1-bin,
82+ ${misc:Depends}
83+Description: Meta-package for Launchpad database packages
84+ This meta-package depends on all of the packages necessary to run a Launchpad
85 database.
86
87 Package: launchpad-messagequeue-dependencies
88 Architecture: all
89-Depends: python-amqplib, rabbitmq-server, stunnel4
90-Description: Metapackage for Launchpad messagequeue packages
91- This package depends on all of the packages necessary to run a Launchpad
92+Depends: python-amqplib, rabbitmq-server, stunnel4,
93+ ${misc:Depends}
94+Description: Meta-package for Launchpad messagequeue packages
95+ This meta-package depends on all of the packages necessary to run a Launchpad
96 messagequeue server.
97
98=== modified file 'debian/copyright'
99--- debian/copyright 2009-08-31 11:00:32 +0000
100+++ debian/copyright 2010-08-10 14:32:46 +0000
101@@ -1,3 +1,5 @@
102+Copyright (C) 2005-2010 Canonical Ltd.
103+
104 The files in this package are free software; you can redistribute them
105 and/or modify them under the terms of the GNU General Public License
106 as published by the Free Software Foundation; either version 2, or (at
107@@ -9,8 +11,8 @@
108 General Public License for more details.
109
110 You should have received a copy of the GNU General Public License
111-with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL,
112-or with the Debian GNU/Linux bash source package as the file COPYING.
113+with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL,
114+or with the Debian GNU/Linux bash source package as the file COPYING.
115 If not, write to the Free Software Foundation, Inc., 51 Franklin St,
116 Fifth Floor, Boston, MA 02110-1301, USA.
117

Subscribers

People subscribed via source and target branches