diff -pruN 1:4.7.0-1/debian/changelog 1:4.7.0-1ubuntu1/debian/changelog --- 1:4.7.0-1/debian/changelog 2020-12-14 13:34:09.000000000 +0000 +++ 1:4.7.0-1ubuntu1/debian/changelog 2021-01-18 20:34:05.000000000 +0000 @@ -1,3 +1,19 @@ +resource-agents (1:4.7.0-1ubuntu1) hirsute; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/control: Demote python3-googleapi to Suggests to avoid inclusion + in Ubuntu main. + * Dropped: + - d/p/u/lp1895348-*: Post Release Fixes (LP #1895348): + + [d22700fc] azure-lb: Don't redirect nc listener output to pidfile + + [3b0ffc59] build: fix distcheck issue introduced by including + READMEs in heartbeat directory + + [73551ac0] galera: Fix automatic recovery when a cluster was not + gracefully stopped + [applied by upstream] + + -- Lucas Kanashiro Mon, 18 Jan 2021 17:34:05 -0300 + resource-agents (1:4.7.0-1) unstable; urgency=medium * New upstream version 4.7.0 @@ -13,6 +29,27 @@ resource-agents (1:4.7.0-1) unstable; ur -- Valentin Vidic Mon, 14 Dec 2020 14:34:09 +0100 +resource-agents (1:4.6.1-1ubuntu2) groovy; urgency=medium + + * d/p/u/lp1895348-*: Post Release Fixes (LP: #1895348): + - [d22700fc] azure-lb: Don't redirect nc listener output to pidfile + - [3b0ffc59] build: fix distcheck issue introduced by including + READMEs in heartbeat directory + - [73551ac0] galera: Fix automatic recovery when a cluster was not + gracefully stopped + + -- Rafael David Tinoco Fri, 11 Sep 2020 19:30:14 +0000 + +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 Fri, 10 Jul 2020 11:55:55 -0300 + resource-agents (1:4.6.1-1) unstable; urgency=medium * New upstream version 4.6.1 @@ -20,6 +57,20 @@ resource-agents (1:4.6.1-1) unstable; ur -- Valentin Vidic 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 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 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 @@ -33,6 +84,16 @@ resource-agents (1:4.5.0-1) unstable; ur -- Valentin Vidic 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 Sat, 15 Feb 2020 16:56:30 -0800 + resource-agents (1:4.4.0-3) unstable; urgency=medium * debian/salsa-ci.yml: enable CI @@ -48,6 +109,27 @@ resource-agents (1:4.4.0-2) unstable; ur -- Valentin Vidic 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 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 Fri, 08 Nov 2019 16:45:38 +0000 + resource-agents (1:4.4.0-1) unstable; urgency=medium * New upstream version 4.4.0 @@ -83,6 +165,24 @@ resource-agents (1:4.2.0-2) unstable; ur -- Valentin Vidic 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 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 Thu, 22 Nov 2018 14:31:51 +0000 + resource-agents (1:4.2.0-1) unstable; urgency=medium * New upstream version 4.2.0 @@ -574,3 +674,4 @@ cluster-agents (1:1.0+hg20090915-1) unst * Initial release of packages for the cluster agents collection -- Martin Loschwitz Tue, 15 Sep 2009 09:56:16 +0000 + diff -pruN 1:4.7.0-1/debian/control 1:4.7.0-1ubuntu1/debian/control --- 1:4.7.0-1/debian/control 2020-12-14 13:34:09.000000000 +0000 +++ 1:4.7.0-1ubuntu1/debian/control 2021-01-18 20:34:05.000000000 +0000 @@ -1,7 +1,8 @@ Source: resource-agents Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Adrian Vondendriesch , Valentin Vidic Build-Depends: autoconf, @@ -38,7 +39,8 @@ Vcs-Git: https://salsa.debian.org/ha-tea 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