[Debian-ha-commits] [pacemaker] 04/09: Added wildcards to usr/lib references in order to support MultiArch

Richard Winters devrik-guest at moszumanska.debian.org
Wed Apr 29 00:44:09 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 ef846a644b6b54f43d625d5ff29e804002bba690
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue Apr 28 18:01:03 2015 -0400

    Added wildcards to usr/lib references in order to support MultiArch
    
     - usr/lib/... references changed to read usr/lib/*/...
    
    Change-Id: Ic578daea47b77a665d1289aec2102395c477b9bb
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/libcib4-dev.install          |  8 +++----
 debian/libcib4.install              |  4 ++--
 debian/libcrmcluster4-dev.install   |  8 +++----
 debian/libcrmcluster4.install       |  4 ++--
 debian/libcrmcommon3-dev.install    | 10 ++++-----
 debian/libcrmcommon3.install        |  4 ++--
 debian/libcrmservice1-dev.install   |  8 +++----
 debian/libcrmservice1.install       |  4 ++--
 debian/liblrmd1-dev.install         |  8 +++----
 debian/liblrmd1.install             |  4 ++--
 debian/libpe-rules2-dev.install     |  6 +++---
 debian/libpe-rules2.install         |  4 ++--
 debian/libpe-status4-dev.install    |  6 +++---
 debian/libpe-status4.install        |  4 ++--
 debian/libpengine4-dev.install      |  8 +++----
 debian/libpengine4.install          |  4 ++--
 debian/libstonithd2-dev.install     |  6 +++---
 debian/libstonithd2.install         |  4 ++--
 debian/libtransitioner2-dev.install |  6 +++---
 debian/libtransitioner2.install     |  4 ++--
 debian/pacemaker-remote.install     |  2 +-
 debian/pacemaker.install            | 42 ++++++++++++++++++-------------------
 22 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/debian/libcib4-dev.install b/debian/libcib4-dev.install
index 4bccdb2..d00bcfb 100644
--- a/debian/libcib4-dev.install
+++ b/debian/libcib4-dev.install
@@ -1,5 +1,5 @@
-usr/lib/libcib.so
-usr/lib/libcib.a
-usr/lib/libcib.la
+usr/lib/*/libcib.so
+usr/lib/*/libcib.a
+usr/lib/*/libcib.la
 usr/include/pacemaker/crm/cib/util.h
-usr/lib/pkgconfig/pacemaker-cib.pc 
+usr/lib/*/pkgconfig/pacemaker-cib.pc 
diff --git a/debian/libcib4.install b/debian/libcib4.install
index 5ffb9d4..9a953ad 100644
--- a/debian/libcib4.install
+++ b/debian/libcib4.install
@@ -1,2 +1,2 @@
-usr/lib/libcib.so.4
-usr/lib/libcib.so.4.0.0
+usr/lib/*/libcib.so.4
+usr/lib/*/libcib.so.4.0.0
diff --git a/debian/libcrmcluster4-dev.install b/debian/libcrmcluster4-dev.install
index d869748..3466a76 100644
--- a/debian/libcrmcluster4-dev.install
+++ b/debian/libcrmcluster4-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libcrmcluster.so
-usr/lib/libcrmcluster.a
-usr/lib/libcrmcluster.la
+usr/lib/*/libcrmcluster.so
+usr/lib/*/libcrmcluster.a
+usr/lib/*/libcrmcluster.la
 usr/include/pacemaker/crm/cib.h
 usr/include/pacemaker/crm/crm.h
 usr/include/pacemaker/crm/msg_xml.h
@@ -12,4 +12,4 @@ usr/include/pacemaker/crm/error.h
 usr/include/pacemaker/crm/services.h
 usr/include/pacemaker/crm/cluster.h
 usr/include/pacemaker/crm/compatibility.h
-usr/lib/pkgconfig/pacemaker-cluster.pc 
+usr/lib/*/pkgconfig/pacemaker-cluster.pc 
diff --git a/debian/libcrmcluster4.install b/debian/libcrmcluster4.install
index 285a47d..bf24917 100644
--- a/debian/libcrmcluster4.install
+++ b/debian/libcrmcluster4.install
@@ -1,2 +1,2 @@
-usr/lib/libcrmcluster.so.4
-usr/lib/libcrmcluster.so.4.0.1
+usr/lib/*/libcrmcluster.so.4
+usr/lib/*/libcrmcluster.so.4.0.1
diff --git a/debian/libcrmcommon3-dev.install b/debian/libcrmcommon3-dev.install
index 5955234..b34852a 100644
--- a/debian/libcrmcommon3-dev.install
+++ b/debian/libcrmcommon3-dev.install
@@ -1,11 +1,11 @@
-usr/lib/libcrmcommon.so
-usr/lib/libcrmcommon.a
-usr/lib/libcrmcommon.la
+usr/lib/*/libcrmcommon.so
+usr/lib/*/libcrmcommon.a
+usr/lib/*/libcrmcommon.la
 usr/include/pacemaker/crm/common/xml.h
 usr/include/pacemaker/crm/common/ipc.h
 usr/include/pacemaker/crm/common/util.h
 usr/include/pacemaker/crm/common/iso8601.h
 usr/include/pacemaker/crm/common/mainloop.h
 usr/include/pacemaker/crm/common/logging.h
-usr/lib/pkgconfig/pacemaker.pc 
-usr/lib/pkgconfig/pacemaker-fencing.pc 
+usr/lib/*/pkgconfig/pacemaker.pc 
+usr/lib/*/pkgconfig/pacemaker-fencing.pc 
diff --git a/debian/libcrmcommon3.install b/debian/libcrmcommon3.install
index e4e2fc1..8c98d24 100644
--- a/debian/libcrmcommon3.install
+++ b/debian/libcrmcommon3.install
@@ -1,2 +1,2 @@
-usr/lib/libcrmcommon.so.3
-usr/lib/libcrmcommon.so.3.3.0
+usr/lib/*/libcrmcommon.so.3
+usr/lib/*/libcrmcommon.so.3.3.0
diff --git a/debian/libcrmservice1-dev.install b/debian/libcrmservice1-dev.install
index cbf96ac..9c965b9 100644
--- a/debian/libcrmservice1-dev.install
+++ b/debian/libcrmservice1-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libcrmservice.so
-usr/lib/libcrmservice.a
-usr/lib/libcrmservice.la
-usr/lib/pkgconfig/pacemaker-service.pc 
+usr/lib/*/libcrmservice.so
+usr/lib/*/libcrmservice.a
+usr/lib/*/libcrmservice.la
+usr/lib/*/pkgconfig/pacemaker-service.pc 
diff --git a/debian/libcrmservice1.install b/debian/libcrmservice1.install
index be4eb21..9073408 100644
--- a/debian/libcrmservice1.install
+++ b/debian/libcrmservice1.install
@@ -1,2 +1,2 @@
-usr/lib/libcrmservice.so.1
-usr/lib/libcrmservice.so.1.0.0
+usr/lib/*/libcrmservice.so.1
+usr/lib/*/libcrmservice.so.1.0.0
diff --git a/debian/liblrmd1-dev.install b/debian/liblrmd1-dev.install
index fb0fb1e..25d956b 100644
--- a/debian/liblrmd1-dev.install
+++ b/debian/liblrmd1-dev.install
@@ -1,5 +1,5 @@
-usr/lib/liblrmd.so
-usr/lib/liblrmd.a
-usr/lib/liblrmd.la
+usr/lib/*/liblrmd.so
+usr/lib/*/liblrmd.a
+usr/lib/*/liblrmd.la
 usr/include/pacemaker/crm/lrmd.h
-usr/lib/pkgconfig/pacemaker-lrmd.pc
+usr/lib/*/pkgconfig/pacemaker-lrmd.pc
diff --git a/debian/liblrmd1.install b/debian/liblrmd1.install
index 1bf2589..595941c 100644
--- a/debian/liblrmd1.install
+++ b/debian/liblrmd1.install
@@ -1,2 +1,2 @@
-usr/lib/liblrmd.so.1
-usr/lib/liblrmd.so.1.1.2
+usr/lib/*/liblrmd.so.1
+usr/lib/*/liblrmd.so.1.1.2
diff --git a/debian/libpe-rules2-dev.install b/debian/libpe-rules2-dev.install
index 53826fb..d788b99 100644
--- a/debian/libpe-rules2-dev.install
+++ b/debian/libpe-rules2-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libpe_rules.so
-usr/lib/libpe_rules.a
-usr/lib/libpe_rules.la
+usr/lib/*/libpe_rules.so
+usr/lib/*/libpe_rules.a
+usr/lib/*/libpe_rules.la
diff --git a/debian/libpe-rules2.install b/debian/libpe-rules2.install
index a76ad41..45c4e3c 100644
--- a/debian/libpe-rules2.install
+++ b/debian/libpe-rules2.install
@@ -1,2 +1,2 @@
-usr/lib/libpe_rules.so.2
-usr/lib/libpe_rules.so.2.0.3
+usr/lib/*/libpe_rules.so.2
+usr/lib/*/libpe_rules.so.2.0.3
diff --git a/debian/libpe-status4-dev.install b/debian/libpe-status4-dev.install
index ccb04e0..195373c 100644
--- a/debian/libpe-status4-dev.install
+++ b/debian/libpe-status4-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libpe_status.so
-usr/lib/libpe_status.a
-usr/lib/libpe_status.la
+usr/lib/*/libpe_status.so
+usr/lib/*/libpe_status.a
+usr/lib/*/libpe_status.la
diff --git a/debian/libpe-status4.install b/debian/libpe-status4.install
index 251551a..0205ed9 100644
--- a/debian/libpe-status4.install
+++ b/debian/libpe-status4.install
@@ -1,2 +1,2 @@
-usr/lib/libpe_status.so.4
-usr/lib/libpe_status.so.4.3.0
+usr/lib/*/libpe_status.so.4
+usr/lib/*/libpe_status.so.4.3.0
diff --git a/debian/libpengine4-dev.install b/debian/libpengine4-dev.install
index 7b8f8ed..46c557f 100644
--- a/debian/libpengine4-dev.install
+++ b/debian/libpengine4-dev.install
@@ -1,8 +1,8 @@
-usr/lib/libpengine.so
-usr/lib/libpengine.a
-usr/lib/libpengine.la
+usr/lib/*/libpengine.so
+usr/lib/*/libpengine.a
+usr/lib/*/libpengine.la
 usr/include/pacemaker/crm/pengine/common.h
 usr/include/pacemaker/crm/pengine/complex.h
 usr/include/pacemaker/crm/pengine/rules.h
 usr/include/pacemaker/crm/pengine/status.h
-usr/lib/pkgconfig/pacemaker-pengine.pc 
+usr/lib/*/pkgconfig/pacemaker-pengine.pc 
diff --git a/debian/libpengine4.install b/debian/libpengine4.install
index e897ab0..084a8d8 100644
--- a/debian/libpengine4.install
+++ b/debian/libpengine4.install
@@ -1,2 +1,2 @@
-usr/lib/libpengine.so.4
-usr/lib/libpengine.so.4.3.0
+usr/lib/*/libpengine.so.4
+usr/lib/*/libpengine.so.4.3.0
diff --git a/debian/libstonithd2-dev.install b/debian/libstonithd2-dev.install
index 8188afe..87333c5 100644
--- a/debian/libstonithd2-dev.install
+++ b/debian/libstonithd2-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libstonithd.so
-usr/lib/libstonithd.a
-usr/lib/libstonithd.la
+usr/lib/*/libstonithd.so
+usr/lib/*/libstonithd.a
+usr/lib/*/libstonithd.la
diff --git a/debian/libstonithd2.install b/debian/libstonithd2.install
index efdfa27..f31e02a 100644
--- a/debian/libstonithd2.install
+++ b/debian/libstonithd2.install
@@ -1,2 +1,2 @@
-usr/lib/libstonithd.so.2
-usr/lib/libstonithd.so.2.1.1
+usr/lib/*/libstonithd.so.2
+usr/lib/*/libstonithd.so.2.1.1
diff --git a/debian/libtransitioner2-dev.install b/debian/libtransitioner2-dev.install
index 09cedb4..be64c0b 100644
--- a/debian/libtransitioner2-dev.install
+++ b/debian/libtransitioner2-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libtransitioner.so
-usr/lib/libtransitioner.a
-usr/lib/libtransitioner.la
+usr/lib/*/libtransitioner.so
+usr/lib/*/libtransitioner.a
+usr/lib/*/libtransitioner.la
diff --git a/debian/libtransitioner2.install b/debian/libtransitioner2.install
index 046e8ce..e60bbbc 100644
--- a/debian/libtransitioner2.install
+++ b/debian/libtransitioner2.install
@@ -1,2 +1,2 @@
-usr/lib/libtransitioner.so.2
-usr/lib/libtransitioner.so.2.0.2
+usr/lib/*/libtransitioner.so.2
+usr/lib/*/libtransitioner.so.2.0.2
diff --git a/debian/pacemaker-remote.install b/debian/pacemaker-remote.install
index 7cc162f..821f3bc 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 c7ad258..2e09418 100644
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -1,27 +1,27 @@
 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/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/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
+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
 usr/sbin/fence_pcmk

-- 
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