# HG changeset patch
# User Ante Karamatic <[email protected]>
# Date 1267739654 0
# Branch sid
# Node ID 28411d486cf0e07904d306ef21c40db32751f628
# Parent 36481c1553a6892939e7180c70ffdc436b449e52
Split files into three packages; binary (pacemaker), libraries (libpacemaker)
and development (libpacemaker-dev)
diff -r 36481c1553a6 -r 28411d486cf0 debian/control
--- a/debian/control Thu Mar 04 21:42:42 2010 +0000
+++ b/debian/control Thu Mar 04 21:54:14 2010 +0000
@@ -24,13 +24,12 @@
.
It supports both the Heartbeat and Corosync cluster stacks.
-Package: pacemaker-dev
-Section: devel
+Package: libpacemaker
+Section: libs
Architecture: any
-Replaces: pacemaker-heartbeat-dev, pacemaker-openais-dev
-Conflicts: pacemaker-heartbeat-dev, pacemaker-openais-dev
-Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${source:Version}),
python, libcorosync-dev (>= 1.1.2+svn20091102), libheartbeat2-dev (>= 3.0)
-XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pacemaker ( << ${binary:Version})
+Replaces: pacemaker ( << ${binary:Version})
Description: HA cluster resource manager (development files)
High-Availability cluster resource manager for Heartbeat.
.
@@ -39,3 +38,18 @@
failures.
.
This package contains pacemaker's development files.
+
+Package: libpacemaker-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpacemaker (= ${source:Version})
+Conflicts: pacemaker-dev ( << ${binary:Version})
+Replaces: pacemaker-dev ( << ${binary:Version})
+Description: HA cluster resource manager (development files)
+ High-Availability cluster resource manager for Heartbeat.
+ .
+ Pacemaker supports a very sophisticated dependency model for
+ n-node clusters and can respond to node and resource-level
+ failures.
+ .
+ This package contains pacemaker's development files.
diff -r 36481c1553a6 -r 28411d486cf0 debian/pacemaker.install
--- a/debian/pacemaker.install Thu Mar 04 21:42:42 2010 +0000
+++ b/debian/pacemaker.install Thu Mar 04 21:54:14 2010 +0000
@@ -1,90 +1,22 @@
-usr/lib*/libcrmcommon.so.2.0.0
-usr/lib*/libcrmcluster.so.1.0.0
-usr/lib*/libpe_rules.so.2.0.0
-usr/lib*/libpe_status.so.2.0.0
-usr/lib*/libtransitioner.so.1.0.0
-usr/lib*/libcib.so.1.0.1
-usr/lib*/libstonithd.so.0.0.0
-usr/lib*/heartbeat/plugins/RAExec/stonith.so
-usr/lib*/heartbeat/plugins/RAExec/stonith.la
-usr/lib*/heartbeat/plugins/RAExec/stonith.a
-usr/lib*/heartbeat/pengine
+usr/sbin/*
+usr/share/pacemaker/*
+usr/share/snmp/*
+usr/lib*/heartbeat/plugins/*/*.so
+usr/lib*/heartbeat/atest
+usr/lib*/heartbeat/attrd
usr/lib*/heartbeat/cib
usr/lib*/heartbeat/cibmon
usr/lib*/heartbeat/crmd
-usr/lib*/heartbeat/atest
-usr/lib*/heartbeat/stonithd
-usr/lib*/heartbeat/stonithdtest/apitest
-usr/lib*/heartbeat/attrd
+usr/lib*/heartbeat/*.py
+usr/lib*/heartbeat/*.sh
+usr/lib*/heartbeat/pengine
usr/lib*/heartbeat/pingd
-usr/lib*/heartbeat/crm_primitive.py
-usr/lib*/heartbeat/hb2openais-helper.py
-usr/lib*/heartbeat/haresources2cib.py
-usr/lib*/heartbeat/hb2openais.sh
-usr/lib*/service_crm.so
-usr/lib*/libpengine.so.3.0.0
-usr/lib/ocf/resource.d/pacemaker/ClusterMon
-usr/lib/ocf/resource.d/pacemaker/Dummy
-usr/lib/ocf/resource.d/pacemaker/Stateful
-usr/lib/ocf/resource.d/pacemaker/SysInfo
-usr/lib/ocf/resource.d/pacemaker/pingd
-usr/lib/ocf/resource.d/pacemaker/controld
+usr/lib*/heartbeat/stonith*
+usr/lib/ocf/*
usr/lib/lcrso/pacemaker.lcrso
-usr/sbin/ptest
-usr/sbin/cibpipe
-usr/sbin/crmadmin
-usr/sbin/cibadmin
-usr/sbin/crm_node
-usr/sbin/crm_diff
-usr/sbin/crm_mon
-usr/sbin/iso8601
-usr/sbin/crm_master
-usr/sbin/crm_standby
-usr/sbin/crm_failcount
-usr/sbin/crm_attribute
-usr/sbin/crm_resource
-usr/sbin/crm_verify
-usr/sbin/crm_uuid
-usr/sbin/crm_shadow
-usr/sbin/attrd_updater
-usr/sbin/crm
-usr/share/pacemaker/stonithdtest/STONITHDBasicSanityCheck
-usr/share/pacemaker/crm.dtd
-usr/share/pacemaker/pacemaker.rng
-usr/share/pacemaker/pacemaker-1.0.rng
-usr/share/pacemaker/constraints-1.0.rng
-usr/share/pacemaker/nvset-1.0.rng
-usr/share/pacemaker/resources-1.0.rng
-usr/share/pacemaker/rule-1.0.rng
-usr/share/pacemaker/score.rng
-usr/share/pacemaker/upgrade06.xsl
-usr/share/pacemaker/crm-transitional.dtd
-usr/share/doc/pacemaker/*
-var/lib*/heartbeat/lrm/
-var/lib*/heartbeat/fencing/
-var/lib*/heartbeat/crm/
-usr/lib*/libpengine.so.3
-usr/lib*/libstonithd.so.0
-usr/lib*/libcib.so.1
-usr/lib*/libtransitioner.so.1
-usr/lib*/libpe_status.so.2
-usr/lib*/libpe_rules.so.2
-usr/lib*/libcrmcluster.so.1
-usr/lib*/libcrmcommon.so.2
-usr/lib/ocf/resource.d/pacemaker/ping
-usr/lib/ocf/resource.d/pacemaker/SystemHealth
-usr/share/pacemaker/templates/apache
-usr/share/pacemaker/templates/virtual-ip
-usr/share/pacemaker/templates/filesystem
-usr/share/pacemaker/templates/ocfs2
-usr/share/pacemaker/templates/clvm
-usr/share/snmp/mibs/PCMK-MIB.txt
-usr/lib/ocf/resource.d/pacemaker/o2cb
-usr/lib/ocf/resource.d/pacemaker/HealthSMART
-usr/lib/ocf/resource.d/pacemaker/HealthCPU
-usr/share/pacemaker/templates/gfs2
-usr/share/pacemaker/templates/gfs2-base
-usr/share/pacemaker/crm_cli.txt
+usr/sbin/*
+usr/share/pacemaker/*
+usr/share/snmp/*
+var/lib/*
usr/lib/python2.*/*-packages/crm/*.py
-usr/share/man/man8/crm_resource.8
-usr/share/man/man8/cibadmin.8
+usr/share/man/*
diff -r 36481c1553a6 -r 28411d486cf0 debian/rules
--- a/debian/rules Thu Mar 04 21:42:42 2010 +0000
+++ b/debian/rules Thu Mar 04 21:54:14 2010 +0000
@@ -101,37 +101,46 @@
dh_testroot
dh_installdirs
$(MAKE) install DESTDIR=`pwd`/debian/tmp docdir=/usr/share/doc/pacemaker
+
+ # make non-scripts non-executable
+ find debian/tmp -name '*.xml' -type f -print0 | xargs -0 chmod a-x
+ find debian/tmp -name '*.xsl' -type f -print0 | xargs -0 chmod a-x
+ find debian/tmp -name '*.rng' -type f -print0 | xargs -0 chmod a-x
+ find debian/tmp -name '*.dtd' -type f -print0 | xargs -0 chmod a-x
+
+ # Dont package static libs or compiled python
+ find debian/tmp -name '*.la' -type f -print0 | xargs -0 rm -f
+ find debian/tmp -name '*.pyc' -type f -print0 | xargs -0 rm -f
+ find debian/tmp -name '*.pyo' -type f -print0 | xargs -0 rm -f
+
+ # Do not package these either
+ rm debian/tmp/usr/lib/heartbeat/crm_primitive.py
+ rm debian/tmp/usr/lib/service_crm.so
+
+ # delete redundant COPYING files
+ rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LGPL
+ rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LIB
+ rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING
+
+ # Scripts that need should be executable
+ chmod a+x debian/tmp/usr/lib/heartbeat/hb2openais-helper.py
+ chmod a+x debian/tmp/usr/share/pacemaker/tests/cts/CTSlab.py
+ chmod a+x debian/tmp/usr/share/pacemaker/tests/cts/OCFIPraTest.py
+ chmod a+x debian/tmp/usr/share/pacemaker/tests/cts/extracttests.py
+ chmod a+x
debian/tmp/usr/share/pacemaker/tests/pengine/regression.core.sh
+
+ # create special directory
+ mkdir -p `pwd`/debian/tmp/var/lib/pengine
+ mkdir -p `pwd`/debian/tmp/var/lib/heartbeat/pengine
+
binary-indep: build install
binary-arch: build install
dh_testdir -a
dh_testroot -a
-
- dh_install --sourcedir=debian/tmp --fail-missing
- # 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
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/nvset-1.0.rng
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/upgrade06.xsl
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/constraints-1.0.rng
- -chmod -x
`pwd`/debian/pacemaker/usr/share/pacemaker/shelltest/testcases/xmlonly.sh
- -chmod -x
`pwd`/debian/pacemaker/usr/share/pacemaker/shelltest/testcases/confbasic-xml.filter
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/pacemaker.rng
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/pacemaker-1.0.rng
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/score.rng
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/crm.dtd
- -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/rule-1.0.rng
-
- # delete redundant COPYING files
- rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LGPL
- rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LIB
- rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING
-
- # create special directory
- mkdir -p `pwd`/debian/pacemaker/var/lib/pengine
- mkdir -p `pwd`/debian/pacemaker/var/lib/heartbeat/pengine
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installdebconf -a
dh_installdocs -a
@@ -142,10 +151,8 @@
dh_installchangelogs
dh_link -a
dh_strip -a
-
# make the pacemaker shlib non-executable
chmod -x `pwd`/debian/pacemaker/usr/lib/lcrso/pacemaker.lcrso
-
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a -V
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
