Merge ~athos-ribeiro/ubuntu/+source/pglogical:merge-lp2031532-mantic into ubuntu/+source/pglogical:debian/sid

[Athos Ribeiro]

Merge new version from debian unstable.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp2031532-merge-pglogical-mantic/+packages

DEP8 tests: pending

[Lucas Kanashiro (lucaskanashiro)]

Thanks for this MP Athos! The changes themselves look good to me.

I'd ask you to make sure this couldn't become a sync but since we are close to FF I think we can move on with this delta and try to run tests without that patch in the next merge.

I checked the test results, and based on the latest run, I see there is still a test failure on s390x:

https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-athos-ribeiro-lp2031532-merge-pglogical-mantic/mantic/s390x/p/pglogical/20230816_190742_e8839@/log.gz

I'd investigate that before uploading, but if you think this is important to get in before FF, I'd upload this version and try to fix the regresscheck test in s390x right after if the failure persists. However, checking the upstream changes in this new release, it does not seem to contain relevant changes, in this case I wouldn't bother too much with this right now. But I'd leave this decision to you :)

review: Approve

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

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

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Lucas!

Since the FF is coming, let me upload this one to ensure we get the new version in mantic.
The migration reference for s290 is already failing there, so this is no regression:
https://autopkgtest.ubuntu.com/packages/p/pglogical/mantic/s390x

[Lucas Kanashiro (lucaskanashiro)]

Awesome, I did not check that :) go ahead with the upload then!

diff --git a/debian/changelog b/debian/changelog
index 5407d9a..6a2c469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pglogical (2.4.3-1ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2031532). Remaining changes:
+    - d/p/test_increase_timeouts.patch: increase timeout for flaky
+      row_filter test.
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 16 Aug 2023 10:12:07 -0300
+
 pglogical (2.4.3-1) unstable; urgency=medium
 
   * New upstream version.
@@ -10,6 +18,19 @@ pglogical (2.4.2-3) unstable; urgency=medium
 
  -- Michael Banck <[e-mail]>  Fri, 17 Feb 2023 14:04:05 +0100
 
+pglogical (2.4.2-2ubuntu1) lunar; urgency=medium
+
+  * d/p/test_increase_timeouts.patch: increase timeout for flaky
+    row_filter test.
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 13 Dec 2022 10:32:25 -0300
+
+pglogical (2.4.2-2build1) lunar; urgency=medium
+
+  * No-change rebuild to attempt migration.
+
+ -- Sergio Durigan Junior <[e-mail]>  Sat, 10 Dec 2022 14:49:54 -0500
+
 pglogical (2.4.2-2) unstable; urgency=medium
 
   * debian/tests/prove: Exit cleanly when test is skipped.
diff --git a/debian/control b/debian/control
index 6af7ceb..f917e17 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pglogical
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders: Michael Banck <[e-mail]>, Marco Nenciarini <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
diff --git a/debian/control.in b/debian/control.in
index 9138576..1089580 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,8 @@
 Source: pglogical
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders: Michael Banck <[e-mail]>, Marco Nenciarini <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
diff --git a/debian/patches/test_increase_timeouts.patch b/debian/patches/test_increase_timeouts.patch
index 55cb005..e596873 100644
--- a/debian/patches/test_increase_timeouts.patch
+++ b/debian/patches/test_increase_timeouts.patch
@@ -59,7 +59,7 @@ Index: pglogical/sql/row_filter.sql
  -- wait for the initial data to copy
  BEGIN;
 -SET LOCAL statement_timeout = '10s';
-+SET LOCAL statement_timeout = '60s';
++SET LOCAL statement_timeout = '120s';
  SELECT pglogical.wait_for_subscription_sync_complete('test_subscription');
  COMMIT;
  
@@ -72,7 +72,7 @@ Index: pglogical/expected/row_filter.out
  -- wait for the initial data to copy
  BEGIN;
 -SET LOCAL statement_timeout = '10s';
-+SET LOCAL statement_timeout = '60s';
++SET LOCAL statement_timeout = '120s';
  SELECT pglogical.wait_for_subscription_sync_complete('test_subscription');
   wait_for_subscription_sync_complete 
  -------------------------------------
@@ -85,7 +85,7 @@ Index: pglogical/expected/row_filter_1.out
  -- wait for the initial data to copy
  BEGIN;
 -SET LOCAL statement_timeout = '10s';
-+SET LOCAL statement_timeout = '60s';
++SET LOCAL statement_timeout = '120s';
  SELECT pglogical.wait_for_subscription_sync_complete('test_subscription');
   wait_for_subscription_sync_complete 
  -------------------------------------