Jelmer Vernooij has proposed merging lp:~jelmer/meta-lp-deps/chardet-dep into lp:meta-lp-deps.
Requested reviews: Launchpad code reviewers (launchpad-reviewers): code python-debian is now included in sourcedeps, so remove the dependency on the python-debian package. Instead, add a dependency on python-chardet which newer versions of python-debian need (I'd like to merge in a newer upstream version). -- https://code.launchpad.net/~jelmer/meta-lp-deps/chardet-dep/+merge/38410 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/meta-lp-deps/chardet-dep into lp:meta-lp-deps.
=== modified file 'debian/changelog' --- debian/changelog 2010-09-30 21:04:35 +0000 +++ debian/changelog 2010-10-14 11:59:40 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE launchpad-dependencies (0.82) maverick; urgency=low * Broken with python-psycopg2 2.2+ (LP: #631010) @@ -15,6 +16,15 @@ -- Jelmer Vernooij <[email protected]> Wed, 04 Aug 2010 14:18:23 +0200 +======= +launchpad-dependencies (0.81) lucid; urgency=low + + * Bump standards version to 3.9.1. + * Add dependency on python-chardet, required for python-debian. + + -- Jelmer Vernooij <[email protected]> Thu, 29 Jul 2010 12:23:36 +0200 + +>>>>>>> MERGE-SOURCE 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-09-30 21:04:35 +0000 +++ debian/control 2010-10-14 11:59:40 +0000 @@ -23,21 +23,37 @@ python-support, python-pysqlite2, zlib1g-dev, ca-certificates, python-pyrex, libapr1-dev, libsvn-dev, openssh-client, python-debian, python-egenix-mxdatetime, +<<<<<<< TREE python-egenix-mxtools, python-amqplib, ${misc:Depends} +======= + python-egenix-mxtools, python-amqplib, python-chardet, + ${misc:Depends} +>>>>>>> MERGE-SOURCE Recommends: launchpad-database-dependencies (= ${source:Version}) +<<<<<<< TREE Suggests: Description: Meta-package for dependencies of Launchpad This meta-package depends on all of the packages necessary to run the Launchpad +======= +Description: Metapackage for dependencies of Launchpad + This package depends on all of the packages necessary to run the Launchpad +>>>>>>> MERGE-SOURCE application. Package: launchpad-soyuz-dependencies Architecture: all Depends: launchpad-dependencies (= ${source:Version}), dpkg (>= 1.15.4), +<<<<<<< TREE germinate, devscripts, ${misc:Depends} Description: Meta-package for Launchpad Soyuz packages This meta-package depends on all of the packages necessary to run Soyuz. +======= + germinate, devscripts, ${misc:Depends} +Description: Metapackage for Launchpad Soyuz packages + This package depends on all of the packages necessary to run Soyuz. +>>>>>>> MERGE-SOURCE Package: launchpad-developer-dependencies Architecture: all @@ -49,12 +65,20 @@ 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, +<<<<<<< TREE xvfb, firefox, xfonts-base, intltool, python-pocket-lint, ${misc:Depends} Recommends: pyflakes, subunit, python-boto, bzr-lpreview-body Suggests: apache2, python-pydoctor Description: Meta-package for dependencies of Launchpad This meta-package depends on all of the packages required to do development +======= + xvfb, firefox, xfonts-base, intltool, python-pocket-lint, ${misc:Depends} +Recommends: pyflakes, subunit, python-boto +Suggests: apache2 +Description: Metapackage for dependencies of Launchpad + This package depends on all of the packages required to do development +>>>>>>> MERGE-SOURCE for the Launchpad application. Package: launchpad-database-dependencies @@ -64,16 +88,28 @@ 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, +<<<<<<< TREE 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 +======= + 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 +>>>>>>> MERGE-SOURCE database. Package: launchpad-messagequeue-dependencies Architecture: all +<<<<<<< TREE 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 +======= +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 +>>>>>>> MERGE-SOURCE messagequeue server.
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
