Merge lp:~lgp171188/meta-lp-deps/focal-fixes into lp:meta-lp-deps

Proposed by Guruprasad
Status: Merged
Merged at revision: 226
Proposed branch: lp:~lgp171188/meta-lp-deps/focal-fixes
Merge into: lp:meta-lp-deps
Diff against target: 64 lines (+19/-3)
2 files modified
debian/changelog (+5/-1)
debian/control (+14/-2)
To merge this branch: bzr merge lp:~lgp171188/meta-lp-deps/focal-fixes
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+428856@code.launchpad.net

Commit message

Add Postgres 12 support

Depend on libgpgme-dev if libgpgme11-dev is unavailable

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

> Depend on libgpgme-dev if libgpgme11-dev is unavailable

... describes the what, but not the why.

Why would the one be available, but not all times? And why is fallback a viable option? Is it to make the same code base compatible with different Ubuntu versions?

Revision history for this message
Guruprasad (lgp171188) wrote :

I could have worded it better.

The `libgpgme11-dev` package in xenial was renamed to `libgpgme-dev` in the newer releases. We forward-ported the xenial package to bionic in the Launchpad PPA and continued using it. But while preparing for the focal upgrade, we want to use the official version when available.

With this change, the newer `libgpgme-dev` package (corresponding to a much newer GnuPG version) will only get installed when the `libgpgme11-dev` package is unavailable (it is unavailable only on focal, atm).

Revision history for this message
Colin Watson (cjwatson) wrote :

The `libgpgme11-dev` story is actually a little more complicated than that. We _didn't_ forward-port the xenial package to bionic. Instead, in bionic, the official `libgpgme-dev` package has this metadata:

  Provides: libgpgme11-dev (= 1.10.0-1ubuntu1)

That means that a dependency on `libgpgme11-dev` still works. And in fact, there's similar metadata in focal and even jammy, so the `libgpgme-dev` change is technically unnecessary. I think you only needed this because (I'm guessing) you've been installing individual packages by hand using `apt install` rather than being able to install the whole of `launchpad-dependencies` at once, due to the `python-convoy` situation.

However, I'm OK with this change anyway to make things easier for people installing individual dependencies by hand, as well as because once we require bionic or later we can simplify this dependency to just `libgpgme-dev` without the alternative.

review: Approve
228. By Guruprasad

Remove the postgresql-plpython-12 dependency

Launchpad no longer uses it and this package is not available on focal.

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 2022-08-18 14:29:09 +0000
3+++ debian/changelog 2022-08-25 10:09:48 +0000
4@@ -15,6 +15,10 @@
5 this is required for Selenium-based test browser
6 * Remove gir1.2-* dependencies; it is superseded with firefox/selenium.
7
8+ [ Guruprasad Lakshmi Narayanan ]
9+ * Add PostgreSQL 12 support.
10+ * Depend on libgpgme-dev if libgpgme11-dev is unavailable.
11+
12 -- Colin Watson <cjwatson@ubuntu.com> Fri, 06 May 2022 12:26:43 +0200
13
14 launchpad-dependencies (0.141) xenial; urgency=medium
15@@ -327,7 +331,7 @@
16
17 launchpad-dependencies (0.102) oneiric; urgency=low
18
19- * Add python-lpbuildd to launchpad-developer-dependencies, so it can
20+ * Add python-lpbuildd to launchpad-developer-dependencies, so it can
21 be removed from the Launchpad tree while still running integration tests.
22 LP: #800295
23
24
25=== modified file 'debian/control'
26--- debian/control 2022-08-18 14:29:09 +0000
27+++ debian/control 2022-08-25 10:09:48 +0000
28@@ -12,7 +12,7 @@
29 gettext, libgettextpo-dev, build-essential,
30 python3-apt,
31 libmaxminddb-dev,
32- gnupg1 | gnupg (<< 2.1.11-7+exp1), libgpgme11-dev (>= 1.1.0), cvs, subversion,
33+ gnupg1 | gnupg (<< 2.1.11-7+exp1), libgpgme11-dev (>= 1.1.0) | libgpgme-dev, cvs, subversion,
34 ubuntu-keyring,
35 python3-pil,
36 bison, graphviz,
37@@ -66,7 +66,7 @@
38
39 Package: launchpad-database-dependencies
40 Architecture: all
41-Depends: launchpad-database-dependencies-10,
42+Depends: launchpad-database-dependencies-10 | launchpad-database-dependencies-12,
43 slony1-2-bin,
44 ${misc:Depends}
45 Description: Metapackage for Launchpad database packages
46@@ -86,6 +86,18 @@
47 This metapackage depends on all of the packages necessary to run a Launchpad
48 database.
49
50+Package: launchpad-database-dependencies-12
51+Architecture: all
52+Depends: postgresql-12,
53+ postgresql-plpython3-12,
54+ postgresql-client-12,
55+ postgresql-12-slony1-2,
56+ postgresql-12-debversion,
57+ ${misc:Depends}
58+Description: Metapackage for Launchpad database packages
59+ This metapackage depends on all of the packages necessary to run a Launchpad
60+ database.
61+
62 Package: launchpad-messagequeue-dependencies
63 Architecture: all
64 Depends: rabbitmq-server, stunnel4, ${misc:Depends}

Subscribers

People subscribed via source and target branches