Merge ~athos-ribeiro/ubuntu/+source/postgresql-common:merge-lp1986981-kinetic into ubuntu/+source/postgresql-common:debian/sid

[Athos Ribeiro]

Merge for new version of postgresql-common. This was a simple merge, where we just needed to carry our one-commit delta to avoid package upgrade regressions.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1986981-merge-postgresql-common-kinetic/+packages

autopkgtest local run result summary:

autopkgtest [15:05:53]: @@@@@@@@@@@@@@@@@@@@ summary
default-psql PASS
run-testsuite PASS

[Bryce Harrington (bryce)]

From reading over the bug history, it sounds like --no-stop-on-upgrade was added to compensate for some other (Ubuntu?) delta, but there's no other delta in this package. If this also affects debian I wonder if it should be pushed up to them?

In any case, regardless of that this package LGTM, +1. I've queued up autopkgtests:

$ lp-test-ppa ppa:athos-ribeiro/lp1986981-merge-postgresql-common-kinetic -r kinetic
Tests for PPA lp1986981-merge-postgresql-common-kinetic
---- ---- ---- ----
Release: kinetic
Sources:
  SRC: postgresql-common @ 242ubuntu1~ppa1 - Published
Triggers on published Sources:
     postgresql-common @ amd64 for postgresql-common/242ubuntu1~ppa1 Trigger @amd64 ♻️ Trigger all proposed @{arch} ♻️ 💍
     postgresql-common @ s390x for postgresql-common/242ubuntu1~ppa1 Trigger @s390x ♻️ Trigger all proposed @{arch} ♻️ 💍
     postgresql-common @ ppc64el for postgresql-common/242ubuntu1~ppa1 Trigger @ppc64el ♻️ Trigger all proposed @{arch} ♻️ 💍
     postgresql-common @ arm64 for postgresql-common/242ubuntu1~ppa1 Trigger @arm64 ♻️ Trigger all proposed @{arch} ♻️ 💍
     postgresql-common @ armhf for postgresql-common/242ubuntu1~ppa1 Trigger @armhf ♻️ Trigger all proposed @{arch} ♻️ 💍
     postgresql-common @ riscv64 for postgresql-common/242ubuntu1~ppa1 Trigger @riscv64 ♻️ Trigger all proposed @{arch} ♻️ 💍
Running:
    time pkg release arch ppa trigger
    30 postgresql-common kinetic arm64 athos-ribeiro/lp1986981-merge-postgresql-common-kinetic postgresql-common/242ubuntu1~ppa1
    40 postgresql-common kinetic ppc64el athos-ribeiro/lp1986981-merge-postgresql-common-kinetic postgresql-common/242ubuntu1~ppa1
    50 postgresql-common kinetic amd64 athos-ribeiro/lp1986981-merge-postgresql-common-kinetic postgresql-common/242ubuntu1~ppa1
Waiting:
    Q-num pkg release arch ppa trigger
    1 postgresql-common kinetic armhf athos-ribeiro/lp1986981-merge-postgresql-common-kinetic postgresql-common/242ubuntu1~ppa1

Please run 'lp-test-ppa ppa:athos-ribeiro/lp1986981-merge-postgresql-common-kinetic -r kinetic' to check there's no issues.

review: Approve

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

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

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Bryce!

The flag compensates a delta in ubuntu dpkg-reconfigure, not in postgresql-common itself. This was forwarded to Debian and discussed in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011067.

Uploaded

$ dput ubuntu ../postgresql-common_242ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../postgresql-common_242ubuntu1_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../postgresql-common_242ubuntu1.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading postgresql-common_242ubuntu1.dsc: done.
  Uploading postgresql-common_242ubuntu1.tar.xz: done.
  Uploading postgresql-common_242ubuntu1_source.buildinfo: done.
  Uploading postgresql-common_242ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 70880d2..8607cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgresql-common (242ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1986981). Remaining changes:
+    - d/rules: do not stop service on package upgrades. (LP #1973382)
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 18 Aug 2022 14:38:54 -0300
+
 postgresql-common (242) unstable; urgency=medium
 
   * server/postgresql.mk: Tell pg_upgrade to create sockets in /tmp.
@@ -5,6 +12,12 @@ postgresql-common (242) unstable; urgency=medium
 
  -- Christoph Berg <[e-mail]>  Thu, 11 Aug 2022 11:25:31 +0200
 
+postgresql-common (241ubuntu1) kinetic; urgency=medium
+
+  * d/rules: do not stop service on package upgrades. (LP: #1973382)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 16 May 2022 09:58:44 -0300
+
 postgresql-common (241) unstable; urgency=medium
 
   * Remove stats_temp_directory in PG 15.
diff --git a/debian/control b/debian/control
index 5654e32..091f394 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-common
 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]>,
  Christoph Berg <[e-mail]>,
diff --git a/debian/rules b/debian/rules
index a4783e4..668e10f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,9 @@ override_dh_auto_configure:
 
 # do not (re)start postgresql.service on postgresql-common install/upgrades
 override_dh_installinit:
-	dh_installinit -ppostgresql-common --name=postgresql -u'defaults 19 21' --no-start
+	dh_installinit -ppostgresql-common --name=postgresql -u'defaults 19 21' --no-start --no-stop-on-upgrade
 override_dh_installsystemd:
-	dh_installsystemd --no-start
+	dh_installsystemd --no-start --no-stop-on-upgrade
 
 override_dh_gencontrol:
 	dh_gencontrol -ppostgresql-server-dev-all -- -Vserver-dev-all-depends="$(foreach v,$(SUPPORTED_VERSIONS),postgresql-server-dev-$v,)"