[Debian-ha-commits] [pacemaker] 05/09: Multi-Arch changes for pacemaker

[Richard Winters]

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

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

commit 1c6585890e112630359f0511407ce2546ef92332
Author: Richard B Winters <rik at mmogp.com>
Date:   Wed Apr 29 17:41:01 2015 -0400

    Multi-Arch changes for pacemaker
    
     - Pacemaker changed back to Multi-Arch: foreign, since the
       private libraries were moved to pacemaker-libs; the
       remaining pacemaker components satisfy remaining
       dependencies since they can be called from any other
       component regardless of the architecture they were built for
     - Pacemaker dev package changed back to Multi-Arch: foreign,
       since the components provided satisfy depenencies as they
       can be called from any other component regardless of the
       architecture they were built for
     - Added pacemaker-libs to the package offering, it depends
       upon the same libraries as pacemaker
     - Fixed several instances where I had specified the incorrect
       relationship in a Replaces, Breaks, or Conflicts clause, and
       where I had changed the name of a member of a relationship,
       without having looked first; libpe-status-X and libpe-rules-
       X packages did exist in the past.
     - Added pacemaker-libs.install, to handle referencing the
       private libraries for the package
    
    Change-Id: Ibd510a0813933750da4e0891f3d66911d787caeb
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control                | 33 +++++++++++++++++++++++++++++++++
 debian/pacemaker-libs.install |  9 +++++++++
 debian/pacemaker.install      |  9 ---------
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index b2e20c0..b028c44 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,8 @@ X-Python-Version: >= 2.5
 
 Package: pacemaker
 Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  ${python:Depends},
@@ -83,6 +85,7 @@ Depends: ${shlibs:Depends},
  libpengine4 (>= ${binary:Version}),
  libstonithd2 (>= ${binary:Version}),
  libtransitioner2 (>= ${binary:Version}),
+ pacemaker-libs,
  pacemaker-cli-utils,
  python,
  resource-agents
@@ -99,6 +102,34 @@ Description: HA cluster resource manager
  recommended stack, pacemaker supports the Corosync cluster
  stack.
 
+Package: pacemaker-libs
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ corosync (>= 2.3.4),
+ 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})
+Conflicts: pacemaker (<< 1.1.12)
+Replaces: pacemaker (<< 1.1.12)
+Description: Common libraries for the pacemaker cluster stack.
+ This package contains pacemaker's private libraries. They exist
+ as an additional package to help support MultiArch and cross
+ compiling by removing architecture dependent components from
+ the pacemaker binary package.
+
 Package: pacemaker-cli-utils
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -135,10 +166,12 @@ Description: Pacemaker add-on to control virtualized services
 Package: pacemaker-dev
 Section: devel
 Architecture: any
+Multi-Arch: foreign
 Replaces: pacemaker-heartbeat-dev,
  pacemaker-openais-dev
 Conflicts: pacemaker-heartbeat-dev,
  pacemaker-openais-dev
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  libcib4-dev (>= ${binary:Version}),
diff --git a/debian/pacemaker-libs.install b/debian/pacemaker-libs.install
new file mode 100644
index 0000000..2a27f38
--- /dev/null
+++ b/debian/pacemaker-libs.install
@@ -0,0 +1,9 @@
+usr/lib/*/pacemaker/attrd
+usr/lib/*/pacemaker/cib
+usr/lib/*/pacemaker/cibmon
+usr/lib/*/pacemaker/crmd
+usr/lib/*/pacemaker/lrmd
+usr/lib/*/pacemaker/lrmd_test
+usr/lib/*/pacemaker/pengine
+usr/lib/*/pacemaker/stonithd
+usr/lib/*/pacemaker/stonith-test
\ No newline at end of file
diff --git a/debian/pacemaker.install b/debian/pacemaker.install
index 4f2864f..4f6be2e 100644
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -12,15 +12,6 @@ usr/lib/ocf/resource.d/pacemaker/pingd
 usr/lib/ocf/resource.d/pacemaker/Stateful
 usr/lib/ocf/resource.d/pacemaker/SysInfo
 usr/lib/ocf/resource.d/pacemaker/SystemHealth
-usr/lib/*/pacemaker/attrd
-usr/lib/*/pacemaker/cib
-usr/lib/*/pacemaker/cibmon
-usr/lib/*/pacemaker/crmd
-usr/lib/*/pacemaker/lrmd
-usr/lib/*/pacemaker/lrmd_test
-usr/lib/*/pacemaker/pengine
-usr/lib/*/pacemaker/stonithd
-usr/lib/*/pacemaker/stonith-test
 usr/lib/python*/*-packages/cts/*
 usr/sbin/attrd_updater
 usr/sbin/fence_legacy

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