← Back to team overview

launchpad-reviewers team mailing list archive

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

 

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

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


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.

-- 
https://code.launchpad.net/~jelmer/meta-lp-deps/lintian/+merge/31745
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/meta-lp-deps/lintian into lp:meta-lp-deps.
=== modified file 'debian/changelog'
--- debian/changelog	2010-07-29 12:59:44 +0000
+++ debian/changelog	2010-08-04 12:24:48 +0000
@@ -1,8 +1,11 @@
 launchpad-dependencies (0.81) lucid; urgency=low
 
   * Suggest python-pydoctor (used by 'make pydoctor').
+  * Bump standards version to 3.9.1.
+  * Update description to mention that the packages are metapackages.
+  * Update copyright file to include copyright.
 
- -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Thu, 29 Jul 2010 14:59:32 +0200
+ -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Wed, 04 Aug 2010 14:18:23 +0200
 
 launchpad-dependencies (0.80) lucid; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-07-29 12:59:44 +0000
+++ debian/control	2010-08-04 12:24:48 +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,19 +22,19 @@
   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, ${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
+Description: Meta-package for dependencies of Launchpad
+ This meta-package depends on all of the packages necessary to run the Launchpad
  application.
 
 Package: launchpad-soyuz-dependencies
 Architecture: all
 Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4),
-  germinate, devscripts
-Description: Metapackage for Launchpad Soyuz packages
- This package depends on all of the packages necessary to run Soyuz.
+  germinate, devscripts, ${misc:Depends}
+Description: Meta-package for Launchpad Soyuz packages
+ This meta-package depends on all of the packages necessary to run Soyuz.
 
 Package: launchpad-developer-dependencies
 Architecture: all
@@ -46,11 +46,11 @@
   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, python-pydoctor
-Description: Metapackage for dependencies of Launchpad
- This package depends on all of the packages required to do development
+Description: Meta-package for dependencies of Launchpad
+ This meta-package depends on all of the packages required to do development
  for the Launchpad application.
 
 Package: launchpad-database-dependencies
@@ -60,14 +60,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
-Description: Metapackage for Launchpad database packages
- This package depends on all of the packages necessary to run a Launchpad
+  postgresql-8.4-slony1 | postgresql-8.3-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
  database.
 
 Package: launchpad-messagequeue-dependencies
 Architecture: all
-Depends: python-amqplib, rabbitmq-server, stunnel4
-Description: Metapackage for Launchpad messagequeue packages
- This package depends on all of the packages necessary to run a Launchpad
+Depends: python-amqplib, rabbitmq-server, stunnel4, ${misc:Depends}
+Description: Meta-package for Launchpad messagequeue packages
+ This meta-package depends on all of the packages necessary to run a Launchpad
  messagequeue server.

=== modified file 'debian/copyright'
--- debian/copyright	2009-08-31 11:00:32 +0000
+++ debian/copyright	2010-08-04 12:24:48 +0000
@@ -1,3 +1,5 @@
+Copyright (C) 2009-2010 Canonical Ltd.
+
 The files in this package are free software; you can redistribute them
 and/or modify them under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2, or (at
@@ -9,8 +11,8 @@
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, 
-or with the Debian GNU/Linux bash source package as the file COPYING.  
+with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL,
+or with the Debian GNU/Linux bash source package as the file COPYING.
 If not, write to the Free Software Foundation, Inc., 51 Franklin St,
 Fifth Floor, Boston, MA 02110-1301, USA.
 


Follow ups