Merge ~paelzer/ubuntu/+source/postgresql-14:FTBFS-archive-rebuild-KINETIC into ubuntu/+source/postgresql-14:ubuntu/kinetic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA (retest of the failure under our control): https://launchpad.net/~paelzer/+archive/ubuntu/kinetic-archive-rebuild-pgsql-retest

PPA (proposed fix):
https://launchpad.net/~paelzer/+archive/ubuntu/kinetic-archive-rebuild-pgsql-fix

Discussions & Details (also mentioned in the commit):
https://lists.ubuntu.com/archives/ubuntu-devel/2022-September/042316.html

[Christian Ehrhardt  (paelzer)]

Hmm, switching back to llvm-14 still causes issues, maybe we need to set more back in time.
Like clang -> clang-14

Back to WIP.

[Christian Ehrhardt  (paelzer)]

Update:
1. retest PPA confirmed it is reproducible this way.
2. fixed the clang/llvm cros dependency, new upload in the fix PPA

back to ready for review (hoping for good builds this time, a local test passed the two former issues before I aborted it)

[Christian Ehrhardt  (paelzer)]

PPA builds start to complete, seems to work now \o/
Let us hope there is no one-off architecture.

[Athos Ribeiro (athos-ribeiro)]

Are we missing the commits for the clang update here?

review: Needs Information

[Christian Ehrhardt  (paelzer)]

Yes, my internet was down, reconnected and connections to canonical failed due to the VPN not realizing the problem.
Pushed now.

[Athos Ribeiro (athos-ribeiro)]

Thanks!

LGTM :)

review: Approve

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

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

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, uploaded

Uploading postgresql-14_14.5-1ubuntu1.dsc
Uploading postgresql-14_14.5-1ubuntu1.debian.tar.xz
Uploading postgresql-14_14.5-1ubuntu1_source.buildinfo
Uploading postgresql-14_14.5-1ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 33eb6f0..d81a652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgresql-14 (14.5-1ubuntu1) kinetic; urgency=medium
+
+  * d/control: Fix FTBFS by depending on llvm-14-dev/clang-14 for now
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 20 Sep 2022 09:41:03 +0200
+
 postgresql-14 (14.5-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 0d6c863..360bd27 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-14
 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 !s390x !sh4 !sparc64 !x32],
+ clang-14 [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !s390x !sh4 !sparc64 !x32],
  debhelper-compat (= 13),
  dh-exec (>= 0.13~),
  docbook-xml,
@@ -35,7 +36,7 @@ Build-Depends:
  libxml2-dev,
  libxml2-utils,
  libxslt1-dev,
- llvm-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !s390x !sh4 !sparc64 !x32],
+ llvm-14-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !s390x !sh4 !sparc64 !x32],
  mawk,
  perl (>= 5.8),
  pkg-config,