[Debian-ha-commits] [pacemaker] 04/09: Some changes for depends, replaces and conflicts

Richard Winters devrik-guest at moszumanska.debian.org
Thu Apr 30 00:52:10 UTC 2015


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

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

commit 4009814a8b29555f199cb96f275f8c184e595fe5
Author: Richard B Winters <rik at mmogp.com>
Date:   Wed Apr 29 16:50:45 2015 -0400

    Some changes for depends, replaces and conflicts
    
     - Depends for pacemaker binary updated to include the shared libs
     - Replaces updated in shared libs to not include pacemaker or
       pacemaker-dev
     - Conflicts changed to breaks for all shared-libs
    
    Change-Id: Ie2a684d10f662fee6c55508d98823d7ad02ab7f6
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control | 242 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 122 insertions(+), 120 deletions(-)

diff --git a/debian/control b/debian/control
index a77b350..b2e20c0 100644
--- a/debian/control
+++ b/debian/control
@@ -69,12 +69,23 @@ Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  ${python:Depends},
- resource-agents,
- python,
  adduser,
  corosync (>= 2.3.4),
  crmsh | pcs,
- pacemaker-cli-utils
+ libcib4 (>= ${binary:Version}),
+ libcluster-glue (>= 1.0.11+hg2754),
+ libcrmcluster4 (>= ${binary:Version}),
+ libcrmcommon3 (>= ${binary:Version}),
+ libcrmservice1 (>= ${binary:Version}),
+ liblrmd1 (>= ${binary:Version}),
+ libpe-rules2 (>= ${binary:Version}),
+ libpe-status4 (>= ${binary:Version}),
+ libpengine4 (>= ${binary:Version}),
+ libstonithd2 (>= ${binary:Version}),
+ libtransitioner2 (>= ${binary:Version}),
+ pacemaker-cli-utils,
+ python,
+ resource-agents
 Conflicts: pacemaker-heartbeat, pacemaker-openais
 Replaces: pacemaker-heartbeat, pacemaker-openais
 Description: HA cluster resource manager
@@ -130,22 +141,22 @@ Conflicts: pacemaker-heartbeat-dev,
  pacemaker-openais-dev
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- pacemaker (>= ${binary:Version}),
- python,
- libcorosync-dev (>= 1.4.4),
- libglib2.0-dev,
- libxml2-dev,
- libcluster-glue-dev (>= 1.0.11+hg2754),
  libcib4-dev (>= ${binary:Version}),
+ libcluster-glue-dev (>= 1.0.11+hg2754),
  libcrmcluster4-dev (>= ${binary:Version}),
  libcrmcommon3-dev (>= ${binary:Version}),
+ libcorosync-dev (>= 1.4.4),
+ libglib2.0-dev,
+ liblrmd1-dev (>= ${binary:Version}),
+ libcrmservice1-dev (>= ${binary:Version}),
  libpe-rules2-dev (>= ${binary:Version}),
  libpe-status4-dev (>= ${binary:Version}),
  libpengine4-dev (>= ${binary:Version}),
  libstonithd2-dev (>= ${binary:Version}),
  libtransitioner2-dev (>= ${binary:Version}),
- liblrmd1-dev (>= ${binary:Version}),
- libcrmservice1-dev (>= ${binary:Version})
+ libxml2-dev,
+ pacemaker (>= ${binary:Version}),
+ python
 Description: HA cluster resource manager (development files)
  High-Availability cluster resource manager for the Corosync
  cluster stack.
@@ -199,11 +210,10 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<= 1.1.12),
- libcib1,
+Replaces: libcib1,
  libcib2,
  libcib3
-Conflicts: pacemaker (<= 1.1.12),
+Breaks: pacemaker (<< 1.1.12),
  libcib1,
  libcib2,
  libcib3
@@ -220,11 +230,10 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libcib4 (= ${binary:Version})
-Replaces: pacemaker-dev (<< 1.1.12),
- libcib1-dev,
+Replaces: libcib1-dev,
  libcib2-dev,
  libcib3-dev
-Conflicts: pacemaker-dev (<< 1.1.12),
+Breaks: pacemaker-dev (<< 1.1.12),
  libcib1-dev,
  libcib2-dev,
  libcib3-dev
@@ -240,12 +249,13 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<= 1.1.12),
- libcrmcluster1,
- libcrmcluster2
-Conflicts: pacemaker (<= 1.1.12),
+Replaces: libcrmcluster1,
+ libcrmcluster2,
+ libcrmcluster3
+Breaks: pacemaker (<< 1.1.12),
  libcrmcluster1,
- libcrmcluster2
+ libcrmcluster2,
+ libcrmcluster3
 Description: Pacemaker libraries - CRM
  This package contains some of the libraries provided by and needed
  for the pacemaker cluster manager. You need to install them if you
@@ -259,12 +269,13 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libcrmcluster4 (= ${binary:Version})
-Replaces: pacemaker-dev (<< 1.1.12),
+Replaces: libcrmcluster1-dev,
+ libcrmcluster2-dev,
+ libcrmcluster3-dev
+Breaks: pacemaker-dev (<< 1.1.12),
  libcrmcluster1-dev,
- libcrmcluster2-dev
-Conflicts: pacemaker-dev (<< 1.1.12),
- libcrmcluster1-dev,
- libcrmcluster2-dev
+ libcrmcluster2-dev,
+ libcrmcluster3-dev
 Description: Development file for pacemaker's crm library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (CRM). Install 
@@ -277,9 +288,8 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<< 1.1.12),
- libcrmcommon2
-Conflicts: pacemaker (<< 1.1.12),
+Replaces: libcrmcommon2
+Breaks: pacemaker (<< 1.1.12),
  libcrmcommon2
 Description: Pacemaker libraries - common CRM
  This package contains some of the libraries provided by and needed
@@ -295,15 +305,68 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libcrmcommon3 (= ${binary:Version}),
  cluster-glue-dev (>= 1.0.11+hg2754)
-Replaces: pacemaker-dev (<< 1.1.12),
- libcrmcommon2-dev
-Conflicts: pacemaker-dev (<< 1.1.12),
+Replaces: libcrmcommon2-dev
+Breaks: pacemaker-dev (<< 1.1.12),
  libcrmcommon2-dev
 Description: Development file for pacemaker's common library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (common CRM). 
  Install it if you want to do development based on pacemaker.
 
+Package: libcrmservice1
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: pacemaker (<< 1.1.12)
+Description: Pacemaker libraries - crmservice
+ This package contains some of the libraries provided by and needed
+ for the pacemaker cluster manager. You need to install them if you
+ intend to run pacemaker. Specifically, this package contains the
+ crmservice library.
+
+Package: libcrmservice1-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ libcrmservice1 (= ${binary:Version})
+Breaks: pacemaker-dev (<< 1.1.12)
+Description: Development file for pacemaker's crmservice library
+ This package contains static libraries, symbol files as well as
+ headers provided by the pacemaker cluster manager (crmservice).
+ Install it if you want to do development based on pacemaker.
+
+Package: liblrmd1
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: pacemaker (<< 1.1.12)
+Description: Pacemaker libraries - lrmd
+ This package contains some of the libraries provided by and needed
+ for the pacemaker cluster manager. You need to install them if you
+ intend to run pacemaker. Specifically, this package contains the
+ lrmd library.
+
+Package: liblrmd1-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ liblrmd1 (= ${binary:Version})
+Breaks: pacemaker-dev (<< 1.1.12)
+Description: Development file for pacemaker's lrmd library
+ This package contains static libraries, symbol files as well as
+ headers provided by the pacemaker cluster manager (lrmd).
+ Install it if you want to do development based on pacemaker.
+
 Package: libpe-rules2
 Architecture: any
 Multi-Arch: same
@@ -311,10 +374,9 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<= 1.1.12),
- libpe-rules-2 (<= 1.1.12)
-Conflicts: pacemaker (<= 1.1.12),
- libpe-rules-2 (<= 1.0.10-1)
+Replaces: libpe-rules-2
+Breaks: pacemaker (<< 1.1.12),
+ libpe-rules-2
 Description: Pacemaker libraries - rules for P-Engine
  This package contains some of the libraries provided by and needed
  for the pacemaker cluster manager. You need to install them if you
@@ -328,10 +390,9 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libpe-rules2 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.1.12),
- libpe-rules-2-dev (<= 1.1.12)
-Conflicts: pacemaker-dev (<= 1.1.12),
- libpe-rules-2-dev (<= 1.1.12)
+Replaces: libpe-rules-2-dev
+Breaks: pacemaker-dev (<< 1.1.12),
+ libpe-rules-2-dev
 Description: Development file for pacemaker's rules library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (pengine rules). 
@@ -344,11 +405,10 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<= 1.1.12),
- libpe-status-2 (<= 1.1.12),
+Replaces: libpe-status-2,
  libpe-status3
-Conflicts: pacemaker (<= 1.1.12),
- libpe-status-2 (<= 1.1.12),
+Breaks: pacemaker (<< 1.1.12),
+ libpe-status-2,
  libpe-status3
 Description: Pacemaker libraries - status for P-Engine
  This package contains some of the libraries provided by and needed
@@ -363,12 +423,11 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libpe-status4 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.1.12),
- libpe-status-2-dev (<= 1.1.12),
+Replaces: libpe-status-2-dev,
  libpe-status2-dev,
  libpe-status3-dev
-Conflicts: pacemaker-dev (<= 1.1.12),
- libpe-status-2-dev (<= 1.1.12),
+Breaks: pacemaker-dev (<< 1.1.12),
+ libpe-status-2-dev,
  libpe-status2-dev,
  libpe-status3-dev
 Description: Development file for pacemaker's status library
@@ -383,12 +442,10 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<< 1.1.12),
- libpengine3,
- pacemaker-dev (<< 1.1.12)
-Conflicts: pacemaker (<< 1.1.12),
- libpengine3,
- pacemaker-dev (<< 1.1.12)
+Replaces: libpengine3
+Breaks: pacemaker (<< 1.1.12),
+ pacemaker-dev (<< 1.1.12),
+ libpengine3
 Description: Pacemaker libraries - P-Engine
  This package contains some of the libraries provided by and needed
  for the pacemaker cluster manager. You need to install them if you
@@ -402,9 +459,8 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libpengine4 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.1.12),
- libpengine3-dev
-Conflicts: pacemaker-dev (<= 1.1.12),
+Replaces: libpengine3-dev
+Breaks: pacemaker-dev (<< 1.1.12),
  libpengine3-dev
 Description: Development file for pacemaker's pengine library
  This package contains static libraries, symbol files as well as
@@ -418,10 +474,9 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<= 1.1.12),
- libstonithd0,
+Replaces: libstonithd0,
  libstonithd1
-Conflicts: pacemaker (<= 1.1.12),
+Breaks: pacemaker (<< 1.1.12),
  libstonithd0,
  libstonithd1
 Description: Pacemaker libraries - stonith
@@ -437,10 +492,9 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libstonithd2 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.1.12),
- libstonithd0-dev,
+Replaces: libstonithd0-dev,
  libstonithd1-dev
-Conflicts: pacemaker-dev (<= 1.1.12),
+Breaks: pacemaker-dev (<< 1.1.12),
  libstonithd0-dev,
  libstonithd1-dev
 Description: Development file for pacemaker's stonith library
@@ -455,9 +509,8 @@ Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: pacemaker (<= 1.1.12),
- libtransitioner1
-Conflicts: pacemaker (<= 1.1.12),
+Replaces: libtransitioner1
+Breaks: pacemaker (<< 1.1.12),
  libtransitioner1
 Description: Pacemaker libraries - transitioner
  This package contains some of the libraries provided by and needed
@@ -472,61 +525,10 @@ Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  libtransitioner2 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.1.12),
- libtransitioner1-dev
-Conflicts: pacemaker-dev (<= 1.1.12),
+Replaces: libtransitioner1-dev
+Breaks: pacemaker-dev (<< 1.1.12),
  libtransitioner1-dev
 Description: Development file for pacemaker's transitioner library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (transitioner). 
  Install it if you want to do development based on pacemaker.
-
-Package: liblrmd1
-Architecture: any
-Multi-Arch: same
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Pacemaker libraries - lrmd
- This package contains some of the libraries provided by and needed
- for the pacemaker cluster manager. You need to install them if you
- intend to run pacemaker. Specifically, this package contains the
- lrmd library.
-
-Package: liblrmd1-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
- liblrmd1 (= ${binary:Version})
-Description: Development file for pacemaker's lrmd library
- This package contains static libraries, symbol files as well as
- headers provided by the pacemaker cluster manager (lrmd).
- Install it if you want to do development based on pacemaker.
-
-Package: libcrmservice1
-Architecture: any
-Multi-Arch: same
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Pacemaker libraries - crmservice
- This package contains some of the libraries provided by and needed
- for the pacemaker cluster manager. You need to install them if you
- intend to run pacemaker. Specifically, this package contains the
- crmservice library.
-
-Package: libcrmservice1-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
- libcrmservice1 (= ${binary:Version})
-Description: Development file for pacemaker's crmservice library
- This package contains static libraries, symbol files as well as
- headers provided by the pacemaker cluster manager (crmservice).
- Install it if you want to do development based on pacemaker.

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



More information about the Debian-HA-Commits mailing list