--- pacemaker-mgmt-2.1.2.orig/watch +++ pacemaker-mgmt-2.1.2/watch @@ -0,0 +1,2 @@ +version=3 +http://githubredir.debian.net/github/ClusterLabs/pacemaker-mgmt/ (.*).tar.gz --- pacemaker-mgmt-2.1.2.orig/debian/pacemaker-mgmt.install +++ pacemaker-mgmt-2.1.2/debian/pacemaker-mgmt.install @@ -1,13 +1,12 @@ etc/pam.d/hbmgmtd -usr/lib/libhbmgmt.so.* -usr/lib/libhbmgmtclient.so.* -usr/lib/libhbmgmtcommon.so.* -usr/lib/libhbmgmttls.so.* -usr/lib/heartbeat/mgmtd -usr/lib/heartbeat/mgmtdtest -usr/lib/heartbeat/hbagent -usr/lib/heartbeat/SNMPAgentSanityCheck +usr/lib*/libhbmgmt.so.* +usr/lib*/libhbmgmtclient.so.* +usr/lib*/libhbmgmtcommon.so.* +usr/lib*/libhbmgmttls.so.* +usr/lib*/heartbeat/mgmtd +usr/lib*/heartbeat/mgmtdtest +usr/lib*/heartbeat/hbagent usr/share/snmp/mibs/LINUX-HA-MIB.txt -usr/share/doc/pacemaker-mgmt usr/share/doc/pacemaker-mgmt/README.hbagent usr/share/doc/pacemaker-mgmt/README.hbagentv2 +usr/lib/heartbeat/SNMPAgentSanityCheck --- pacemaker-mgmt-2.1.2.orig/debian/copyright +++ pacemaker-mgmt-2.1.2/debian/copyright @@ -5,16 +5,13 @@ http://hg.clusterlabs.org/pacemaker/pygui/ Upstream Authors: -NOTE: The work of everyone on this project is dearly appreciated. If you - are not listed here but should be, please notify us! - - Gao,Yan + Yan Gao (C) 2008 - 2010 The following people have kindly helped with pacemaker-mgmt development by providing code, documentation or testing, or fixes: Andrew Beekhof - Lars Marowsky-Brée + Lars Marowsky-Brée Xinwei Hu The GUI was first developed in 2005 by: @@ -26,24 +23,86 @@ Keisuke MORI SNMP subagent v2 support -Contributors, ordered by last name: - - -Code for the following pieces borrowed from code by: - +NOTE: The work of everyone on this project is dearly appreciated. If you + are not listed here but should be, please notify us! All binaries provided by this package are GNU GPL or GNU LGPL. Some source files are under the BSD licence or in the public domain, as annotated by those files. All source files without a specific licence statement are available licenced under the GNU GPL. -A copy of the GNU GPL licence is available on Debian systems at -/usr/share/common-licenses/GPL +Upstream Authors and copyright holders for Heartbeat prior to version +3, whose code might still be partially present ((c) 1998-2009): -A copy of the GNU LGPL licence is available on Debian systems at -/usr/share/common-licenses/LGPL + Alan Robertson + Andreas Mock + Andrew Beekhof + Dave Blaschke + David Lee + Dejan Muhamedagic + Hannes Eder + Huang Zhen + Junko Ikeda + Lars Marowsky-Bree + Martin Bene + Phil Carns + Satomi Taniguchi + Sean Reifschneider + Sebastian Reitenbach + Serge Dubrouski + Simon Horman + Xinwei Hu + +Code for the following pieces borrowed from code by: + Tom Vogt (udp code) + yuri volobuev (send_arp.c) + 'Network UPS Tools' by Russell Kroll + homepage: http://www.exploits.org/nut/ + (Andreas Piesk borrowed code for APCSmart support) + David C. Teigland + wrote original meatware support for GFS stomith + salz@pebbles.bbn.com - replacement scandir function + Internet Software Consortium (bind) - replacement inet_pton() + function + +NOTE: The work of everyone on this project is dearly appreciated. If you + are not listed here but should be, please notify us! -A copy of the BSD licence is available on Debian systems at -/usr/share/common-licenses/BSD +-------------------- + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +-------------------- + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. --- pacemaker-mgmt-2.1.2.orig/debian/changelog +++ pacemaker-mgmt-2.1.2/debian/changelog @@ -1,59 +1,82 @@ -pacemaker-mgmt (1.99.2-1) unstable; urgency=medium - * Update source tarball to revision: 0cc24125502d tip - * Statistics: - Changesets: 49 - Diff: 13 files changed, 4164 insertions(+), 2759 deletions(-) +pacemaker-mgmt (2.1.2-0ubuntu2) saucy; urgency=low + + * Revert the original debian dir. + + -- Andres Rodriguez Mon, 07 Oct 2013 13:03:22 -0400 + +pacemaker-mgmt (2.1.2-0ubuntu1) saucy; urgency=low + + * New upstream release (LP: #1236414) + * debian/control: Build-Dep on quilt. + * debian/patches: + - fix_ftbfs.patch: Add to fix FTBFS due to missing argument. + - {r1163,r1165}.patch: Drop. Merged upstream + - implicit-declaration.patch: Updated. + - fix-haclient.py.in-pyxml.patch. Dropped. Merged upstream + * debian/watch: Add + + -- Andres Rodriguez Mon, 07 Oct 2013 09:51:51 -0400 + +pacemaker-mgmt (2.0.0+hg1141-2.3) unstable; urgency=low + + * Non-maintainer upload. + * Convert to dh_python2 (Closes: #616932). + + -- Luca Falavigna Sun, 07 Jul 2013 11:08:03 +0200 + +pacemaker-mgmt (2.0.0+hg1141-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Rebuild for libpe-status transition (Closes: #651630) + * Drop d/p/undo-argument-change.patch and bump build-dependency of + pacemaker-dev to 1.1 (Closes: #640340) + * Add debian/patches/r1163.patch, debian/patches/r1165.patch to fix FTBFS + (taken from upstream) + * Add debian/patches/implicit-declaration.patch: Fix further FTBFS + (Thanks to Ilya Barygin ) + + -- Laurent Bigonville Tue, 10 Jul 2012 15:55:14 +0200 + +pacemaker-mgmt (2.0.0+hg1141-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Empty dependency_libs in libtool la file(s). + http://wiki.debian.org/ReleaseGoals/LAFileRemoval Closes: #622128 + + -- Andreas Metzler Sat, 18 Jun 2011 13:33:08 +0200 + +pacemaker-mgmt (2.0.0+hg1141-2) unstable; urgency=low + + * Add myself as an uploader + * Build depends on libsnmp-dev instead of libsnmp10-dev | libsnmp-dev + as libsnmp10-dev doesn't exist + (Closes: #592498) + * Make reference to pacemaker in the long description. + (Closes: #592452) + * Add build dependency on libxslt1-dev + + -- Simon Horman Mon, 23 Aug 2010 16:56:28 +0900 + +pacemaker-mgmt (2.0.0+hg1141-1) unstable; urgency=low + + * First official releae of this package (Closes: #531953) + * New upstream release and general cleanup of this package + + -- Martin Loschwitz Thu, 05 Aug 2010 14:54:48 +0000 + +pacemaker-mgmt (1.99.2+hg20091103-1) unstable; urgency=low + + * New upstream release + * Unify package build system + + -- Martin Loschwitz Tue, 03 Nov 2009 10:29:35 +0000 - * Changes since pacemaker-mgmt-1.99.1 - + Dev: haclient: Add "About" - + Dev: haclient: Add accelerators - + Dev: haclient: Add Japanese translation - + Dev: haclient: Improve thread synchronization - + Dev: haclient: Provide the progress pulse when generating the transition information - + Dev: haclient: Set default response for dialogs - + Dev: haclient: Show progress pulse when generating shadow diff - + Dev: haclient: Support viewing/editing/importing/exporting the whole cib xml or the configuration section - + Dev: mgmt: Improve the performance and the user interface of "Transition Information" - + Dev: mgmt: Provide more details of nodes - + Dev: po: Add the translation of the license - + Dev: po: Update pot and po - + High: lib: Fix huge memory leak due to the behavior of swig - + Low: Build: Add libgv-python dependency for Debian - + Low: haclient: Avoid an error if there's no pengine input exists - + Low: haclient: Avoid the possible key error of Manager.get_node_config() - + Low: haclient: Concatenate error messages with the proper type - + Low: haclient: Consider the possibility of IOError when creating temporary files - + Low: haclient: Determine labels's width and align the following widgets properly - + Low: haclient: Do not continue updating if the client is disconnected - + Low: haclient: Fill the limited number of transitions into the drop-down list - + Low: haclient: Make python-lxml optional - + Low: haclient: Make sure the variable is assigned before referenced - + Low: haclient: Make the marks of meta_attributes's default values consistent - + Low: haclient: Set the default focus on "password" entry in the login dialog - + Low: haclient: Set widgets's initial sizes to appropriate values for low resolutions - + Low: mgmt: Log version details - + Low: mgmt: Show its unclean resources if a node is uncleanly offline - + Low: mgmtd: (LF#2142) Avoid redefinitions - + Low: mgmtd: Add and adopt a new macro gen_msg_from_fstream() - + Low: mgmtd: Adopt append_str() macro in on_get_pe_inputs() - + Low: mgmtd: Can be compiled and work against pacemaker < 1.0.3 - + Low: mgmtd: Optimize for tranferring schemas - + Low: mgmtd: Optimize message generating for transferring cluster reports - + Low: mgmtd: Optimize message generating for transferring crm DTD - + Low: mgmtd: Optimize message generating for transferring transition information - + Low: mgmtd: Use the variable instead of the macro directly - + Low: snmp_subagent: Allow specifying the cache timeout through the argument if not SUPPORT_HEARTBEAT - + Medium: haclient: Avoid hanging when getting or parsing CIB/schemas fail - + Medium: haclient: Do manager.update() via gobject timeout - + Medium: haclient: Increase the interval of gobject timeout to avoid consuming excessive CPU when update fails - + Medium: haclient: Remove the graph when it's no longer needed - + Medium: haclient: Set gobject timeout for manager.update() in the consistent way - + Medium: haclient: Update crm metadata via gobject timeout (Optimize connecting time) - + Medium: mgmt: Display the proper status of resources on the node which is uncleanly offline - + Medium: mgmtd: Destroy the crmd channel in the end of on_cleanup_rsc() - + Medium: mgmtd: Fix memory leaks +pacemaker-mgmt-openais (1.99.1+hg20090604-1) experimental; urgency=low + + * First Build of these packages; work based on the work done + by Yan Gao. Thanks for this. - -- Gao,Yan Mon, 29 Jun 2009 14:05:12 +0800 + -- Martin Loschwitz Thu, 04 Jun 2009 17:31:00 +0200 pacemaker-mgmt (1.99.1-1) unstable; urgency=medium * Update source tarball to revision: pacemaker-mgmt-1.99.1 (484883b2efe8+ tip) @@ -84,7 +107,7 @@ + Medium: mgmt: Optimize viewing transition information + Medium: mgmtd: Avoid segmentation faults caused by missing the required user or group - -- Gao,Yan Mon, 27 Apr 2009 11:45:06 +0800 + -- Yan Gao Mon, 27 Apr 2009 11:45:06 +0800 pacemaker-mgmt (1.99.0-3) unstable; urgency=medium * Update source tarball to revision: f07b59e49f79 tip @@ -99,7 +122,7 @@ + Low: haclient: Fix file filters for saving transition graph + Medium: haclient: Get and cache CRM metadata in advance - -- Gao,Yan Fri, 20 Mar 2009 02:00:41 +0800 + -- Yan Gao Fri, 20 Mar 2009 02:00:41 +0800 pacemaker-mgmt (1.99.0-2) unstable; urgency=medium * Update source tarball to revision: 19e662ce6447+ tip @@ -114,7 +137,7 @@ + Low: haclient: Hide optional attributes for "rsc_order" in simple mode + Medium: Build: Fix compilation - -- Gao,Yan Sat, 14 Mar 2009 10:05:12 +0800 + -- Yan Gao Sat, 14 Mar 2009 10:05:12 +0800 pacemaker-mgmt (1.99.0-1) unstable; urgency=medium * Update source tarball to pacemaker-mgmt-1.99.0 (revision: 286f917a201f+ tip) @@ -125,7 +148,7 @@ * Changes since pacemaker-pygui-1.4 + Complete rewrite - -- Gao,Yan Mon, 02 Mar 2009 16:10:14 +0800 + -- Yan Gao Mon, 02 Mar 2009 16:10:14 +0800 pygui (2.0-1) stable; urgency=medium * Update source tarball to revision: 1485861613b7 tip --- pacemaker-mgmt-2.1.2.orig/debian/watch +++ pacemaker-mgmt-2.1.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://githubredir.debian.net/github/ClusterLabs/pacemaker-mgmt/ (.*).tar.gz --- pacemaker-mgmt-2.1.2.orig/debian/pacemaker-mgmt.lintian-overrides +++ pacemaker-mgmt-2.1.2/debian/pacemaker-mgmt.lintian-overrides @@ -0,0 +1 @@ +pacemaker-mgmt binary: package-name-doesnt-match-sonames libhbmgmt0 libhbmgmtclient0 libhbmgmtcommon0 libhbmgmttls0 --- pacemaker-mgmt-2.1.2.orig/debian/pacemaker-mgmt.files +++ pacemaker-mgmt-2.1.2/debian/pacemaker-mgmt.files @@ -10,7 +10,7 @@ usr/lib/heartbeat/mgmtd usr/lib/heartbeat/mgmtdtest usr/lib/heartbeat/hbagent -usr/lib/heartbeat/SNMPAgentSanityCheck +usr/share/heartbeat/SNMPAgentSanityCheck usr/share/snmp/mibs/LINUX-HA-MIB.txt usr/share/doc/pacemaker-mgmt/README.hbagent usr/share/doc/pacemaker-mgmt/README.hbagentv2 --- pacemaker-mgmt-2.1.2.orig/debian/pacemaker-mgmt-client.lintian-overrides +++ pacemaker-mgmt-2.1.2/debian/pacemaker-mgmt-client.lintian-overrides @@ -0,0 +1,2 @@ +pacemaker-mgmt-client binary: binary-without-manpage usr/bin/crm_gui +pacemaker-mgmt-client binary: binary-without-manpage usr/bin/hb_gui --- pacemaker-mgmt-2.1.2.orig/debian/pacemaker-mgmt-dev.install +++ pacemaker-mgmt-2.1.2/debian/pacemaker-mgmt-dev.install @@ -4,7 +4,9 @@ usr/include/heartbeat/mgmt/mgmt.h usr/include/heartbeat/mgmt/mgmt_tls.h usr/include/heartbeat/mgmt_config.h -usr/lib/libhbmgmt.so -usr/lib/libhbmgmttls.so -usr/lib/libhbmgmtcommon.so -usr/lib/libhbmgmtclient.so +usr/lib*/libhbmgmt.so +usr/lib*/libhbmgmttls.so +usr/lib*/libhbmgmtcommon.so +usr/lib*/libhbmgmtclient.so +usr/lib*/*.a +usr/lib*/*.la --- pacemaker-mgmt-2.1.2.orig/debian/rules +++ pacemaker-mgmt-2.1.2/debian/rules @@ -6,12 +6,15 @@ #Thanks to Paolo Molaro and heartbeat_0.4.6-2.diff # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 + +# include dpatch stuff +include /usr/share/quilt/quilt.make cfg:=--prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \ - --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \ - --disable-fatal-warnings --enable-glib-malloc \ - --mandir=/usr/share/man + --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \ + --with-lcrso-dir=/usr/lib/lcrso --disable-fatal-warnings \ + --enable-glib-malloc --mandir=/usr/share/man # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -31,21 +34,16 @@ DTMP:=`pwd`/debian/tmp RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }') UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/') +ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +LIBDIR := /usr/lib -patch: - override_version=$(RELEASE) sh debian/apply - -unpatch: - override_version=$(RELEASE) sh debian/apply $(UPSTREAM) - - -build: checkbuild build-stamp +build: patch build-stamp build-stamp: dh_testdir # Allow debian packages to also be built directly from Hg archives # Official debian packages are built from dist tarballs - test ! -e ./configure || ./configure $(cfg) - test -e ./configure || ./bootstrap $(cfg) + test ! -e ./configure || ./configure $(cfg) --libdir=$(LIBDIR) + test -e ./configure || ./bootstrap $(cfg) --libdir=$(LIBDIR) $(MAKE) touch build-stamp @@ -53,18 +51,20 @@ dh_testdir dh_testroot # Add here commands to clean up after the build process. - -$(MAKE) clean MAKE=make - -$(MAKE) distclean MAKE=make + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean rm -f tools/ccdv -find . -name '*.py[co]' | xargs rm -f dh_clean build-stamp install-stamp rm -f debian/init debian/*.debhelper debian/*.substvars config.log - rm -r -f debian/pacemaker-mgmt debian/pacemaker-mgmt-client \ + rm -rf debian/pacemaker-mgmt debian/pacemaker-mgmt-client \ debian/pacemaker-mgmt-dev debian/tmp # Zero autoconf foo rm -f config.status libltdl/config.log libltdl/config.status + # run the unpatch target + $(MAKE) -f debian/rules unpatch install: build install-stamp install-stamp: @@ -75,10 +75,13 @@ $(MAKE) install DESTDIR=$(DTMP) \ MAKE=make \ docdir=/usr/share/doc/pacemaker-mgmt + find $(DTMP)/usr/lib -name "*.la" -exec \ + sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} + dh_installdirs dh_install --source=$(DTMP) --list-missing - #dh_movefiles --source=debian/tmp + + rm -rf $(CURDIR)/debian/pacemaker-mgmt/usr/share/heartbeat/ binary-indep: build install @@ -88,36 +91,23 @@ dh_installdebconf -a dh_installdocs -a dh_installexamples -a -# dh_installmenu -a -# dh_installemacsen -a -# dh_installpam -a dh_installinit -a -n -u 'defaults 20 32' -# dh_installcron -a dh_installman -a -# dh_installinfo -a -# dh_undocumented -a dh_installchangelogs + dh_lintian dh_link -a dh_strip -a dh_compress -a dh_fixperms -a --exclude usr/bin/cl_status -# dh_suidregister -a - dh_makeshlibs -a -V + dh_makeshlibs -a -V -Npacemaker-mgmt-client dh_installdeb -a dh_perl -a - dh_pycentral -a + dh_python2 -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch - @echo "All unpackaged files follow:" - -cd $(DTMP) && find . \! -type d | egrep -v \\\.l?a - -checkbuild: - chmod u+x ./debian/dpkg-checkbuild - ./debian/dpkg-checkbuild debian/control -.PHONY: build clean binary binary-indep binary-arch install checkbuild \ - patch unpatch +.PHONY: build clean binary binary-indep binary-arch install --- pacemaker-mgmt-2.1.2.orig/debian/pacemaker-mgmt-client.install +++ pacemaker-mgmt-2.1.2/debian/pacemaker-mgmt-client.install @@ -1,9 +1,9 @@ usr/bin/crm_gui usr/bin/hb_gui -usr/lib/heartbeat-gui -usr/lib/heartbeat-gui/_pymgmt.so* -usr/lib/heartbeat-gui/haclient.py -usr/lib/heartbeat-gui/pymgmt.py +usr/lib*/heartbeat-gui +usr/lib*/heartbeat-gui/_pymgmt.so* +usr/lib*/heartbeat-gui/haclient.py +usr/lib*/heartbeat-gui/pymgmt.py usr/share/applications/crm_gui.desktop usr/share/heartbeat-gui usr/share/heartbeat-gui/*.png --- pacemaker-mgmt-2.1.2.orig/debian/control +++ pacemaker-mgmt-2.1.2/debian/control @@ -1,10 +1,12 @@ Source: pacemaker-mgmt Section: admin Priority: optional -Maintainer: Gao,Yan -Build-Depends: debhelper (>= 5.0.37.2), libsnmp10-dev | libsnmp-dev, libglib2.0-dev, net-tools, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, pacemaker-dev, heartbeat-dev, intltool -Standards-Version: 3.7.3 -XS-Python-Version: current +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers +Uploaders: Martin Loschwitz , Simon Horman +Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, net-tools, python (>= 2.6.6-3~), libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libltdl3-dev, swig, libgnutls-dev, python-dev (>= 2.6.6-3~), libpam0g-dev, libncurses5-dev, intltool, pacemaker-dev (>= 1.1), quilt (>=0.46-7~), libxslt1-dev +Standards-Version: 3.9.1 +Homepage: http://www.clusterlabs.org Package: pacemaker-mgmt Section: admin @@ -12,11 +14,12 @@ Architecture: any Conflicts: pacemaker-pygui Replaces: pacemaker-pygui -Depends: pacemaker, heartbeat (>= 2.99), snmpd, libxml2-utils, libpam-runtime (>= 0.76-14), findutils -XB-Python-Version: ${python:Versions} -Description: Pacemaker Management Tools - A client/server GUI and a SNMP subagent for configuring, managing and monitoring - the Pacemaker High-Availability cluster resource manager +Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker, snmpd +Description: Pacemaker Management Tools -- server + This package contains the server part of pacemaker gui, a + graphical tool to manage Pacemaker-controlled Linux-HA clusters. + . + Pacemaker is provided by the pacemaker package Package: pacemaker-mgmt-client Section: admin @@ -24,13 +27,12 @@ Architecture: any Conflicts: pacemaker-pygui Replaces: pacemaker-pygui -Depends: ${python:Depends}, python-xml, python-gtk2, python-lxml, libgv-python -XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2, python-lxml Description: Pacemaker Management Tools - A client/server GUI and a SNMP subagent for configuring, managing and monitoring - the Pacemaker High-Availability cluster resource manager + This package contains the client part of pacemaker gui, a + graphical tool to manage Pacemaker-controlled Linux-HA clusters. . - This package contains the front-end of GUI + Pacemaker is provided by the pacemaker package Package: pacemaker-mgmt-dev Section: devel @@ -38,10 +40,9 @@ Architecture: any Conflicts: pacemaker-pygui-dev Replaces: pacemaker-pygui-dev -Depends: pacemaker-mgmt (= ${binary:Version}) -XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker-mgmt (= ${binary:Version}) Description: Pacemaker Management Tools - A client/server GUI and a SNMP subagent for configuring, managing and monitoring - the Pacemaker High-Availability cluster resource manager + This package contains the development files of pacemaker gui, + a graphical tool to manage Pacemaker-controlled Linux-HA clusters. . - This package contains development files + Pacemaker is provided by the pacemaker package --- pacemaker-mgmt-2.1.2.orig/debian/compat +++ pacemaker-mgmt-2.1.2/debian/compat @@ -1 +1 @@ -4 +5 --- pacemaker-mgmt-2.1.2.orig/debian/patches/fix_ftbfs.patch +++ pacemaker-mgmt-2.1.2/debian/patches/fix_ftbfs.patch @@ -0,0 +1,13 @@ +Index: pacemaker-mgmt-2.1.2/mgmt/daemon/mgmt_crm.c +=================================================================== +--- pacemaker-mgmt-2.1.2.orig/mgmt/daemon/mgmt_crm.c 2013-03-03 20:55:37.000000000 -0500 ++++ pacemaker-mgmt-2.1.2/mgmt/daemon/mgmt_crm.c 2013-10-07 10:08:26.235569361 -0400 +@@ -1602,7 +1602,7 @@ + delete_lrm_rsc(crmd_channel, argv[1], argv[2]); + refresh_lrm(crmd_channel, NULL); + +- rc = query_node_uuid(cib_conn, argv[1], &dest_node); ++ rc = query_node_uuid(cib_conn, argv[1], &dest_node, NULL); + if (rc != 0) { + mgmt_log(LOG_WARNING, "Could not map uname=%s to a UUID: %s\n", + argv[1], pcmk_strerror(rc)); --- pacemaker-mgmt-2.1.2.orig/debian/patches/series +++ pacemaker-mgmt-2.1.2/debian/patches/series @@ -0,0 +1,3 @@ +fix-desktop-icon-file.patch +implicit-declaration.patch +fix_ftbfs.patch --- pacemaker-mgmt-2.1.2.orig/debian/patches/implicit-declaration.patch +++ pacemaker-mgmt-2.1.2/debian/patches/implicit-declaration.patch @@ -0,0 +1,40 @@ +Description: fix build problem with is_heartbeat_cluster() function + Unconditionally include header where this function is declared. + Unconditionally link with necessary library. This is similar to change in + upstream revision 1163. +Author: Ilya Barygin + +--- pacemaker-mgmt-2.1.2.orig/snmp_subagent/Makefile.am 2013-10-07 11:10:21.265335325 -0400 ++++ pacemaker-mgmt-2.1.2/snmp_subagent/Makefile.am 2013-10-07 11:10:21.261335328 -0400 +@@ -77,9 +77,7 @@ + -lplumb -lcrmcommon -lcib -lpe_status \ + $(CLUSTERLIBS) $(CURSESLIBS) $(GLIBLIB) + +-if !BUILD_HEARTBEAT_SUPPORT + hbagent_LDADD += -lcrmcluster +-endif + hbagent_LDFLAGS = @SNMPAGENTLIB@ + + # test cases +--- pacemaker-mgmt-2.1.2.orig/snmp_subagent/hbagent.c 2013-10-07 11:10:21.265335325 -0400 ++++ pacemaker-mgmt-2.1.2/snmp_subagent/hbagent.c 2013-10-07 11:10:49.065312632 -0400 +@@ -39,13 +39,12 @@ + #if SUPPORT_HEARTBEAT + #include "hb_api.h" + #include "heartbeat.h" +-#else +-# if HAVE_PACEMAKER_CRM_COMMON_CLUSTER_H +-# include +-# endif +-# if HAVE_PACEMAKER_CRM_CLUSTER_H +-# include +-# endif ++#endif ++#if HAVE_PACEMAKER_CRM_COMMON_CLUSTER_H ++# include ++#endif ++#if HAVE_PACEMAKER_CRM_CLUSTER_H ++# include + #endif + + #include "clplumbing/cl_log.h" --- pacemaker-mgmt-2.1.2.orig/debian/patches/fix-desktop-icon-file.patch +++ pacemaker-mgmt-2.1.2/debian/patches/fix-desktop-icon-file.patch @@ -0,0 +1,11 @@ +diff -ruN pacemaker-mgmt-2.0.0+hg1141.orig/mgmt/client/crm_gui.desktop.in pacemaker-mgmt-2.0.0+hg1141/mgmt/client/crm_gui.desktop.in +--- pacemaker-mgmt-2.0.0+hg1141.orig/mgmt/client/crm_gui.desktop.in 2010-03-26 11:05:47.000000000 +0000 ++++ pacemaker-mgmt-2.0.0+hg1141/mgmt/client/crm_gui.desktop.in 2010-08-06 09:21:41.344903282 +0000 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Type=Application +-Categories=GNOME;GTK;Settings;System;SystemSetup;X-SuSE-YaST;X-SuSE-YaST-High_Availability; ++Categories=GNOME;GTK;Settings;System;X-SuSE-YaST;X-SuSE-YaST-High_Availability; + + X-KDE-ModuleType=Library + X-KDE-RootOnly=false --- pacemaker-mgmt-2.1.2.orig/patches/fix_ftbfs.patch +++ pacemaker-mgmt-2.1.2/patches/fix_ftbfs.patch @@ -0,0 +1,13 @@ +Index: pacemaker-mgmt-2.1.2/mgmt/daemon/mgmt_crm.c +=================================================================== +--- pacemaker-mgmt-2.1.2.orig/mgmt/daemon/mgmt_crm.c 2013-03-03 20:55:37.000000000 -0500 ++++ pacemaker-mgmt-2.1.2/mgmt/daemon/mgmt_crm.c 2013-10-07 10:08:26.235569361 -0400 +@@ -1602,7 +1602,7 @@ + delete_lrm_rsc(crmd_channel, argv[1], argv[2]); + refresh_lrm(crmd_channel, NULL); + +- rc = query_node_uuid(cib_conn, argv[1], &dest_node); ++ rc = query_node_uuid(cib_conn, argv[1], &dest_node, NULL); + if (rc != 0) { + mgmt_log(LOG_WARNING, "Could not map uname=%s to a UUID: %s\n", + argv[1], pcmk_strerror(rc)); --- pacemaker-mgmt-2.1.2.orig/patches/series +++ pacemaker-mgmt-2.1.2/patches/series @@ -0,0 +1,3 @@ +fix-desktop-icon-file.patch +implicit-declaration.patch +fix_ftbfs.patch --- pacemaker-mgmt-2.1.2.orig/patches/implicit-declaration.patch +++ pacemaker-mgmt-2.1.2/patches/implicit-declaration.patch @@ -0,0 +1,40 @@ +Description: fix build problem with is_heartbeat_cluster() function + Unconditionally include header where this function is declared. + Unconditionally link with necessary library. This is similar to change in + upstream revision 1163. +Author: Ilya Barygin + +--- pacemaker-mgmt-2.1.2.orig/snmp_subagent/Makefile.am 2013-10-07 11:10:21.265335325 -0400 ++++ pacemaker-mgmt-2.1.2/snmp_subagent/Makefile.am 2013-10-07 11:10:21.261335328 -0400 +@@ -77,9 +77,7 @@ + -lplumb -lcrmcommon -lcib -lpe_status \ + $(CLUSTERLIBS) $(CURSESLIBS) $(GLIBLIB) + +-if !BUILD_HEARTBEAT_SUPPORT + hbagent_LDADD += -lcrmcluster +-endif + hbagent_LDFLAGS = @SNMPAGENTLIB@ + + # test cases +--- pacemaker-mgmt-2.1.2.orig/snmp_subagent/hbagent.c 2013-10-07 11:10:21.265335325 -0400 ++++ pacemaker-mgmt-2.1.2/snmp_subagent/hbagent.c 2013-10-07 11:10:49.065312632 -0400 +@@ -39,13 +39,12 @@ + #if SUPPORT_HEARTBEAT + #include "hb_api.h" + #include "heartbeat.h" +-#else +-# if HAVE_PACEMAKER_CRM_COMMON_CLUSTER_H +-# include +-# endif +-# if HAVE_PACEMAKER_CRM_CLUSTER_H +-# include +-# endif ++#endif ++#if HAVE_PACEMAKER_CRM_COMMON_CLUSTER_H ++# include ++#endif ++#if HAVE_PACEMAKER_CRM_CLUSTER_H ++# include + #endif + + #include "clplumbing/cl_log.h" --- pacemaker-mgmt-2.1.2.orig/patches/fix-desktop-icon-file.patch +++ pacemaker-mgmt-2.1.2/patches/fix-desktop-icon-file.patch @@ -0,0 +1,11 @@ +diff -ruN pacemaker-mgmt-2.0.0+hg1141.orig/mgmt/client/crm_gui.desktop.in pacemaker-mgmt-2.0.0+hg1141/mgmt/client/crm_gui.desktop.in +--- pacemaker-mgmt-2.0.0+hg1141.orig/mgmt/client/crm_gui.desktop.in 2010-03-26 11:05:47.000000000 +0000 ++++ pacemaker-mgmt-2.0.0+hg1141/mgmt/client/crm_gui.desktop.in 2010-08-06 09:21:41.344903282 +0000 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Type=Application +-Categories=GNOME;GTK;Settings;System;SystemSetup;X-SuSE-YaST;X-SuSE-YaST-High_Availability; ++Categories=GNOME;GTK;Settings;System;X-SuSE-YaST;X-SuSE-YaST-High_Availability; + + X-KDE-ModuleType=Library + X-KDE-RootOnly=false