Merge lp:~cjwatson/meta-lp-deps/restore-py2-convoy into lp:meta-lp-deps

Proposed by Colin Watson
Status: Merged
Merged at revision: 218
Proposed branch: lp:~cjwatson/meta-lp-deps/restore-py2-convoy
Merge into: lp:meta-lp-deps
Diff against target: 24 lines (+2/-1)
2 files modified
debian/changelog (+1/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/meta-lp-deps/restore-py2-convoy
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+409740@code.launchpad.net

Commit message

Restore python-convoy, removed prematurely.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) :
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 2021-09-03 12:05:20 +0000
3+++ debian/changelog 2021-10-06 12:41:31 +0000
4@@ -2,6 +2,7 @@
5
6 * Depend on postgresql-plpython3-10, so that we can start porting
7 PL/Python functions to Python 3.
8+ * Restore python-convoy, removed prematurely.
9
10 -- Colin Watson <cjwatson@ubuntu.com> Fri, 03 Sep 2021 13:03:10 +0100
11
12
13=== modified file 'debian/control'
14--- debian/control 2021-09-03 12:05:20 +0000
15+++ debian/control 2021-10-06 12:41:31 +0000
16@@ -22,7 +22,7 @@
17 zlib1g-dev,
18 ca-certificates, libapr1-dev, libsvn-dev,
19 libpq-dev, unzip, lzma,
20- python3-convoy,
21+ python-convoy, python3-convoy,
22 virtualenv,
23 libsodium-dev, libffi-dev, libssl-dev,
24 libxml2-dev, libxslt1-dev,

Subscribers

People subscribed via source and target branches