[Debian-ha-maintainers] Bug#985173: pacemaker-resource-agents: missing Breaks+Replaces: pacemaker (<< 2)

[Andreas Beckmann]

Followup-For: Bug #985173
Control: tag -1 patch

See the attached patch for fixed B+R. I've verified that this fixes the
failing upgrade paths in my piuparts instance. I'm also offering to NMU
this to buster-pu.


Andreas
-------------- next part --------------
diff -Nru pacemaker-2.0.1/debian/changelog pacemaker-2.0.1/debian/changelog
--- pacemaker-2.0.1/debian/changelog	2020-11-07 20:21:48.000000000 +0100
+++ pacemaker-2.0.1/debian/changelog	2021-03-17 18:55:13.000000000 +0100
@@ -1,3 +1,14 @@
+pacemaker (2.0.1-5+deb10u2) buster; urgency=medium
+
+  * Non-maintainer upload.
+  * pacemaker-resource-agents: Bump Breaks+Replaces: pacemaker to (<< 2).
+    A new upstream release instroduced as security update 1.1.24-0+deb9u1 in
+    stretch added the new file /usr/lib/ocf/resource.d/pacemaker/ifspeed to
+    pacemaker, while it resides in pacemaker-resource-agents in buster.
+    (Closes: #985173)
+
+ -- Andreas Beckmann <anbe at debian.org>  Wed, 17 Mar 2021 18:55:13 +0100
+
 pacemaker (2.0.1-5+deb10u1) buster-security; urgency=high
 
   * [bf23450] Apply patch series fixing CVE-2020-25654: ACL bypass.
diff -Nru pacemaker-2.0.1/debian/control pacemaker-2.0.1/debian/control
--- pacemaker-2.0.1/debian/control	2020-11-07 20:21:48.000000000 +0100
+++ pacemaker-2.0.1/debian/control	2021-03-17 18:55:04.000000000 +0100
@@ -84,9 +84,9 @@
  ${misc:Depends},
 # split out of pacemaker so that pacemaker-remote can also use them:
 Breaks:
- pacemaker (<< 1.1.14-2~),
+ pacemaker (<< 2),
 Replaces:
- pacemaker (<< 1.1.14-2~),
+ pacemaker (<< 2),
 Description: cluster resource manager general resource agents
  ${S:X-Common-Description}
  .