[Debian-ha-commits] [pacemaker] 04/07: Included changes from Pallai Roland <dap at magex.hu>

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 25 20:52:05 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 79f6ef3fbeaa6e05c6ee96c2b4d8d491d09efd64
Author: Pallai Roland <dap at magex.hu>
Date:   Fri Apr 24 18:46:13 2015 -0400

    Included changes from Pallai Roland <dap at magex.hu>
    
    Change-Id: I5244a759af3a626789637789041db5cca9e3704d
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control                                     | 30 ++++++++++++++--------
 debian/libcib3.install                             |  2 --
 .../{libcib3-dev.install => libcib4-dev.install}   |  1 -
 debian/libcib4.install                             |  2 ++
 debian/libcrmcluster4.install                      |  2 +-
 debian/libcrmcommon3.install                       |  2 +-
 debian/liblrmd1.install                            |  2 +-
 debian/libpe-rules2.install                        |  2 +-
 debian/libpe-status4.install                       |  2 +-
 debian/libpengine4.install                         |  2 +-
 debian/libstonithd2.install                        |  2 +-
 debian/libtransitioner2.install                    |  2 +-
 debian/pacemaker.install                           | 21 +++------------
 13 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/debian/control b/debian/control
index 2b5612f..53102d6 100644
--- a/debian/control
+++ b/debian/control
@@ -174,34 +174,38 @@ Description: Debugging symbols for Pacemaker
  .
  This package contains the debugging symbols for Pacemaker.
 
-Package: libcib3
+Package: libcib4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Replaces: pacemaker (<= 1.0.9.1+hg15626-2),
  libcib1,
- libcib2
+ libcib2,
+ libcib3
 Conflicts: pacemaker (<= 1.0.9.1+hg15626-2),
  libcib1,
- libcib2
+ libcib2,
+ libcib3
 Description: Pacemaker libraries - CIB 
  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
  CIB library.
 
-Package: libcib3-dev
+Package: libcib4-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
- libcib3 (= ${binary:Version})
+ libcib4 (= ${binary:Version})
 Replaces: pacemaker-dev (<< 1.1.8+git20121010-1),
  libcib1-dev,
- libcib2-dev
+ libcib2-dev,
+ libcib3-dev
 Conflicts: pacemaker-dev (<< 1.1.8+git20121010-1),
  libcib1-dev,
- libcib2-dev
+ libcib2-dev,
+ libcib3-dev
 Description: Development file for pacemaker's cib library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (CIB). Install 
@@ -373,9 +377,11 @@ Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Replaces: pacemaker (<= 1.0.9.1+hg15626-2),
- libstonithd0
+ libstonithd0,
+ libstonithd1
 Conflicts: pacemaker (<= 1.0.9.1+hg15626-2),
- libstonithd0
+ libstonithd0,
+ libstonithd1
 Description: Pacemaker libraries - stonith
  This package contains some of the libraries provided by and needed
  for the pacemaker cluster manager. You need to install them if you
@@ -388,9 +394,11 @@ Section: libdevel
 Depends: ${misc:Depends},
  libstonithd2 (= ${binary:Version})
 Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2),
- libstonithd0-dev
+ libstonithd0-dev,
+ libstonithd1-dev
 Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2),
- libstonithd0-dev
+ libstonithd0-dev,
+ libstonithd1-dev
 Description: Development file for pacemaker's stonith library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (stonith). 
diff --git a/debian/libcib3.install b/debian/libcib3.install
deleted file mode 100644
index 85490fe..0000000
--- a/debian/libcib3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcib.so.3
-usr/lib/libcib.so.3.0.1
diff --git a/debian/libcib3-dev.install b/debian/libcib4-dev.install
similarity index 85%
rename from debian/libcib3-dev.install
rename to debian/libcib4-dev.install
index 4bccdb2..ab05c14 100644
--- a/debian/libcib3-dev.install
+++ b/debian/libcib4-dev.install
@@ -1,5 +1,4 @@
 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 
diff --git a/debian/libcib4.install b/debian/libcib4.install
new file mode 100644
index 0000000..5ffb9d4
--- /dev/null
+++ b/debian/libcib4.install
@@ -0,0 +1,2 @@
+usr/lib/libcib.so.4
+usr/lib/libcib.so.4.0.0
diff --git a/debian/libcrmcluster4.install b/debian/libcrmcluster4.install
index 8d89046..285a47d 100644
--- a/debian/libcrmcluster4.install
+++ b/debian/libcrmcluster4.install
@@ -1,2 +1,2 @@
 usr/lib/libcrmcluster.so.4
-usr/lib/libcrmcluster.so.4.0.0
+usr/lib/libcrmcluster.so.4.0.1
diff --git a/debian/libcrmcommon3.install b/debian/libcrmcommon3.install
index 61d63d1..e4e2fc1 100644
--- a/debian/libcrmcommon3.install
+++ b/debian/libcrmcommon3.install
@@ -1,2 +1,2 @@
 usr/lib/libcrmcommon.so.3
-usr/lib/libcrmcommon.so.3.2.0
+usr/lib/libcrmcommon.so.3.3.0
diff --git a/debian/liblrmd1.install b/debian/liblrmd1.install
index 5b4175d..1bf2589 100644
--- a/debian/liblrmd1.install
+++ b/debian/liblrmd1.install
@@ -1,2 +1,2 @@
 usr/lib/liblrmd.so.1
-usr/lib/liblrmd.so.1.1.1
+usr/lib/liblrmd.so.1.1.2
diff --git a/debian/libpe-rules2.install b/debian/libpe-rules2.install
index 65cf933..a76ad41 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.2
+usr/lib/libpe_rules.so.2.0.3
diff --git a/debian/libpe-status4.install b/debian/libpe-status4.install
index a1b8bb6..251551a 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.2.0
+usr/lib/libpe_status.so.4.3.0
diff --git a/debian/libpengine4.install b/debian/libpengine4.install
index 39b7528..e897ab0 100644
--- a/debian/libpengine4.install
+++ b/debian/libpengine4.install
@@ -1,2 +1,2 @@
 usr/lib/libpengine.so.4
-usr/lib/libpengine.so.4.2.0
+usr/lib/libpengine.so.4.3.0
diff --git a/debian/libstonithd2.install b/debian/libstonithd2.install
index 3ead69c..efdfa27 100644
--- a/debian/libstonithd2.install
+++ b/debian/libstonithd2.install
@@ -1,2 +1,2 @@
 usr/lib/libstonithd.so.2
-usr/lib/libstonithd.so.2.1.0
+usr/lib/libstonithd.so.2.1.1
diff --git a/debian/libtransitioner2.install b/debian/libtransitioner2.install
index 3410883..046e8ce 100644
--- a/debian/libtransitioner2.install
+++ b/debian/libtransitioner2.install
@@ -1,2 +1,2 @@
 usr/lib/libtransitioner.so.2
-usr/lib/libtransitioner.so.2.0.1
+usr/lib/libtransitioner.so.2.0.2
diff --git a/debian/pacemaker.install b/debian/pacemaker.install
index c8173ba..9fb89d5 100644
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -24,7 +24,7 @@ usr/lib/pacemaker/lrmd_test
 usr/lib/pacemaker/pengine
 usr/lib/pacemaker/stonithd
 usr/lib/pacemaker/stonith-test
-usr/lib/python*/*-packages/*/*.py
+usr/lib/python*/*-packages/cts/*.py
 usr/sbin/attrd_updater
 usr/sbin/fence_legacy
 usr/sbin/fence_pcmk
@@ -50,27 +50,12 @@ usr/share/man/man8/fence_legacy.8
 usr/share/man/man8/fence_pcmk.8
 usr/share/man/man8/pacemakerd.8
 usr/share/man/man8/stonith_admin.8
-usr/share/pacemaker/acls-1.1.rng
-usr/share/pacemaker/acls-1.2.rng
-usr/share/pacemaker/constraints-1.0.rng
-usr/share/pacemaker/constraints-1.1.rng
-usr/share/pacemaker/constraints-1.2.rng
+usr/share/pacemaker/*.rng
 usr/share/pacemaker/crm.dtd
 usr/share/pacemaker/crm-transitional.dtd
-usr/share/pacemaker/fencing.rng
-usr/share/pacemaker/nvset.rng
-usr/share/pacemaker/pacemaker-1.0.rng
-usr/share/pacemaker/pacemaker-1.1.rng
-usr/share/pacemaker/pacemaker-1.2.rng
-usr/share/pacemaker/pacemaker.rng
 usr/share/pacemaker/report.collector
 usr/share/pacemaker/report.common
-usr/share/pacemaker/resources-1.0.rng
-usr/share/pacemaker/resources-1.1.rng
-usr/share/pacemaker/resources-1.2.rng
-usr/share/pacemaker/rule.rng
-usr/share/pacemaker/score.rng
 usr/share/pacemaker/upgrade06.xsl
-usr/share/pacemaker/versions.rng
+usr/share/pacemaker/upgrade-1.3.xsl
 usr/share/snmp/mibs/PCMK-MIB.txt
 usr/lib/lcrso/pacemaker.lcrso 

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