diff -u pacemaker-mgmt-2.1.2/debian/copyright pacemaker-mgmt-2.1.2/debian/copyright --- pacemaker-mgmt-2.1.2/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: diff -u pacemaker-mgmt-2.1.2/debian/changelog pacemaker-mgmt-2.1.2/debian/changelog --- pacemaker-mgmt-2.1.2/debian/changelog +++ pacemaker-mgmt-2.1.2/debian/changelog @@ -1,3 +1,9 @@ +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) @@ -11,62 +17,66 @@ -- Andres Rodriguez Mon, 07 Oct 2013 09:51:51 -0400 -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(-) - - * 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 (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 + +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) @@ -97,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 @@ -112,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 @@ -127,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) @@ -138,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 diff -u pacemaker-mgmt-2.1.2/debian/rules pacemaker-mgmt-2.1.2/debian/rules --- pacemaker-mgmt-2.1.2/debian/rules +++ pacemaker-mgmt-2.1.2/debian/rules @@ -14,7 +14,7 @@ cfg:=--prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \ --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 + --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) diff -u pacemaker-mgmt-2.1.2/debian/control pacemaker-mgmt-2.1.2/debian/control --- pacemaker-mgmt-2.1.2/debian/control +++ pacemaker-mgmt-2.1.2/debian/control @@ -2,10 +2,11 @@ Section: admin Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-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, intltool, quilt -Standards-Version: 3.7.3 -XS-Python-Version: current +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 only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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)); only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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" only in patch2: unchanged: --- 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