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

[Athos Ribeiro]

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

[Sergio Durigan Junior (sergiodj)]

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

[git-ubuntu bot (git-ubuntu-bot)]

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

review: Approve

[Athos Ribeiro (athos-ribeiro)]

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.

[Athos Ribeiro (athos-ribeiro)]

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

[Athos Ribeiro (athos-ribeiro)]

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.

[Athos Ribeiro (athos-ribeiro)]

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

[Athos Ribeiro (athos-ribeiro)]

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️ 🗒️

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

LGTM, +1.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

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

review: Approve

diff --git a/debian/changelog b/debian/changelog
index de4c700..b9425c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-15 (15.4-1ubuntu1) mantic; urgency=medium
+
+  * d/control: pin llvm-15 build dependencies. (LP: #2029498)
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 10 Aug 2023 20:53:01 -0300
+
 postgresql-15 (15.4-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index f978516..6747ca1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-15
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders:
  Martin Pitt <[e-mail]>,
  Peter Eisentraut <[e-mail]>,
@@ -11,7 +12,7 @@ Rules-Requires-Root: no
 Build-Depends:
  autoconf,
  bison,
- clang [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
+ clang-15 [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
  debhelper-compat (= 13),
  dh-exec (>= 0.13~),
  docbook-xml,
@@ -36,7 +37,7 @@ Build-Depends:
  libxml2-utils,
  libxslt1-dev,
  libzstd-dev (>= 1.4.0) <!pkg.postgresql.nozstd>,
- llvm-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
+ llvm-15-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32],
  lz4 | liblz4-tool,
  mawk,
  perl (>= 5.8),