[Debian-ha-commits] [pacemaker] 01/02: More interim changes

Sun Apr 26 02:35:48 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 daf6fbaad6e8f85da8e17f53bbfab9250ade1b59
Author: Richard B Winters <rik at mmogp.com>
Date:   Sat Apr 25 17:26:44 2015 -0400

    More interim changes
    
     - Updated references in debian/pacemaker.install
       - Removed reference to heartbeat files
       - Removed reference to usr/lib/lcrso/*.lcrso files
       - Modified reference to usr/lib/python*/*-packages/cts/*.py
         so that it copies all files; it allows removal of compiled
         bytecode via dh_compress by not failing build due to
         uninstalled files before dh reaches that step
       - Added reference to lib/systemd/system/pacemaker.service
       - Added reference to etc/logrotate.d/pacemaker
     - Added reference in debian/pacemaker-remote.install to
       lib/systemd/system/pacemaker_remote.service
     - Removed references in debian/pacemaker-cli-utils.install
       - Removed reference to crm_uuid
       - Removed reference to crm_uuid.8 manual file
     - Updated references in debian/libcrmcluster4-dev.install
       - Removed reference to plugin.h include
       - Added reference to compatibility.h
     - Reverted change from clearing dependency_libs field in
       all .la files from deleting all .la files; Seems some
       libraries will need the .la files.
     - Updated pacemaker.postinst to compile bytecode for python
       modules
     - Added pacemaker.prerm to remove compiled bytecode for python
       modules
     - Updated rules to override dh_python2 and specify also the
       pacemaker-dev package (i.e. -ppacemaker -ppacemaker-dev)
     - Updated rules to correct search directory for process of
       removing compiled bytecode in dh_compress
    
    Change-Id: Ie792a2f6f6aca053afcb628a92c244bf7455f2fe
    Signed-off-by: Ric
    hard B Winters <rik at mmogp.com>
---
 debian/libcib4-dev.install         |  1 +
 debian/libcrmcluster4-dev.install  |  2 +-
 debian/pacemaker-cli-utils.install |  2 --
 debian/pacemaker-remote.install    |  1 +
 debian/pacemaker.install           | 10 +++------
 debian/pacemaker.postinst          | 14 ++++++++----
 debian/pacemaker.prerm             | 44 ++++++++++++++++++++++++++++++++++++++
 debian/rules                       | 16 ++++++++++----
 8 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/debian/libcib4-dev.install b/debian/libcib4-dev.install
index ab05c14..4bccdb2 100644
--- a/debian/libcib4-dev.install
+++ b/debian/libcib4-dev.install
@@ -1,4 +1,5 @@
 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/libcrmcluster4-dev.install b/debian/libcrmcluster4-dev.install
index b52137b..d869748 100644
--- a/debian/libcrmcluster4-dev.install
+++ b/debian/libcrmcluster4-dev.install
@@ -11,5 +11,5 @@ usr/include/pacemaker/crm/stonith-ng.h
 usr/include/pacemaker/crm/error.h
 usr/include/pacemaker/crm/services.h
 usr/include/pacemaker/crm/cluster.h
-usr/include/pacemaker/crm/cluster/plugin.h 
+usr/include/pacemaker/crm/compatibility.h
 usr/lib/pkgconfig/pacemaker-cluster.pc 
diff --git a/debian/pacemaker-cli-utils.install b/debian/pacemaker-cli-utils.install
index a8288fb..0086613 100644
--- a/debian/pacemaker-cli-utils.install
+++ b/debian/pacemaker-cli-utils.install
@@ -3,7 +3,6 @@ usr/sbin/iso8601
 usr/sbin/crm_attribute
 usr/sbin/crm_report
 usr/sbin/crm_verify
-usr/sbin/crm_uuid
 usr/sbin/crm_standby
 usr/sbin/crm_error
 usr/sbin/crm_resource
@@ -30,7 +29,6 @@ usr/share/man/man8/crm_shadow.8
 usr/share/man/man8/crm_simulate.8
 usr/share/man/man8/crm_standby.8
 usr/share/man/man8/crm_ticket.8
-usr/share/man/man8/crm_uuid.8
 usr/share/man/man8/crm_verify.8
 usr/share/man/man8/crmadmin.8
 usr/share/man/man8/iso8601.8
diff --git a/debian/pacemaker-remote.install b/debian/pacemaker-remote.install
index 2daf9f6..7cc162f 100644
--- a/debian/pacemaker-remote.install
+++ b/debian/pacemaker-remote.install
@@ -1,4 +1,5 @@
 etc/init.d/pacemaker_remote
+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
diff --git a/debian/pacemaker.install b/debian/pacemaker.install
index 9fb89d5..c7ad258 100644
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -1,9 +1,6 @@
 etc/init.d/pacemaker
-usr/lib*/heartbeat/attrd
-usr/lib*/heartbeat/cib
-usr/lib*/heartbeat/crmd
-usr/lib*/heartbeat/pengine
-usr/lib*/heartbeat/stonithd
+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
@@ -24,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/*.py
+usr/lib/python*/*-packages/cts/*
 usr/sbin/attrd_updater
 usr/sbin/fence_legacy
 usr/sbin/fence_pcmk
@@ -58,4 +55,3 @@ usr/share/pacemaker/report.common
 usr/share/pacemaker/upgrade06.xsl
 usr/share/pacemaker/upgrade-1.3.xsl
 usr/share/snmp/mibs/PCMK-MIB.txt
-usr/lib/lcrso/pacemaker.lcrso 
diff --git a/debian/pacemaker.postinst b/debian/pacemaker.postinst
index 0e5c876..5236245 100644
--- a/debian/pacemaker.postinst
+++ b/debian/pacemaker.postinst
@@ -1,9 +1,7 @@
 #!/bin/sh
-#
+# postinst script for pacemaker
 # License: GNU General Public License (GPL)
 #
-# postinst script for heartbeat
-#
 # see: dh_installdeb(1)
 
 set -e
@@ -13,13 +11,21 @@ set -e
 #        * <old-postinst> `abort-upgrade' <new version>
 #        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
 #          <new-version>
+#        * <postinst> `abort-remove'
 #        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
 #          <failed-install-package> <version> `removing'
 #          <conflicting-package> <version>
-#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+# source debconf library
+. /usr/share/debconf/confmodule
 
 case "$1" in
     configure)
+    
+    # Compile bytecode for all of the .py files
+    python -m compileall /usr/lib/python2.7/dist-packages/cts
 
   	addgroup --system haclient
         adduser --system hacluster --ingroup haclient --home /var/lib/heartbeat
diff --git a/debian/pacemaker.prerm b/debian/pacemaker.prerm
new file mode 100644
index 0000000..60367d5
--- /dev/null
+++ b/debian/pacemaker.prerm
@@ -0,0 +1,44 @@
+#!/bin/sh
+# prerm script for pacemaker
+# License: GNU General Public License (GPL)
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+case "$1" in
+  remove|upgrade|deconfigure)
+    # remove compiled bytecode
+    rm -R /usr/lib/python2.7/dist-packages/cst/*.pyc 2>/dev/null >/dev/null || true
+  ;;
+
+  failed-upgrade)
+  ;;
+
+  *)
+    echo "prerm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+  
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 493ac06..866250f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,9 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	./configure --prefix=/usr --libexecdir=/usr/lib/ --localstatedir=/var \
 	    --sysconfdir=/etc --libdir=/usr/lib --docdir=/usr/share/doc/pacemaker \
-	    --disable-fatal-warnings --enable-glib-malloc \
+	    --disable-fatal-warnings --enable-dependency-tracking --enable-glib-malloc \
 	    --with-snmp --with-esmtp --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \
-	    --with-corosync --with-cs-quorum
+	    --with-corosync --with-cs-quorum --with-pkg-config
 
 DOC = debian/tmp/usr/share/doc/pacemaker
 
@@ -35,8 +35,10 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	dh_auto_install
-# remove .la files
-	rm -v debian/tmp/usr/lib/lib*.la
+# clear dependency_libs field in .la files
+	for file in `find debian/tmp -name '*.la'`; do \
+		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+	done
 # install default file
 	mkdir -p $(CURDIR)/debian/pacemaker/etc/default
 	cp -ax $(CURDIR)/mcp/pacemaker.sysconfig $(CURDIR)/debian/pacemaker/etc/default/pacemaker
@@ -52,7 +54,13 @@ override_dh_installchangelogs:
 override_dh_strip:
 	dh_strip --dbg-package=pacemaker-dbg
 	
+override_dh_python2:
+	dh_python2 -ppacemaker -ppacemaker-dev
+	
 override_dh_compress:
+# remove python compiled bytecode and object files
+	find $(CURDIR)/debian/pacemaker/ -name '*.pyo' | xargs rm -rf
+	find $(CURDIR)/debian/pacemaker/ -name '*.pyc' | xargs rm -rf
 # make non-scripts non-executable
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/crm-transitional.dtd
 	-chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/resources-1.0.rng

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

