Merge ~lucaskanashiro/ubuntu/+source/resource-agents:merge-lunar into ubuntu/+source/resource-agents:debian/sid

[Lucas Kanashiro]

Merge version 1:4.11.0-3 from Debian unstable. All the delta was kept since it is the split of agents in curated and non-curated (Ubuntu only).

The proposed package is available in this PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ha-stack/+packages

autopkgtest summary in a local run:

autopkgtest [10:36:33]: @@@@@@@@@@@@@@@@@@@@ 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

[Sergio Durigan Junior (sergiodj)]

Thanks, Lucas.

Package builds fine. Even though you provided local autopkgtest results, I took the liberty to trigger autopkgtest runs against the build that's in the PPA. Please take a look at their results before uploading, just to be safe.

You can squash the last commit with the "reconstruct-changelog" one.

Otherwise, everything else LGTM. range-diff is very clean and the Debian changes don't need any intervention.

+1 assuming that the dep8 tests pass in the infrastructure.

review: Approve

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

Approvers: lucaskanashiro, sergiodj
Uploaders: lucaskanashiro, sergiodj
MP auto-approved

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thank you for the review Sergio! The tests have passed, so I am uploading the package:

Uploading resource-agents_4.11.0-3ubuntu1.dsc
Uploading resource-agents_4.11.0.orig.tar.gz
Uploading resource-agents_4.11.0-3ubuntu1.debian.tar.xz
Uploading resource-agents_4.11.0-3ubuntu1_source.buildinfo
Uploading resource-agents_4.11.0-3ubuntu1_source.changes

diff --git a/debian/DEPRECATED_AGENTS b/debian/DEPRECATED_AGENTS
new file mode 100644
index 0000000..ce1d688
--- /dev/null
+++ b/debian/DEPRECATED_AGENTS
@@ -0,0 +1,13 @@
+# Deprecated agents
+
+All the agents listed below are no longer maintained upstream and their use is
+discouraged. They might be removed in future releases.
+
+* Evmsd: EVMS is no longer actively maintained and should not be used.
+* EvmsSCC: EVMS is no longer actively maintained and should not be used.
+* LinuxSCSI: This agent makes use of Linux SCSI hot-plug functionality which has
+  been superseded by SCSI reservations.
+* pingd: It was superseded by ocf:pacemaker:pingd.
+* scsi2reservation: It depends on scsi_reserve which is not supported
+  (SCSI-2 reservation is not supported, please use SCSI-3 reservation. That can
+  be achieved with the sg_persist resource agent)
diff --git a/debian/changelog b/debian/changelog
index d15f488..57dfd15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+resource-agents (1:4.11.0-3ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993440). Remaining changes:
+    - d/control: Demote python3-googleapi to Suggests to avoid inclusion
+      in Ubuntu main.
+    - Create the resource-agents-common binary package.
+      This new binary package will be used by curated and non-curated
+      Resource Agents.
+    - d/control: add python3 as a runtime dependency to resource-agents.
+      Lintian complained that one of the scripts requires python3 and it was
+      not listed as a dependency.
+    - Create the resource-agents-base binary package.
+      It contains all the resource agents curated by Ubuntu Server.
+    - Rename resource-agents with non-curated agents to resource-agents-extra.
+    - Create a transitional binary package called resource-agents.
+      It depends on both resource-agents-{base,extra}.
+    - d/curated-agents: add LVM-activate and iSCSI related agents.
+      They are iscsi, iSCSILogicalUnit and iSCSITarget.
+    - d/control: suggest packages used by the agents in the base binary
+      package (LP #1863677).
+    - d/DEPRECATED_AGENTS: document the agents deprecated by upstream.
+      Also create d/resource-agents-extra.docs to install it.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 18 Jan 2023 09:41:55 -0300
+
 resource-agents (1:4.11.0-3) unstable; urgency=medium
 
   * debian/patches: fix build failure in shellcheck of WAS6
@@ -17,6 +42,38 @@ resource-agents (1:4.11.0-2) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sun, 13 Nov 2022 13:58:03 +0100
 
+resource-agents (1:4.11.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971317). Remaining changes:
+    - d/control: Demote python3-googleapi to Suggests to avoid inclusion
+      in Ubuntu main.
+    - Create the resource-agents-common binary package.
+      This new binary package will be used by curated and non-curated
+      Resource Agents.
+    - d/control: add python3 as a runtime dependency to resource-agents.
+      Lintian complained that one of the scripts requires python3 and it was
+      not listed as a dependency.
+    - Create the resource-agents-base binary package.
+      It contains all the resource agents curated by Ubuntu Server.
+    - Rename resource-agents with non-curated agents to resource-agents-extra.
+    - Create a transitional binary package called resource-agents.
+      It depends on both resource-agents-{base,extra}.
+    - d/curated-agents: add LVM-activate agent.
+    - d/curated-agents: add iSCSI resource agents.
+      They are iscsi, iSCSILogicalUnit and iSCSITarget.
+    - d/control: suggest packages used by the agents in the base binary
+      package (LP #1863677).
+    - d/DEPRECATED_AGENTS: document the agents deprecated by upstream.
+      Also create d/resource-agents-extra.docs to install it.
+  * Dropped:
+    - d/control: remove old Conflicts and Replaces.
+      + Replaces/Conflicts in resource-agents*: cluster-agents, rgmanager
+        and resource-agents-dev.
+      + Conflicts in ldirectord: libpils0, libstonith0 and stonith.
+      [changes applied in Debian version 1:4.10.0-1]
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 08 Aug 2022 17:35:17 -0300
+
 resource-agents (1:4.11.0-1) unstable; urgency=medium
 
   * New upstream version 4.11.0
@@ -43,6 +100,138 @@ resource-agents (1:4.10.0-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sun, 03 Apr 2022 13:39:33 +0200
 
+resource-agents (1:4.7.0-1ubuntu8) kinetic; urgency=medium
+
+  * d/control: breaks/replaces for file reorg (LP: #1981598)
+    to un-break upgrades
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 14 Jul 2022 13:09:42 +0200
+
+resource-agents (1:4.7.0-1ubuntu7) jammy; urgency=medium
+
+  * d/DEPRECATED_AGENTS: document the agents deprecated by upstream.
+  * d/resource-agents-extra.docs: install d/DEPRECATED_AGENTS.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 29 Mar 2022 16:47:03 -0300
+
+resource-agents (1:4.7.0-1ubuntu6) jammy; urgency=medium
+
+  * d/curated-agents: add iSCSI resource agents.
+    They are iscsi, iSCSILogicalUnit and iSCSITarget.
+  * d/control: suggest packages used by the agents in the base binary package
+    (LP: #1863677).
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 24 Feb 2022 11:58:58 -0300
+
+resource-agents (1:4.7.0-1ubuntu5) impish; urgency=medium
+
+  * d/curated-agents: add LVM-activate agent.
+  * d/install-curated-agents: check if ocft config exists to install it.
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 11 Jun 2021 16:12:05 -0300
+
+resource-agents (1:4.7.0-1ubuntu4) impish; urgency=medium
+
+  * Rename resource-agents with non-curated agents to resource-agents-extra.
+    - d/control: rename the resource-agents binary package to
+      resource-agents-extra.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'unsupported' term to 'non-curated'.
+    - Rename RESOURCE_AGENTS_DIR to RESOURCE_AGENTS_EXTRA_DIR with the
+      appropriate path in the following files:
+      + d/install-common-files
+      + d/install-common-files
+      + d/install-supported-agents
+      + d/resource-agents-cleanup
+      + d/rules
+  * Rename resource-agents-supported with curated agents to
+    resource-agents-base.
+    - d/control:
+      + Rename resource-agents-supported binary package to resource-agents-base.
+      + Update the short and long description to not use the 'supported' term.
+      + Rename the supportedAgents substvar to curatedAgents.
+    - d/curated-agents: new file, this is the renamed d/supported-agents file.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'supported' term to 'curated'.
+    - d/install-common-files: Rename all the occurrences of the 'supported'
+      term to 'curated'.
+    - d/install-curated-agents: new file, this is the renamed
+      d/install-supported-agents script.
+    - d/rules: call d/install-curated-agents instead of
+      d/install-supported-agents.
+    - d/t/control: make IPaddr2 test depend on resource-agents-base instead of
+      resource-agents-supported.
+  * Create a transitional binary package called resource-agents.
+    - d/control: add a new section for the transitional package, adding
+      resource-agents-{base,extra} as dependencies.
+  * d/control: add a missing Breaks/Replaces relation to the
+    resource-agents-base.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 12 May 2021 16:15:15 -0300
+
+resource-agents (1:4.7.0-1ubuntu3) impish; urgency=medium
+
+  * d/control: make resource-agents recommend resource-agents-supported.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 03 May 2021 09:10:54 -0300
+
+resource-agents (1:4.7.0-1ubuntu2) impish; urgency=medium
+
+  * Create the resource-agents-common binary package with files to be shared
+    by the supported and unsupported agents.
+    - d/control: add a new paragraph for the new binary package and add it as
+      a runtime dependency of resource-agents.
+    - d/extract-agents-description: add this new script to extract agents
+      description.
+    - d/{ldirectord,resource-agents}.install: removed, now files are installed
+      via rules file.
+    - d/install-{common,ldirectord}-files: create those scripts to install files
+      in resource-agents-common and ldirectord binary packages.
+    - d/rules:
+      + Override dh_auto_install to set the $DESTDIR variable.
+      + Override dh_install to move files to the correspondent binary package.
+      + Clean up the dh_gencontrol override, call the
+        d/extract-agents-description shell script instead of implementing a
+        complex logic in a Makefile.
+  * Create the resource-agents-supported binary package.
+    - d/control: add a new paragraph for the new binary package.
+    - d/extract-agents-description: update the script to set also the new
+      supportedAgents substvar.
+    - d/install-supported-agents: add a shell script to manage the
+      installation of all supported agents into the right binary package.
+    - d/resource-agents-common.lintian-overrides: create this new file to move
+      the lintian overrides previously present in resource-agents binary
+      package.
+    - d/resource-agents.lintian-overrides: remove the overrides referring to
+      code moves to resource-agents-common.
+    - d/rules: call the d/install-supported-agents shell script in the
+      dh_install override.
+    - d/supported-agents: add a file with a list of the supported agents.
+    - d/t/control: make IPaddr2 test depend on resource-agents-supported
+      instead of resource-agents.
+  * Add python3 as a runtime dependency of resource-agents. Lintian complained
+    about that.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 28 Apr 2021 09:39:00 -0300
+
+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 <[e-mail]>  Mon, 18 Jan 2021 17:34:05 -0300
+
 resource-agents (1:4.7.0-1) unstable; urgency=medium
 
   * New upstream version 4.7.0
@@ -58,6 +247,27 @@ resource-agents (1:4.7.0-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  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 <[e-mail]>  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 <[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
@@ -65,6 +275,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
@@ -78,6 +302,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
@@ -93,6 +327,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
@@ -128,6 +383,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
@@ -619,3 +892,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 ac1fc59..f6e9365 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,
@@ -39,17 +40,82 @@ Vcs-Browser: https://salsa.debian.org/ha-team/resource-agents
 Vcs-Git: https://salsa.debian.org/ha-team/resource-agents.git
 
 Package: resource-agents
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends},
+         resource-agents-base (>= ${source:Version}),
+         resource-agents-extra (>= ${source:Version})
+Description: Transitional package for the resource-agents
+ This package contains cluster resource agents (RAs) compliant with the Open
+ Cluster Framework (OCF) specification, used to interface with various services
+ in a High Availability environment managed by the Pacemaker resource manager.
+ .
+ This is a transitional package which provides a set of curated
+ (resource-agents-base) and non-curated (resource-agents-extra) agents.
+
+Package: resource-agents-extra
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, bc, cluster-glue, gawk
-Recommends: libxml2-utils, net-tools, python3-googleapi
-Provides: resource-agents-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends},
+         bc,
+         cluster-glue,
+         gawk,
+         python3,
+         resource-agents-common (>= ${source:Version})
+Recommends: libxml2-utils,
+            net-tools,
+            resource-agents-base (>= ${source:Version})
+Suggests: python3-googleapi
+Replaces: resource-agents (<< 1:4.7.0-1ubuntu2),
+          resource-agents-base (<<1:4.7.0-1ubuntu7)
+Breaks: resource-agents (<< 1:4.7.0-1ubuntu2),
+        resource-agents-base (<<1:4.7.0-1ubuntu7)
 Description: Cluster Resource Agents
  This package contains cluster resource agents (RAs) compliant with the Open
  Cluster Framework (OCF) specification, used to interface with various services
  in a High Availability environment managed by the Pacemaker resource manager.
  .
  Agents included:
- ${agents}
+  ${agents}
+
+Package: resource-agents-base
+Architecture: all
+Depends: ${misc:Depends},
+         resource-agents-common (>= ${source:Version})
+Suggests:
+# for iscsi agent
+          open-iscsi,
+# for iSCSITarget and iSCSILogicalUnit agents (the recommended implementation is lio-t)
+          targetcli-fb,
+# for LVM-activate agent
+          dmsetup,
+          lvm2
+Replaces: resource-agents (<< 1:4.7.0-1ubuntu2),
+          resource-agents-extra (<<1:4.7.0-1ubuntu7)
+Breaks: resource-agents (<< 1:4.7.0-1ubuntu2),
+        resource-agents-extra (<<1:4.7.0-1ubuntu7)
+Description: Cluster Resource Agents curated by Ubuntu
+ This package contains cluster resource agents (RAs) compliant with the Open
+ Cluster Framework (OCF) specification, used to interface with various services
+ in a High Availability environment managed by the Pacemaker resource manager.
+ .
+ This package contains the Resource Agents that are curated by the Ubuntu
+ Server team.
+ .
+ Agents included:
+  ${curatedAgents}
+
+Package: resource-agents-common
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}
+Replaces: resource-agents (<< 1:4.7.0-1ubuntu2)
+Breaks: resource-agents (<< 1:4.7.0-1ubuntu2)
+Provides: resource-agents-dev
+Description: Common files used by the Cluster Resource Agents
+ This package contains cluster resource agents (RAs) compliant with the Open
+ Cluster Framework (OCF) specification, used to interface with various services
+ in a High Availability environment managed by the Pacemaker resource manager.
+ .
+ This package provides common files used by the Resource Agents.
 
 Package: ldirectord
 Architecture: all
diff --git a/debian/curated-agents b/debian/curated-agents
new file mode 100644
index 0000000..4cf27cd
--- /dev/null
+++ b/debian/curated-agents
@@ -0,0 +1,5 @@
+IPaddr2
+iscsi
+iSCSILogicalUnit
+iSCSITarget
+LVM-activate
diff --git a/debian/extract-agents-description b/debian/extract-agents-description
new file mode 100755
index 0000000..9824f4d
--- /dev/null
+++ b/debian/extract-agents-description
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -x
+
+export LC_ALL=C
+
+agents=()
+curated_agents=()
+non_curated_agents=()
+
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
+readonly RESOURCE_AGENTS_COMMON_DIR="debian/resource-agents-common"
+readonly RESOURCE_AGENTS_BASE_DIR="debian/resource-agents-base"
+readonly NON_CURATED_HEARTBEAT_DIR="$RESOURCE_AGENTS_EXTRA_DIR/usr/lib/ocf/resource.d/heartbeat"
+readonly CURATED_HEARTBEAT_DIR="$RESOURCE_AGENTS_BASE_DIR/usr/lib/ocf/resource.d/heartbeat"
+
+export OCF_ROOT="$RESOURCE_AGENTS_COMMON_DIR/usr/lib/ocf"
+
+for agent in $CURATED_HEARTBEAT_DIR/* $NON_CURATED_HEARTBEAT_DIR/*; do
+  name=$(basename "$agent")
+  short_desc=$("$agent" meta-data | xml_grep --root resource-agent/shortdesc --text_only /dev/stdin)
+
+  # Remove unwanted whitespaces
+  short_desc=$(echo -e $short_desc | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+
+  # Limit the size of the string to 80 characters
+  desc=$(echo -n "$name: $short_desc" | sed -e 's/^\(.\{75\}\).\{4\}.*/\1.../')
+
+  agents+=("$desc")
+done
+
+for agent in "${agents[@]}"; do
+  if grep -qFx $(cut -d: -f1 <<< "$agent") debian/curated-agents; then
+    curated_agents+=("$agent\${Newline}")
+  else
+    non_curated_agents+=("$agent\${Newline}")
+  fi
+done
+
+echo "agents=${non_curated_agents[*]}" >> debian/resource-agents-extra.substvars
+echo "curatedAgents=${curated_agents[*]}" >> debian/resource-agents-base.substvars
+
+# Clean up pycache
+rm -rf debian/resource-agents-common/usr/lib/ocf/lib/heartbeat/__pycache__
diff --git a/debian/install-common-files b/debian/install-common-files
new file mode 100755
index 0000000..cd14889
--- /dev/null
+++ b/debian/install-common-files
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# This script aims to install all the common files used by resource-agents-base
+# and resource-agents-extra into resource-agents-common binary package.
+
+set -x
+
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
+readonly RESOURCE_AGENTS_COMMON_DIR="debian/resource-agents-common"
+
+readonly COMMON_DIRS="usr/include/heartbeat usr/lib/heartbeat
+                      usr/lib/ocf/lib/heartbeat usr/share/pkgconfig etc/ha.d
+		      lib/systemd/system usr/sbin usr/share/man/man8
+		      usr/lib/tmpfiles.d usr/libexec/heartbeat"
+
+for dir in $COMMON_DIRS; do
+  mkdir -p "$RESOURCE_AGENTS_COMMON_DIR/$dir"
+  mv "$RESOURCE_AGENTS_EXTRA_DIR/$dir"/* "$RESOURCE_AGENTS_COMMON_DIR/$dir"
+done
+
+mkdir -p "$RESOURCE_AGENTS_COMMON_DIR"/usr/lib/ocf/resource.d/heartbeat \
+	 "$RESOURCE_AGENTS_COMMON_DIR"/usr/share/resource-agents/ocft
+
+readonly TARGETS="ocf-binaries ocf-directories ocf-returncodes ocf-shellfuncs"
+for tgt in $TARGETS; do
+  ln -r -s -T "$RESOURCE_AGENTS_COMMON_DIR/usr/lib/ocf/lib/heartbeat/$tgt" \
+              "$RESOURCE_AGENTS_COMMON_DIR/usr/lib/ocf/resource.d/heartbeat/.$tgt"
+  rm "$RESOURCE_AGENTS_EXTRA_DIR/usr/lib/ocf/resource.d/heartbeat/.$tgt"
+done
+
+readonly FILES="metadata.rng ra-api-1.dtd"
+for file in $FILES; do
+  mv "$RESOURCE_AGENTS_EXTRA_DIR/usr/share/resource-agents/$file" \
+     "$RESOURCE_AGENTS_COMMON_DIR"/usr/share/resource-agents/
+done
+
+readonly OCFT_FILES="README README.zh_CN caselib helpers.sh runocft runocft.prereq"
+for file in $OCFT_FILES; do
+  mv "$RESOURCE_AGENTS_EXTRA_DIR/usr/share/resource-agents/ocft/$file" \
+     "$RESOURCE_AGENTS_COMMON_DIR"/usr/share/resource-agents/ocft/
+done
diff --git a/debian/install-curated-agents b/debian/install-curated-agents
new file mode 100755
index 0000000..2e3fbff
--- /dev/null
+++ b/debian/install-curated-agents
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script aims to install all the agents curated by the Ubuntu community
+# into resource-agents-base binary package.
+
+set -x
+
+readonly RESOURCE_AGENTS_BASE="debian/resource-agents-base"
+readonly RESOURCE_AGENTS_EXTRA="debian/resource-agents-extra"
+
+mkdir -p $RESOURCE_AGENTS_BASE/usr/share/resource-agents/ocft/configs/ \
+	 $RESOURCE_AGENTS_BASE/usr/share/man/man7/ \
+	 $RESOURCE_AGENTS_BASE/usr/lib/ocf/resource.d/heartbeat/
+
+for agent in $(cat debian/curated-agents); do
+  mv $RESOURCE_AGENTS_EXTRA/usr/lib/ocf/resource.d/heartbeat/$agent \
+     $RESOURCE_AGENTS_BASE/usr/lib/ocf/resource.d/heartbeat/
+  mv $RESOURCE_AGENTS_EXTRA/usr/share/man/man7/ocf_heartbeat_$agent.7 \
+     $RESOURCE_AGENTS_BASE/usr/share/man/man7/
+
+  if [ -f $RESOURCE_AGENTS_EXTRA/usr/share/resource-agents/ocft/configs/$agent ]; then
+    mv $RESOURCE_AGENTS_EXTRA/usr/share/resource-agents/ocft/configs/$agent \
+       $RESOURCE_AGENTS_BASE/usr/share/resource-agents/ocft/configs/
+  fi
+done
diff --git a/debian/install-ldirectord-files b/debian/install-ldirectord-files
new file mode 100755
index 0000000..39c97d0
--- /dev/null
+++ b/debian/install-ldirectord-files
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# This script aims to install all the ldirectord files into its own binary package.
+
+set -x
+
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
+readonly LDIRECTORD_DIR="debian/ldirectord"
+
+mkdir -p $LDIRECTORD_DIR/etc/ha.d/resource.d \
+	 $LDIRECTORD_DIR/etc/init.d \
+	 $LDIRECTORD_DIR/etc/logrotate.d \
+	 $LDIRECTORD_DIR/lib/systemd/system \
+	 $LDIRECTORD_DIR/usr/sbin \
+	 $LDIRECTORD_DIR/usr/share/man/man8
+
+cp debian/ldirectord.cf $LDIRECTORD_DIR/etc/ha.d
+mv $RESOURCE_AGENTS_EXTRA_DIR/etc/ha.d/resource.d/ \
+   $LDIRECTORD_DIR/etc/ha.d/
+mv $RESOURCE_AGENTS_EXTRA_DIR/etc/init.d $LDIRECTORD_DIR/etc/
+mv $RESOURCE_AGENTS_EXTRA_DIR/etc/logrotate.d $LDIRECTORD_DIR/etc/
+mv $RESOURCE_AGENTS_EXTRA_DIR/lib/systemd/system/ldirectord.service \
+   $LDIRECTORD_DIR/lib/systemd/system/
+mv $RESOURCE_AGENTS_EXTRA_DIR/usr/sbin/ldirectord $LDIRECTORD_DIR/usr/sbin
+mv $RESOURCE_AGENTS_EXTRA_DIR/usr/share/man/man8/ldirectord.8 \
+   $LDIRECTORD_DIR/usr/share/man/man8/
diff --git a/debian/ldirectord.install b/debian/ldirectord.install
deleted file mode 100755
index ba2ed80..0000000
--- a/debian/ldirectord.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/dh-exec
-
-debian/ldirectord.cf /etc/ha.d
-etc/ha.d/resource.d/ldirectord
-etc/init.d/ldirectord
-etc/logrotate.d/ldirectord
-lib/systemd/system/ldirectord.service [linux-any]
-usr/sbin/ldirectord
-usr/share/man/man8/ldirectord.8
diff --git a/debian/resource-agents-cleanup b/debian/resource-agents-cleanup
new file mode 100755
index 0000000..ad34bde
--- /dev/null
+++ b/debian/resource-agents-cleanup
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -x
+
+readonly RESOURCE_AGENTS_EXTRA_DIR="debian/resource-agents-extra"
+
+# Those directories were moved to another binary package
+readonly EMPTY_DIRS="etc lib run usr/include usr/lib/heartbeat usr/sbin
+                     usr/share/man/man8 usr/share/pkgconfig usr/lib/tmpfiles.d"
+
+for dir in $EMPTY_DIRS; do
+  rm -rf $RESOURCE_AGENTS_EXTRA_DIR/$dir
+done
diff --git a/debian/resource-agents-common.lintian-overrides b/debian/resource-agents-common.lintian-overrides
new file mode 100644
index 0000000..3b7c8df
--- /dev/null
+++ b/debian/resource-agents-common.lintian-overrides
@@ -0,0 +1,11 @@
+# ignore manpage warnings
+resource-agents-common: no-manual-page usr/sbin/ocft
+resource-agents-common: no-manual-page usr/sbin/sfex_stat
+
+# these are sourced shell libraries:
+resource-agents-common: script-not-executable [usr/lib/ocf/lib/heartbeat/findif.sh]
+resource-agents-common: script-not-executable [usr/lib/ocf/lib/heartbeat/mysql-common.sh]
+
+# ignore notices about usr/lib
+resource-agents-common: executable-in-usr-lib usr/lib/ocf/resource.d/heartbeat/*
+resource-agents-common: repeated-path-segment lib usr/lib/ocf/lib/
diff --git a/debian/resource-agents-extra.docs b/debian/resource-agents-extra.docs
new file mode 100644
index 0000000..62e425e
--- /dev/null
+++ b/debian/resource-agents-extra.docs
@@ -0,0 +1 @@
+debian/DEPRECATED_AGENTS
diff --git a/debian/resource-agents.lintian-overrides b/debian/resource-agents-extra.lintian-overrides
similarity index 90%
rename from debian/resource-agents.lintian-overrides
rename to debian/resource-agents-extra.lintian-overrides
index cfdd8c5..e670aa5 100644
--- a/debian/resource-agents.lintian-overrides
+++ b/debian/resource-agents-extra.lintian-overrides
@@ -1,12 +1,6 @@
 # ignore manpage warnings
-resource-agents: no-manual-page [usr/sbin/ocft]
-resource-agents: no-manual-page [usr/sbin/sfex_stat]
 resource-agents: groff-message 37: warning [p 1, 2.3i]: can't break line [usr/share/man/man7/ocf_heartbeat_openstack-info.7.gz:1]
 
-# these are sourced shell libraries:
-resource-agents: script-not-executable [usr/lib/ocf/lib/heartbeat/findif.sh]
-resource-agents: script-not-executable [usr/lib/ocf/lib/heartbeat/mysql-common.sh]
-
 # ignore capitalization in agent names
 resource-agents: capitalization-error-in-description apache Apache
 resource-agents: capitalization-error-in-description mysql MySQL
diff --git a/debian/resource-agents.install b/debian/resource-agents.install
deleted file mode 100755
index 5e44f54..0000000
--- a/debian/resource-agents.install
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/dh-exec
-etc/ha.d/shellfuncs
-lib/systemd/system/resource-agents-deps.target [linux-any]
-usr/include
-usr/lib/ocf
-usr/lib/tmpfiles.d/resource-agents.conf [linux-any]
-usr/libexec/heartbeat
-usr/sbin/ocft
-usr/sbin/ocf-tester
-usr/sbin/sfex_init [linux-any]
-usr/sbin/sfex_stat [linux-any]
-usr/share/doc/resource-agents
-usr/share/man/man7/*
-usr/share/man/man8/ocf-tester.8
-usr/share/man/man8/sfex_init.8 [linux-any]
-usr/share/pkgconfig/resource-agents.pc
-usr/share/resource-agents
diff --git a/debian/rules b/debian/rules
index 9155449..dc1cb9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
 
+RESOURCE_AGENTS_EXTRA_DIR="$(CURDIR)/debian/resource-agents-extra"
+
 %:
 	dh $@ --with python3
 
@@ -26,8 +28,16 @@ override_dh_auto_configure:
 
 # fix manpage header
 override_dh_auto_install:
-	dh_auto_install
-	sed -i -e 's/^\(\.TH "[^"]*\?\)\\"/\1"/' $(CURDIR)/debian/tmp/usr/share/man/man7/*.7
+	$(MAKE) install DESTDIR=$(RESOURCE_AGENTS_EXTRA_DIR)
+	sed -i -e 's/^\(\.TH "[^"]*\?\)\\"/\1"/' $(RESOURCE_AGENTS_EXTRA_DIR)/usr/share/man/man7/*.7
+
+override_dh_install:
+	debian/install-ldirectord-files
+	debian/install-common-files
+	debian/install-curated-agents
+	debian/resource-agents-cleanup
+
+	dh_install
 
 override_dh_python3:
 	dh_python3 /usr/lib/ocf/lib/heartbeat
@@ -38,18 +48,5 @@ override_dh_auto_clean:
 	find . -name Makefile.in | xargs -r rm
 
 override_dh_gencontrol:
-	set -e; \
-	export OCF_ROOT=$(CURDIR)/debian/resource-agents/usr/lib/ocf; \
-	export LC_ALL=C; \
-	( \
-	  echo -n "agents="; \
-	  for agent in debian/resource-agents/usr/lib/ocf/resource.d/heartbeat/*; do \
-	    echo "$$agent meta-data ..." >&2; \
-	    desc=$$($$agent meta-data 2>/dev/null | xml_grep --root resource-agent/shortdesc --text_only /dev/stdin | sed -n '/^$$/!{s/^[[:space:]]*//p; q}'); \
-	    line=$$(echo "$$(basename $$agent): $$desc" | sed -e 's/^\(.\{75\}\).\{4\}.*/\1.../'); \
-	    echo -n " $$line\$${Newline}"; \
-	  done; \
-	  echo \
-	) >> debian/resource-agents.substvars
-	rm -rf debian/resource-agents/usr/lib/ocf/lib/heartbeat/__pycache__
+	debian/extract-agents-description
 	dh_gencontrol
diff --git a/debian/tests/control b/debian/tests/control
index e80996d..4b83b1d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: IPaddr2
-Depends: resource-agents
+Depends: resource-agents-base
 Restrictions: needs-root, isolation-container
 
 Test-Command: service ldirectord status