[Debian-ha-commits] [pacemaker] 06/09: Revereted some changes for MultiArch from pacemaker and pacemaker-remote

[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 1f0a71fba5997c4bcce135bc6c35921949c56e3f
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue Apr 28 18:55:24 2015 -0400

    Revereted some changes for MultiArch from pacemaker and pacemaker-remote
    
    Change-Id: I7b07b0f9543e17a3403674592135d7d376bf1544
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control                  |  1 -
 debian/pacemaker-remote.install |  2 +-
 debian/pacemaker.install        | 24 ++++++++++++------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 280e375..018f482 100644
--- a/debian/control
+++ b/debian/control
@@ -105,7 +105,6 @@ Description: Command line interface utilities for Pacemaker
 
 Package: pacemaker-remote
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  ${python:Depends},
diff --git a/debian/pacemaker-remote.install b/debian/pacemaker-remote.install
index 821f3bc..7cc162f 100644
--- a/debian/pacemaker-remote.install
+++ b/debian/pacemaker-remote.install
@@ -3,4 +3,4 @@ lib/systemd/system/pacemaker_remote.service
 usr/share/man/man7/ocf_pacemaker_remote.7
 usr/share/man/man8/pacemaker_remoted.8
 usr/sbin/pacemaker_remoted
-usr/lib/*/ocf/resource.d/pacemaker/remote
+usr/lib/ocf/resource.d/pacemaker/remote
diff --git a/debian/pacemaker.install b/debian/pacemaker.install
index 2e09418..4f2864f 100644
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -1,17 +1,17 @@
 etc/init.d/pacemaker
 etc/logrotate.d/pacemaker
 lib/systemd/system/pacemaker.service
-usr/lib/*/ocf/resource.d/pacemaker/ClusterMon
-usr/lib/*/ocf/resource.d/pacemaker/controld
-usr/lib/*/ocf/resource.d/pacemaker/Dummy
-usr/lib/*/ocf/resource.d/pacemaker/HealthCPU
-usr/lib/*/ocf/resource.d/pacemaker/HealthSMART
-usr/lib/*/ocf/resource.d/pacemaker/o2cb
-usr/lib/*/ocf/resource.d/pacemaker/ping
-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/ocf/resource.d/pacemaker/ClusterMon
+usr/lib/ocf/resource.d/pacemaker/controld
+usr/lib/ocf/resource.d/pacemaker/Dummy
+usr/lib/ocf/resource.d/pacemaker/HealthCPU
+usr/lib/ocf/resource.d/pacemaker/HealthSMART
+usr/lib/ocf/resource.d/pacemaker/o2cb
+usr/lib/ocf/resource.d/pacemaker/ping
+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
@@ -21,7 +21,7 @@ usr/lib/*/pacemaker/lrmd_test
 usr/lib/*/pacemaker/pengine
 usr/lib/*/pacemaker/stonithd
 usr/lib/*/pacemaker/stonith-test
-usr/lib/*/python*/*-packages/cts/*
+usr/lib/python*/*-packages/cts/*
 usr/sbin/attrd_updater
 usr/sbin/fence_legacy
 usr/sbin/fence_pcmk

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