Merge ~athos-ribeiro/ubuntu/+source/postgresql-15:llvm-15 into ubuntu/+source/postgresql-15:ubuntu/devel

Proposed by Athos Ribeiro
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 1a5f31fb96cf08513aa4635e1287fc2848b42e91
Proposed branch: ~athos-ribeiro/ubuntu/+source/postgresql-15:llvm-15
Merge into: ubuntu/+source/postgresql-15:ubuntu/devel
Diff against target: 46 lines (+10/-3)
2 files modified
debian/changelog (+6/-0)
debian/control (+4/-3)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Sergio Durigan Junior (community) Approve
Canonical Server Reporter Pending
Review via email: mp+448961@code.launchpad.net

This proposal supersedes a proposal from 2023-08-03.

Description of the change

Fix for LP: #2029498 - DO NOT MERGE until we have an ack from foundations in the LP bug.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/pgsql-15-llvm-16/+packages

autopkgtest PPA run results:

* Results:
  - postgresql-15/15.3-1ubuntu1~ppa1
    + ✅ postgresql-15 on mantic for amd64 @ 03.08.23 21:00:39
    + ✅ postgresql-15 on mantic for arm64 @ 03.08.23 21:29:38
    + ✅ postgresql-15 on mantic for armhf @ 03.08.23 21:12:48
    + ✅ postgresql-15 on mantic for ppc64el @ 03.08.23 21:15:09
    + ✅ postgresql-15 on mantic for s390x @ 03.08.23 21:10:22

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote : Posted in a previous version of this proposal

Thanks, Athos.

This makes sense to me, but I'm OK if you want to wait a bit before uploading, especially given the tzdata bug (bug #2030684).

+1

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote : Posted in a previous version of this proposal

Approvers: athos-ribeiro, sergiodj
Uploaders: athos-ribeiro, sergiodj
MP auto-approved

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote : Posted in a previous version of this proposal

Thanks Sergio, I will hold this for now because

1) postgresql currently FTBFS due to the tzdata bug; and
2) postgresql 15.4 is out and should be available in Debian as soon as the tzdata bug is fixed.

Hence, it would be cleaner to let 15.4 sync and then add this patch as a delta to it (instead of adding the delta now on 15.3 and merge 15.4 right after that).

I will re-visit this if the tzdata bug receives an Ubuntu-only fix for now.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote : Posted in a previous version of this proposal

postgresql 15.4 was just pushed to debian. Once it syncs, I will update this MR so we can proceed here.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Updated for postgresql 15.4.

I will post the dep8 test results as soon as I have them.

Do note that without this patch, postgresql 15.4 is stuck in proposed due to FTBFS.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

autopkgtest on the ppa are currently failing due to the libc transition.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

autopkgtest using packages from proposed:

  - postgresql-15/15.4-1ubuntu1
    + ✅ postgresql-15 on mantic for amd64 @ 11.08.23 19:06:04 Log️ 🗒️
    + ✅ postgresql-15 on mantic for arm64 @ 11.08.23 18:26:05 Log️ 🗒️
    + ✅ postgresql-15 on mantic for armhf @ 11.08.23 18:20:10 Log️ 🗒️
    + ✅ postgresql-15 on mantic for i386 @ 11.08.23 18:53:12 Log️ 🗒️
    + ✅ postgresql-15 on mantic for ppc64el @ 11.08.23 18:02:45 Log️ 🗒️
    + ✅ postgresql-15 on mantic for s390x @ 11.08.23 18:01:24 Log️ 🗒️

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Athos.

LGTM, +1.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: athos-ribeiro, sergiodj
Uploaders: athos-ribeiro, sergiodj
MP auto-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index de4c700..b9425c4 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+postgresql-15 (15.4-1ubuntu1) mantic; urgency=medium
7+
8+ * d/control: pin llvm-15 build dependencies. (LP: #2029498)
9+
10+ -- Athos Ribeiro <athos.ribeiro@canonical.com> Thu, 10 Aug 2023 20:53:01 -0300
11+
12 postgresql-15 (15.4-1) unstable; urgency=medium
13
14 * New upstream version.
15diff --git a/debian/control b/debian/control
16index f978516..6747ca1 100644
17--- a/debian/control
18+++ b/debian/control
19@@ -1,7 +1,8 @@
20 Source: postgresql-15
21 Section: database
22 Priority: optional
23-Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
26 Uploaders:
27 Martin Pitt <mpitt@debian.org>,
28 Peter Eisentraut <petere@debian.org>,
29@@ -11,7 +12,7 @@ Rules-Requires-Root: no
30 Build-Depends:
31 autoconf,
32 bison,
33- clang [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
34+ clang-15 [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
35 debhelper-compat (= 13),
36 dh-exec (>= 0.13~),
37 docbook-xml,
38@@ -36,7 +37,7 @@ Build-Depends:
39 libxml2-utils,
40 libxslt1-dev,
41 libzstd-dev (>= 1.4.0) <!pkg.postgresql.nozstd>,
42- llvm-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
43+ llvm-15-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
44 lz4 | liblz4-tool,
45 mawk,
46 perl (>= 5.8),

Subscribers

People subscribed via source and target branches