[Debian-ha-commits] [cluster-glue] 65/73: Added conflicts and replaces back into control, though it now should be implemented correctly; covering heartbeat, earlier versions of libcluster-glue (<=1.0.6), as well as the transition from libcluster-glue and friends to cluster-glue and friends.

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit cc491501e4a24314a8fcbb429dbd45da5e354218
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 17 05:56:23 2015 -0400

    Added conflicts and replaces back into control, though it now should be
    implemented correctly; covering heartbeat, earlier versions of
    libcluster-glue (<=1.0.6), as well as the transition from
    libcluster-glue and friends to cluster-glue and friends.
    
    Change-Id: I736f7ea25bbc3f41ad4919870a03ae63b8cef4b3
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 75d4685..3163e04 100644
--- a/debian/control
+++ b/debian/control
@@ -158,8 +158,14 @@ Depends: ${misc:Depends},
  libplumb2 (>= ${binary:Version}), 
  libplumbgpl2 (>= ${binary:Version}), 
  libstonith1 (>= ${binary:Version})
-Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
+Replaces: libcluster-glue (<= 1.0.6-1),
+ heartbeat,
+ heartbeat-common,
+ libheartbeat2
+Conflicts: libcluster-glue (<= 1.0.6-1),
+ heartbeat,
+ heartbeat-common,
+ libheartbeat2
 Description: Reusable cluster libraries (transitional package)
  This package used to contain all the libraries from cluster-glue,
  the reusable cluster components package. It's now a transitional
@@ -314,14 +320,21 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}, 
  ${perl:Depends}, 
- ${python:Depends}, , 
+ ${python:Depends}, 
+ libtimedate-perl, 
  liblrm2 (>= ${binary:Version}), 
  libpils2 (>= ${binary:Version}), 
  libplumb2 (>= ${binary:Version}), 
  libplumbgpl2 (>= ${binary:Version}), 
  libstonith1 (>= ${binary:Version})
-Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
-Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Replaces: libcluster-glue,
+ heartbeat,
+ heartbeat-common,
+ libheartbeat2
+Conflicts: libcluster-glue, 
+ heartbeat,
+ heartbeat-common,
+ libheartbeat2
 Description: Reusable cluster components for Linux HA
  This package contains node fencing plugins, an error reporting
  utility, and other reusable cluster components from
@@ -353,8 +366,8 @@ Depends: ${shlibs:Depends},
  libplumb2-dev (>= ${binary:Version}), 
  libplumbgpl2-dev (>= ${binary:Version}), 
  libstonith1-dev (>= ${binary:Version})
-Replaces: libcluster-glue-dev (<= 1.0.6-1)
-Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Replaces: libcluster-glue-dev
+Conflicts: libcluster-glue-dev
 Description: Development files for the cluster glue components
  This package includes headers and static libraries for the glue
  cluster components.
@@ -366,6 +379,8 @@ Package: liblrm2
 Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- liblrm2
  This package contains the lrm helper library from cluster-glue,
  the reusable cluster components package. 
@@ -377,6 +392,8 @@ Package: libpils2
 Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- libpils2
  This package contains the pils library from cluster-glue, the 
  reusable cluster components package. 
@@ -388,6 +405,8 @@ Package: libplumb2
 Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- libplumb2
  This package contains the plumber library from cluster-glue, the 
  reusable cluster components package. 
@@ -399,6 +418,8 @@ Package: libplumbgpl2
 Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- libplumbgpl2
  This package contains the plumber library from cluster-glue,
  the reusable cluster components package, in the GPL version. 
@@ -410,8 +431,10 @@ Package: libstonith1
 Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
-Replaces: libstonith0
-Conflicts: libstonith0
+Replaces: libcluster-glue (<= 1.0.6-1),
+ libstonith0
+Conflicts: libcluster-glue (<= 1.0.6-1), 
+ libstonith0
 Description: Reusable cluster libraries -- libstonith1
  This package contains the stonith library from cluster-glue, the 
  reusable cluster components package. 
@@ -424,6 +447,8 @@ Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, 
  liblrm2 (= ${binary:Version})
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- liblrm
  This package contains the development files of the lrm helper 
  library from cluster-glue, the reusable cluster components 
@@ -438,6 +463,8 @@ Architecture: any
 Depends: ${misc:Depends}, 
  libpils2 (= ${binary:Version}), 
  libltdl-dev
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- libpils2
  This package contains the development files of the pils 
  library from cluster-glue, the reusable cluster components 
@@ -451,6 +478,8 @@ Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, 
  libplumb2 (= ${binary:Version})
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- libplumb2
  This package contains the development files of the plumber 
  library from cluster-glue, the reusable cluster components 
@@ -464,6 +493,8 @@ Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, 
  libplumbgpl2 (= ${binary:Version})
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- libplumbgpl2
  This package contains the development files of the plumber 
  library from cluster-glue, the reusable cluster components 
@@ -477,8 +508,10 @@ Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, 
  libstonith1 (= ${binary:Version})
-Replaces: libstonith0-dev
-Conflicts: libstonith0-dev
+Replaces: libcluster-glue-dev (<= 1.0.6-1),
+ libstonith0-dev
+Conflicts: libcluster-glue-dev (<= 1.0.6-1),
+ libstonith0-dev
 Description: Reusable cluster development files -- libstonith1
  This package contains the development files of the stonith 
  library from cluster-glue, the reusable cluster components 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git