Merge lp:~jelmer/meta-lp-deps/chardet-dep into lp:meta-lp-deps

[Jelmer Vernooij]

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).

[lp:~jelmer/meta-lp-deps/chardet-dep]

103. By Max Bowsher on 2010-10-14

[r=jelmer] Require PostgreSQL 8.4 only, not 8.4 | 8.3.

[Max Bowsher (maxb)]

Could you resolve the conflicts and mention that is is version 0.1.17 of python-debian that adds the requirement in the changelog? Thanks.

review: Needs Fixing

[lp:~jelmer/meta-lp-deps/chardet-dep]

104. By Max Bowsher on 2010-10-14

[r=jelmer] Update launchpad-developer-dependencies, in Maverick, python-codespeak-lib is renamed to python-py.

[Jelmer Vernooij (jelmer)]

On Thu, 2010-10-14 at 12:21 +0000, Max Bowsher wrote:
> Review: Needs Fixing
> Could you resolve the conflicts and mention that is is version 0.1.17 of python-debian that adds the requirement in the changelog? Thanks.
Fixed.

Cheers,

jelmer

[Max Bowsher (maxb)]

review: Approve

[lp:~jelmer/meta-lp-deps/chardet-dep]

105. By Jelmer Vernooij on 2010-10-14

* Depend on python-chardet, required by version 0.1.17 of python-
  debian and later.
* Remove dependency on python-debian, now in sourcedeps.

106. By Jelmer Vernooij on 2010-10-14

Remove dependency on git-core, no longer used by newer versions of
bzr-git/dulwich.

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-14 12:25:32 +0000
+++ debian/changelog	2010-10-14 22:21:02 +0000
@@ -1,9 +1,17 @@
 launchpad-dependencies (0.84) UNRELEASED; urgency=low
 
+  [ Max Bowsher ]
   * Update launchpad-developer-dependencies, in Maverick, python-codespeak-lib
     is renamed to python-py.
 
- -- Max Bowsher <[e-mail]>  Thu, 14 Oct 2010 13:22:41 +0100
+  [ Jelmer Vernooij ]
+  * Depend on python-chardet, required by version 0.1.17 of python-
+    debian and later.
+  * Remove dependency on python-debian, now in sourcedeps.
+  * Remove dependency on git-core, no longer used by newer versions of
+    bzr-git/dulwich.
+
+ -- Jelmer Vernooij <[e-mail]>  Thu, 14 Oct 2010 16:35:28 +0200
 
 launchpad-dependencies (0.83) maverick; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-10-14 12:25:32 +0000
+++ debian/control	2010-10-14 22:21:02 +0000
@@ -13,7 +13,7 @@
   python-subversion, python-sqlite, ubuntu-keyring,
   python-imaging, python-feedparser,
   python-paramiko, python-openid, python-openssl,
-  bison, graphviz,
+  bison, graphviz, python-chardet,
   python-tickcount, libxml2-utils, patchutils,
   openssh-blacklist, openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,
   python-magic, geoip-data | geoip-data-city-lite,
@@ -22,7 +22,7 @@
   python-subunit (>= 0.0.4),
   python-support, python-pysqlite2, zlib1g-dev,
   ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
-  openssh-client, python-debian, python-egenix-mxdatetime,
+  openssh-client, python-egenix-mxdatetime,
   python-egenix-mxtools, python-amqplib,
   ${misc:Depends}
 Recommends: launchpad-database-dependencies (= ${source:Version})
@@ -49,7 +49,7 @@
   postgresql-doc-8.4, postgresql-autodoc, tidy,
   python-codespeak-lib | python-py,
   pylint, mhonarc, python-imaging (>= 1.1.7),
-  fakeroot, rsync, spidermonkey-bin, git-core, memcached,
+  fakeroot, rsync, spidermonkey-bin, memcached,
   xvfb, firefox, xfonts-base, intltool, python-pocket-lint,
   ${misc:Depends}
 Recommends: pyflakes, subunit, python-boto, bzr-lpreview-body