[Debian-ha-commits] [cluster-glue] 69/73: Changed conflicts to Breaks in the following sub-packages:

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:41 UTC 2015 

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

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

commit eed89ebb9ed1afd466fa1f3bb2a30266b2fc79ea
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 17 06:24:02 2015 -0400

    Changed conflicts to Breaks in the following sub-packages:
    
     - liblrm2
     - liblrm2-dev
     - libpils2
     - libpils2-dev
     - libplumb2
     - libplumb2-dev
     - libplumbgpl2
     - libplumbgpl2-dev
     - libstonith1
     - libstonith1-dev
    
    - Added symbolic link to lrmadmin manual for cibsecret binary in
    cluster-glue
    
    Change-Id: Ic78359c5fe7a59827a8a14c6b716fb58c1d31112
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/cluster-glue-dev.lintian-overrides |  4 ----
 debian/cluster-glue.install               |  1 +
 debian/cluster-glue.lintian-overrides     |  4 ----
 debian/cluster-glue.manpages              |  1 +
 debian/control                            | 24 ++++++++++++------------
 debian/libcluster-glue.lintian-overrides  |  6 +++---
 debian/rules                              |  3 +++
 debian/source.lintian-overrides           |  5 +++++
 8 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/debian/cluster-glue-dev.lintian-overrides b/debian/cluster-glue-dev.lintian-overrides
deleted file mode 100644
index 98129dc..0000000
--- a/debian/cluster-glue-dev.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# Warnings about conflicts-with-version can be ignored, as
-# we cannot have heartbeat, or versions of libcluster-glue-dev
-# prior to 1.0.6, mixing with this package.
-cluster-glue-dev: conflicts-with-version
diff --git a/debian/cluster-glue.install b/debian/cluster-glue.install
index aac58fa..fde1fea 100644
--- a/debian/cluster-glue.install
+++ b/debian/cluster-glue.install
@@ -89,6 +89,7 @@ usr/share/man/man8/meatclient.8
 usr/share/man/man8/hb_report.8
 usr/share/man/man8/ha_logd.8
 usr/share/man/man8/stonith.8
+usr/share/man/man8/cibsecret.8
 usr/share/man/man8/lrmadmin.8
 usr/sbin/cibsecret
 usr/share/cluster-glue/lrmtest/testcases/stonith.exp
diff --git a/debian/cluster-glue.lintian-overrides b/debian/cluster-glue.lintian-overrides
deleted file mode 100644
index 4a588a8..0000000
--- a/debian/cluster-glue.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# Warnings about conflicts-with-version can be ignored, as
-# we cannot have heartbeat, nor versions of libcluster-glue
-# prior to 1.0.6, mixing with this package.
-cluster-glue: conflicts-with-version
diff --git a/debian/cluster-glue.manpages b/debian/cluster-glue.manpages
index f264b8f..d215edf 100644
--- a/debian/cluster-glue.manpages
+++ b/debian/cluster-glue.manpages
@@ -3,3 +3,4 @@ doc/stonith.8
 doc/ha_logd.8
 doc/hb_report.8
 doc/ha_logger.1
+debian/tmp/usr/share/man/man8/cibsecret.8
diff --git a/debian/control b/debian/control
index 3163e04..d97aaf3 100644
--- a/debian/control
+++ b/debian/control
@@ -162,8 +162,8 @@ Replaces: libcluster-glue (<= 1.0.6-1),
  heartbeat,
  heartbeat-common,
  libheartbeat2
-Conflicts: libcluster-glue (<= 1.0.6-1),
- heartbeat,
+Breaks: libcluster-glue (<= 1.0.6-1)
+Conflicts: heartbeat,
  heartbeat-common,
  libheartbeat2
 Description: Reusable cluster libraries (transitional package)
@@ -380,7 +380,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
+Breaks: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- liblrm2
  This package contains the lrm helper library from cluster-glue,
  the reusable cluster components package. 
@@ -393,7 +393,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
+Breaks: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- libpils2
  This package contains the pils library from cluster-glue, the 
  reusable cluster components package. 
@@ -406,7 +406,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
+Breaks: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- libplumb2
  This package contains the plumber library from cluster-glue, the 
  reusable cluster components package. 
@@ -419,7 +419,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1)
-Conflicts: libcluster-glue (<= 1.0.6-1)
+Breaks: libcluster-glue (<= 1.0.6-1)
 Description: Reusable cluster libraries -- libplumbgpl2
  This package contains the plumber library from cluster-glue,
  the reusable cluster components package, in the GPL version. 
@@ -433,7 +433,7 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Replaces: libcluster-glue (<= 1.0.6-1),
  libstonith0
-Conflicts: libcluster-glue (<= 1.0.6-1), 
+Breaks: libcluster-glue (<= 1.0.6-1), 
  libstonith0
 Description: Reusable cluster libraries -- libstonith1
  This package contains the stonith library from cluster-glue, the 
@@ -448,7 +448,7 @@ Architecture: any
 Depends: ${misc:Depends}, 
  liblrm2 (= ${binary:Version})
 Replaces: libcluster-glue-dev (<= 1.0.6-1)
-Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Breaks: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- liblrm
  This package contains the development files of the lrm helper 
  library from cluster-glue, the reusable cluster components 
@@ -464,7 +464,7 @@ Depends: ${misc:Depends},
  libpils2 (= ${binary:Version}), 
  libltdl-dev
 Replaces: libcluster-glue-dev (<= 1.0.6-1)
-Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Breaks: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- libpils2
  This package contains the development files of the pils 
  library from cluster-glue, the reusable cluster components 
@@ -479,7 +479,7 @@ Architecture: any
 Depends: ${misc:Depends}, 
  libplumb2 (= ${binary:Version})
 Replaces: libcluster-glue-dev (<= 1.0.6-1)
-Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Breaks: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- libplumb2
  This package contains the development files of the plumber 
  library from cluster-glue, the reusable cluster components 
@@ -494,7 +494,7 @@ Architecture: any
 Depends: ${misc:Depends}, 
  libplumbgpl2 (= ${binary:Version})
 Replaces: libcluster-glue-dev (<= 1.0.6-1)
-Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Breaks: libcluster-glue-dev (<= 1.0.6-1)
 Description: Reusable cluster development files -- libplumbgpl2
  This package contains the development files of the plumber 
  library from cluster-glue, the reusable cluster components 
@@ -510,7 +510,7 @@ Depends: ${misc:Depends},
  libstonith1 (= ${binary:Version})
 Replaces: libcluster-glue-dev (<= 1.0.6-1),
  libstonith0-dev
-Conflicts: libcluster-glue-dev (<= 1.0.6-1),
+Breaks: libcluster-glue-dev (<= 1.0.6-1),
  libstonith0-dev
 Description: Reusable cluster development files -- libstonith1
  This package contains the development files of the stonith 
diff --git a/debian/libcluster-glue.lintian-overrides b/debian/libcluster-glue.lintian-overrides
index 426bd86..25a98f2 100644
--- a/debian/libcluster-glue.lintian-overrides
+++ b/debian/libcluster-glue.lintian-overrides
@@ -1,4 +1,4 @@
-# Warnings about conflicts-with-version can be ignored, as
+# Warnings about package relation with self can be ignored, as
 # we cannot have heartbeat, nor versions of libcluster-glue
-# prior to 1.0.6, mixing with this package.
-libcluster-glue: conflicts-with-version
+# prior to 1.0.6, mixing with this transitional package.
+libcluster-glue: package-relation-with-self
diff --git a/debian/rules b/debian/rules
index e731fa3..37ccd9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,9 @@ override_dh_auto_install:
 	for file in `find $(CURDIR)/debian/tmp -name '*.la'`; do \
 		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 	done
+# install symbolic link to lrmadmin manual for cibsecret binary
+	ln -rs $(CURDIR)/debian/tmp/usr/share/man/man8/lrmadmin.8 \
+		$(CURDIR)/debian/tmp/usr/share/man/man8/cibsecret.8
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..c55827b
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,5 @@
+# intra-source-package-circular-dependency is also unavoidable
+# at this time due to the fact that cluster-glue is intended
+# to be a collection of its subpackages, as well as providing
+# additional components itself. 
+cluster-glue source: intra-source-package-circular-dependency

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

More information about the Debian-HA-Commits mailing list