Merge ~rafaeldtinoco/ubuntu/+source/resource-agents:lp1886603-groovy into ubuntu/+source/resource-agents:debian/sid

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/resource-agents/+bug/1886603
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1886603
MERGE: https://tinyurl.com/y9cwjg26

[Rafael David Tinoco (rafaeldtinoco)]

I have re-done this as it was simple enough to justify the re-work. Sorry for the mess on tags in the previous MR, I'm uploading the tags for this one now AND will shotw autopkgtests output before uploading this.

[Rafael David Tinoco (rafaeldtinoco)]

command13 PASS
autopkgtest [15:39:31]: @@@@@@@@@@@@@@@@@@@@ summary
IPaddr2 PASS
command1 PASS
command2 PASS
command3 PASS
command4 PASS
command5 PASS
command6 PASS
command7 PASS
command8 PASS
command9 PASS
command10 PASS
command11 PASS
command12 PASS
command13 PASS

All good...

[Andreas Hasenack (ahasenack)]

+1, thanks

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

$ git describe
upload/1%4.6.1-1ubuntu1-0-g23e7ef1

$ git push pkg upload/1%4.6.1-1ubuntu1
Enumerating objects: 22, done.
Counting objects: 100% (22/22), done.
Delta compression using up to 8 threads
Compressing objects: 100% (18/18), done.
Writing objects: 100% (18/18), 2.74 KiB | 561.00 KiB/s, done.
Total 18 (delta 12), reused 0 (delta 0), pack-reused 0
To ssh://git.launchpad.net/ubuntu/+source/resource-agents
 * [new tag] upload/1%4.6.1-1ubuntu1 -> upload/1%4.6.1-1ubuntu1

$ debdiff *.dsc | diffstat
 changelog | 74 ++++++++++++++++++++++++++++...
 control | 6 ++++--
 2 files changed, 78 insertions(+), 2 deletions(-)

$ dput ubuntu ./resource-agents_4.6.1-1ubuntu1_source.changes
Checking signature on .changes
gpg: ./resource-agents_4.6.1-1ubuntu1_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ./resource-agents_4.6.1-1ubuntu1.dsc: Valid signature from A93E0E0AD83C0D0F
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading resource-agents_4.6.1-1ubuntu1.dsc: done.
  Uploading resource-agents_4.6.1.orig.tar.gz: done.
  Uploading resource-agents_4.6.1-1ubuntu1.debian.tar.xz: done.
  Uploading resource-agents_4.6.1-1ubuntu1_source.buildinfo: done.
  Uploading resource-agents_4.6.1-1ubuntu1_source.changes: done.
Successfully uploaded packages.

Email: [ubuntu/groovy-proposed] resource-agents 1:4.6.1-1ubuntu1 (Accepted)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6bb24bf..440d124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+resource-agents (1:4.6.1-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1886603). Remaining changes:
+    - d/control: Demote python3-googleapi to Suggests to avoid inclusion in
+      Ubuntu main.
+  * Dropped (from Ubuntu):
+    - Remove bind9 autopkgtest not compatible with ubuntu (LP: 1872877)
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 10 Jul 2020 11:55:55 -0300
+
 resource-agents (1:4.6.1-1) unstable; urgency=medium
 
   * New upstream version 4.6.1
@@ -5,6 +15,20 @@ resource-agents (1:4.6.1-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Thu, 18 Jun 2020 21:03:31 +0200
 
+resource-agents (1:4.5.0-2ubuntu2) focal; urgency=medium
+
+  * Remove bind9 autopkgtest not compatible with ubuntu (LP: #1872877)
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 15 Apr 2020 03:32:33 +0000
+
+resource-agents (1:4.5.0-2ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1866383). Remaining changes:
+    - d/control: Demote python3-googleapi to Suggests to avoid
+      inclusion in Ubuntu main.
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 07 Apr 2020 22:43:39 +0000
+
 resource-agents (1:4.5.0-2) unstable; urgency=medium
 
   * debian/tests: fix test for new bind9 version
@@ -18,6 +42,16 @@ resource-agents (1:4.5.0-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Fri, 06 Mar 2020 19:50:58 +0100
 
+resource-agents (1:4.4.0-3ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/control: Demote python3-googleapi to Suggests to avoid inclusion
+      in Ubuntu main.
+  * Dropped changes, included in Debian:
+    - Test dep on postgresql, not postgresql-11 which is now gone.
+
+ -- Steve Langasek <[e-mail]>  Sat, 15 Feb 2020 16:56:30 -0800
+
 resource-agents (1:4.4.0-3) unstable; urgency=medium
 
   * debian/salsa-ci.yml: enable CI
@@ -33,6 +67,27 @@ resource-agents (1:4.4.0-2) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sat, 16 Nov 2019 10:47:46 +0100
 
+resource-agents (1:4.4.0-1ubuntu2) focal; urgency=medium
+
+  * Test dep on postgresql, not postgresql-11 which is now gone.
+
+ -- Steve Langasek <[e-mail]>  Fri, 14 Feb 2020 17:20:21 -0800
+
+resource-agents (1:4.4.0-1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/control: Demote python3-googleapi to Suggests to avoid inclusion
+      in Ubuntu main.
+  * Dropped changes (in Debian):
+    - d/p/lp1825250-ethmonitor-check-if-interface-exists-by-link.patch:
+      ethmonitor: check if interface exists by link.
+      [Fixed upstream]
+    - d/p/lp1825250-ethmonitor-fix-is_interface-regression.patch:
+      ethmonitor: fix is_interface() regression.
+      [Fixed upstream]
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 08 Nov 2019 16:45:38 +0000
+
 resource-agents (1:4.4.0-1) unstable; urgency=medium
 
   * New upstream version 4.4.0
@@ -68,6 +123,24 @@ resource-agents (1:4.2.0-2) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sun, 09 Dec 2018 21:04:49 +0100
 
+resource-agents (1:4.2.0-1ubuntu2) eoan; urgency=medium
+
+  * Fix heartbeat/ethmonitor not listing network interfaces without IP
+    addresses (LP: #1825250). Fixed by upstream patches:
+    - d/p/lp1825250-ethmonitor-check-if-interface-exists-by-link.patch:
+      ethmonitor: check if interface exists by link
+    - d/p/lp1825250-ethmonitor-fix-is_interface-regression.patch:
+      ethmonitor: fix is_interface() regression
+
+ -- Heitor Alves de Siqueira <[e-mail]>  Tue, 23 Apr 2019 14:17:29 -0300
+
+resource-agents (1:4.2.0-1ubuntu1) disco; urgency=medium
+
+  * d/control: Demote python3-googleapi to Suggests to avoid inclusion
+    in Ubuntu main.
+
+ -- James Page <[e-mail]>  Thu, 22 Nov 2018 14:31:51 +0000
+
 resource-agents (1:4.2.0-1) unstable; urgency=medium
 
   * New upstream version 4.2.0
@@ -559,3 +632,4 @@ cluster-agents (1:1.0+hg20090915-1) unstable; urgency=low
   * Initial release of packages for the cluster agents collection
 
  -- Martin Loschwitz <[e-mail]>  Tue, 15 Sep 2009 09:56:16 +0000
+
diff --git a/debian/control b/debian/control
index 4db5e5a..67fcfa9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: resource-agents
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders: Adrian Vondendriesch <[e-mail]>,
            Valentin Vidic <[e-mail]>
 Build-Depends: autoconf,
@@ -38,7 +39,8 @@ Vcs-Git: https://salsa.debian.org/ha-team/resource-agents.git
 Package: resource-agents
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, cluster-glue, gawk
-Recommends: libxml2-utils, net-tools, python3-googleapi
+Recommends: libxml2-utils, net-tools
+Suggests: python3-googleapi
 Replaces: cluster-agents (<= 1:1.0.4-1), rgmanager (<= 3.0.12-2+b1), resource-agents-dev (<< 1:3.9.6)
 Conflicts: cluster-agents (<= 1:1.0.4-1), rgmanager (<= 3.0.12-2+b1), resource-agents-dev (<< 1:3.9.6)
 Provides: resource-agents-dev