[Debian-ha-commits] [corosync] 01/01: Resolved conflicts with installation of manuals

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 25 00:27:21 UTC 2015 

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

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

commit f9d37310a295200909abc26428410607e6773444
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 24 19:30:32 2015 -0400

    Resolved conflicts with installation of manuals
    
     - Updated references in lib<package>-dev.install to reflect
       proper components
     - Reverted addition of man3 directory to corosync binary
     - debian/changelog updated
    
    Change-Id: I01dc9c86e5cd8cf23fd33a00f43605bc2f9ca69c
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/changelog                 |  6 +++++-
 debian/corosync.install          |  5 ++---
 debian/libcmap-dev.install       | 18 ++----------------
 debian/libcpg-dev.install        | 20 ++------------------
 debian/libquorum-dev.install     | 11 ++---------
 debian/libsam-dev.install        | 14 ++------------
 debian/libvotequorum-dev.install | 19 +++----------------
 debian/rules                     |  2 ++
 8 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6570f95..c0ce0df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,8 @@ corosync (2.3.4-1) unstable; urgency=medium
   * debian/corosync.docs: Removed as unnecessary
   * debian/corosync.doc-base: Added
   * debian/corosync-doc.doc-base: Added
-  * debian/corosync.install: Added reference to man3; Was missing
+  * debian/corosync.install: Modified references to manuals;
+    - Only install *_test_agent manuals
   * debian/corosync.links: Added links to respective _overview manuals
     for binaries which did not have a manual provided for them
   * debian/libvotequorum<v>.install: Multiple edits
@@ -47,6 +48,7 @@ corosync (2.3.4-1) unstable; urgency=medium
       that disappeared in v2.3.0
     - libtotem-pg5 from v1.99.9+
     - libvotequorum7 from v2.3.4
+  * debian/lib<package>-dev.install: Added proper references to manuals
   * debian/patches: Multple additions;
     - Added patch for including ChangeLog in source; New Github.com
       release tarball for this version does not include ChangeLog
@@ -62,6 +64,8 @@ corosync (2.3.4-1) unstable; urgency=medium
     - Added instruction for building doxygen documentation
     - Added instruction for removing upstream INSTALL and extra
       license as flagged via Lintian
+    - Removed conflicting manuals in man3 of corosync binary which
+      are provided by their respective library
   * debian/watch: Updated to watch new upstream release location
 
  -- Richard B Winters <rik at mmogp.com>  Wed, 22 Apr 2015 15:51:34 -0400
diff --git a/debian/corosync.install b/debian/corosync.install
index 04a7d2b..3c9695a 100644
--- a/debian/corosync.install
+++ b/debian/corosync.install
@@ -1,8 +1,7 @@
 usr/sbin
 usr/bin/corosync-blackbox
-usr/share/man/man3
-usr/share/man/man5
-usr/share/man/man8
+usr/share/man/man5/corosync.conf.5
+usr/share/man/man8/corosync*.8
 etc/corosync/
 usr/share/doc/corosync/README.recovery
 usr/share/augeas/lenses/corosync.aug
diff --git a/debian/libcmap-dev.install b/debian/libcmap-dev.install
index 242aa7b..ba82bba 100644
--- a/debian/libcmap-dev.install
+++ b/debian/libcmap-dev.install
@@ -2,22 +2,8 @@ usr/include/corosync/cmap.h
 usr/lib/libcmap.a
 usr/lib/libcmap.so
 usr/lib/pkgconfig/libcmap.pc
-usr/share/man/man3/cmap_iter_next.3
-usr/share/man/man3/cmap_set.3
-usr/share/man/man3/cmap_dec.3
-usr/share/man/man3/cmap_finalize.3
-usr/share/man/man3/cmap_inc.3
-usr/share/man/man3/cmap_dispatch.3
-usr/share/man/man3/cmap_iter_finalize.3
-usr/share/man/man3/cmap_track_delete.3
-usr/share/man/man3/cmap_initialize.3
-usr/share/man/man3/cmap_iter_init.3
-usr/share/man/man3/cmap_get.3
-usr/share/man/man3/cmap_context_set.3
-usr/share/man/man3/cmap_track_add.3
-usr/share/man/man3/cmap_fd_get.3
-usr/share/man/man3/cmap_delete.3
-usr/share/man/man3/cmap_context_get.3
+usr/share/man/man3/cmap_*.3
+usr/share/man/man8/cmap_*.8
 usr/share/doc/corosync/html/cmap_context_get.3.html
 usr/share/doc/corosync/html/cmap_context_set.3.html
 usr/share/doc/corosync/html/cmap_dec.3.html
diff --git a/debian/libcpg-dev.install b/debian/libcpg-dev.install
index 9fa84e6..103d7e1 100644
--- a/debian/libcpg-dev.install
+++ b/debian/libcpg-dev.install
@@ -2,9 +2,8 @@ usr/include/corosync/cpg.h
 usr/lib/libcpg.a
 usr/lib/libcpg.so
 usr/lib/pkgconfig/libcpg.pc
-usr/share/man/man3/cpg_iteration_finalize.3
-usr/share/man/man3/cpg_iteration_initialize.3
-usr/share/man/man3/cpg_iteration_next.3
+usr/share/man/man3/cpg_*.3
+usr/share/man/man8/cpg_overview.8
 usr/share/doc/corosync/html/cpg_context_get.3.html
 usr/share/doc/corosync/html/cpg_context_set.3.html
 usr/share/doc/corosync/html/cpg_dispatch.3.html
@@ -24,18 +23,3 @@ usr/share/doc/corosync/html/cpg_overview.8.html
 usr/share/doc/corosync/html/cpg_zcb_alloc.3.html
 usr/share/doc/corosync/html/cpg_zcb_free.3.html
 usr/share/doc/corosync/html/cpg_zcb_mcast_joined.3.html
-usr/share/man/man3/cpg_context_get.3
-usr/share/man/man3/cpg_context_set.3
-usr/share/man/man3/cpg_dispatch.3
-usr/share/man/man3/cpg_fd_get.3
-usr/share/man/man3/cpg_finalize.3
-usr/share/man/man3/cpg_initialize.3
-usr/share/man/man3/cpg_join.3
-usr/share/man/man3/cpg_leave.3
-usr/share/man/man3/cpg_local_get.3
-usr/share/man/man3/cpg_mcast_joined.3
-usr/share/man/man3/cpg_membership_get.3
-usr/share/man/man3/cpg_model_initialize.3
-usr/share/man/man3/cpg_zcb_alloc.3
-usr/share/man/man3/cpg_zcb_free.3
-usr/share/man/man3/cpg_zcb_mcast_joined.3
diff --git a/debian/libquorum-dev.install b/debian/libquorum-dev.install
index 7297fef..a36ed56 100644
--- a/debian/libquorum-dev.install
+++ b/debian/libquorum-dev.install
@@ -2,15 +2,8 @@ usr/lib/libquorum.a
 usr/lib/libquorum.so
 usr/lib/pkgconfig/libquorum.pc
 usr/include/corosync/quorum.h
-usr/share/man/man3/quorum_fd_get.3
-usr/share/man/man3/quorum_initialize.3
-usr/share/man/man3/quorum_finalize.3
-usr/share/man/man3/quorum_dispatch.3
-usr/share/man/man3/quorum_trackstop.3
-usr/share/man/man3/quorum_getquorate.3
-usr/share/man/man3/quorum_trackstart.3
-usr/share/man/man3/quorum_context_set.3
-usr/share/man/man3/quorum_context_get.3
+usr/share/man/man3/quorum_*.3
+usr/share/man/man8/quorum_overview.8
 usr/share/doc/corosync/html/quorum_context_get.3.html
 usr/share/doc/corosync/html/quorum_dispatch.3.html
 usr/share/doc/corosync/html/quorum_fd_get.3.html
diff --git a/debian/libsam-dev.install b/debian/libsam-dev.install
index 8e4a228..c90146d 100644
--- a/debian/libsam-dev.install
+++ b/debian/libsam-dev.install
@@ -2,10 +2,8 @@ usr/include/corosync/sam.h
 usr/lib/libsam.a
 usr/lib/libsam.so
 usr/lib/pkgconfig/libsam.pc
-usr/share/man/man3/sam_data_getsize.3
-usr/share/man/man3/sam_mark_failed.3
-usr/share/man/man3/sam_data_restore.3
-usr/share/man/man3/sam_data_store.3
+usr/share/man/man3/sam_*.3
+usr/share/man/man8/sam_overview.8
 usr/share/doc/corosync/html/sam_data_getsize.3.html
 usr/share/doc/corosync/html/sam_data_restore.3.html
 usr/share/doc/corosync/html/sam_data_store.3.html
@@ -19,11 +17,3 @@ usr/share/doc/corosync/html/sam_register.3.html
 usr/share/doc/corosync/html/sam_start.3.html
 usr/share/doc/corosync/html/sam_stop.3.html
 usr/share/doc/corosync/html/sam_warn_signal_set.3.html
-usr/share/man/man3/sam_finalize.3
-usr/share/man/man3/sam_hc_callback_register.3
-usr/share/man/man3/sam_hc_send.3
-usr/share/man/man3/sam_initialize.3
-usr/share/man/man3/sam_register.3
-usr/share/man/man3/sam_start.3
-usr/share/man/man3/sam_stop.3
-usr/share/man/man3/sam_warn_signal_set.3
diff --git a/debian/libvotequorum-dev.install b/debian/libvotequorum-dev.install
index a576fd0..f44326c 100644
--- a/debian/libvotequorum-dev.install
+++ b/debian/libvotequorum-dev.install
@@ -2,9 +2,9 @@ usr/include/corosync/votequorum.h
 usr/lib/libvotequorum.a
 usr/lib/libvotequorum.so
 usr/lib/pkgconfig/libvotequorum.pc
-usr/share/man/man3/votequorum_trackstart.3
-usr/share/man/man3/votequorum_trackstop.3
-usr/share/man/man3/votequorum_fd_get.3
+usr/share/man/man3/votequorum_*.3
+usr/share/man/man5/votequorum.5
+usr/share/man/man8/votequorum_overview.8
 usr/share/doc/corosync/html/votequorum.5.html
 usr/share/doc/corosync/html/votequorum_context_get.3.html
 usr/share/doc/corosync/html/votequorum_context_set.3.html
@@ -18,21 +18,8 @@ usr/share/doc/corosync/html/votequorum_setexpected.3.html
 usr/share/doc/corosync/html/votequorum_setvotes.3.html
 usr/share/doc/corosync/html/votequorum_trackstart.3.html
 usr/share/doc/corosync/html/votequorum_trackstop.3.html
-usr/share/man/man3/votequorum_context_get.3
-usr/share/man/man3/votequorum_context_set.3
-usr/share/man/man3/votequorum_dispatch.3
-usr/share/man/man3/votequorum_finalize.3
-usr/share/man/man3/votequorum_getinfo.3
-usr/share/man/man3/votequorum_initialize.3
-usr/share/man/man3/votequorum_setexpected.3
-usr/share/man/man3/votequorum_setvotes.3
 usr/share/doc/corosync/html/votequorum_qdevice_update.3.html
 usr/share/doc/corosync/html/votequorum_qdevice_register.3.html
 usr/share/doc/corosync/html/votequorum_qdevice_poll.3.html
 usr/share/doc/corosync/html/votequorum_qdevice_master_wins.3.html
 usr/share/doc/corosync/html/votequorum_qdevice_unregister.3.html
-usr/share/man/man3/votequorum_qdevice_master_wins.3
-usr/share/man/man3/votequorum_qdevice_register.3
-usr/share/man/man3/votequorum_qdevice_poll.3
-usr/share/man/man3/votequorum_qdevice_update.3
-usr/share/man/man3/votequorum_qdevice_unregister.3
diff --git a/debian/rules b/debian/rules
index abec350..2db152e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,8 @@ override_dh_installchangelogs:
 override_dh_strip:
 	dh_strip --dbg-package=corosync-dbg
 	
+MAN = debian/corosync/usr/share/man/man3
+
 override_dh_compress:
 	dh_compress
 	for a in $(CURDIR)/debian/corosync/usr/sbin/*; do chrpath -d $$a; done

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

More information about the Debian-HA-Commits mailing list