Merge lp:~cjwatson/meta-lp-deps/py3 into lp:meta-lp-deps

Proposed by Colin Watson
Status: Merged
Merged at revision: 209
Proposed branch: lp:~cjwatson/meta-lp-deps/py3
Merge into: lp:meta-lp-deps
Diff against target: 77 lines (+28/-10)
2 files modified
debian/changelog (+14/-0)
debian/control (+14/-10)
To merge this branch: bzr merge lp:~cjwatson/meta-lp-deps/py3
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+391061@code.launchpad.net

Commit message

Remove some obsolete dependencies, and add Python 3 dependencies

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

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 2020-02-11 22:12:11 +0000
3+++ debian/changelog 2020-09-21 17:06:41 +0000
4@@ -1,3 +1,17 @@
5+launchpad-dependencies (0.138) UNRELEASED; urgency=medium
6+
7+ * Remove dependency on python-lxml; Launchpad now installs that in its
8+ virtualenv instead.
9+ * Remove dependency on python-gmpy; Launchpad no longer uses it.
10+ * Remove dependency on python-py; Launchpad no longer uses it.
11+ * Replace dependency on python-html5-browser with its GObject
12+ Introspection dependencies; html5browser is now directly in the
13+ Launchpad tree.
14+ * Add Python 3 dependencies (python3-dev, python3-apt, python3-pil,
15+ python3-convoy, and python3-tdb).
16+
17+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 21 Sep 2020 17:55:47 +0100
18+
19 launchpad-dependencies (0.137) xenial; urgency=medium
20
21 * Remove dependency on python-tickcount; Launchpad no longer uses it.
22
23=== modified file 'debian/control'
24--- debian/control 2020-02-11 22:10:26 +0000
25+++ debian/control 2020-09-21 17:06:41 +0000
26@@ -7,25 +7,28 @@
27
28 Package: launchpad-dependencies
29 Architecture: all
30-Depends: bzr, git, python-dev, gettext, libgettextpo-dev, build-essential,
31- python-apt (>= 0.8.0ubuntu1), python-geoip, libmaxminddb-dev,
32+Depends: bzr, git,
33+ python-dev, python3-dev,
34+ gettext, libgettextpo-dev, build-essential,
35+ python-apt (>= 0.8.0ubuntu1), python3-apt,
36+ python-geoip, libmaxminddb-dev,
37 gnupg1 | gnupg (<< 2.1.11-7+exp1), libgpgme11-dev (>= 1.1.0), cvs, subversion,
38 python-sqlite, ubuntu-keyring,
39- python-pil,
40+ python-pil, python3-pil,
41 bison, graphviz,
42- libxml2-utils, patchutils, python-lxml,
43+ libxml2-utils, patchutils,
44 openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,
45 geoip-data | geoip-data-city-lite,
46- python, python (>= 2.7),
47 python-subunit (>= 0.0.4),
48 python-pysqlite2, zlib1g-dev,
49 ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
50 openssh-client,
51- python-gmpy, libpq-dev, unzip, lzma,
52- python-convoy, virtualenv | python-virtualenv (<< 1.11.6),
53+ libpq-dev, unzip, lzma,
54+ python-convoy, python3-convoy,
55+ virtualenv | python-virtualenv (<< 1.11.6),
56 libsodium-dev, libffi-dev, libssl-dev,
57 libxml2-dev, libxslt1-dev,
58- python-tdb,
59+ python-tdb, python3-tdb,
60 ${misc:Depends}
61 Recommends: launchpad-database-dependencies (= ${source:Version})
62 Suggests:
63@@ -53,11 +56,12 @@
64 launchpad-frontend-dependencies (= ${source:Version}),
65 exuberant-ctags, geoip-data-city-lite,
66 pgbouncer (>= 1.6) | pgbouncer-with-disconnect, postgresql-autodoc, tidy,
67- python-py,
68 mhonarc,
69 fakeroot, rsync, memcached,
70 xvfb, firefox, intltool, python-pocket-lint,
71- python-html5-browser,
72+ gir1.2-glib-2.0,
73+ gir1.2-gtk-3.0,
74+ gir1.2-webkit-3.0,
75 ${misc:Depends}
76 Recommends: pyflakes, subunit, python-boto, bzr-lpreview-body,
77 postgresql-doc-9.3

Subscribers

People subscribed via source and target branches