diff -u cluster-agents-1.0.2/debian/rules cluster-agents-1.0.2/debian/rules --- cluster-agents-1.0.2/debian/rules +++ cluster-agents-1.0.2/debian/rules @@ -9,8 +9,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/dpatch/dpatch.make - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -27,7 +25,7 @@ configure: configure-stamp -configure-stamp: patch-stamp +configure-stamp: dh_testdir test -x ./configure || ./autogen.sh ./configure --with-ocf-root=/usr/lib/ocf --with-initdir=/etc/init.d \ @@ -47,7 +45,7 @@ build-indep-stamp: configure-stamp touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp configure-stamp diff -u cluster-agents-1.0.2/debian/cluster-agents.install cluster-agents-1.0.2/debian/cluster-agents.install --- cluster-agents-1.0.2/debian/cluster-agents.install +++ cluster-agents-1.0.2/debian/cluster-agents.install @@ -1,77 +1,7 @@ -usr/lib/heartbeat/ocf-shellfuncs -usr/lib/heartbeat/ocf-returncodes -usr/lib/heartbeat/findif -usr/lib/heartbeat/sfex_daemon -usr/lib/heartbeat/send_arp -usr/lib/ocf/resource.d/heartbeat/IPv6addr -usr/lib/ocf/resource.d/heartbeat/ClusterMon -usr/lib/ocf/resource.d/heartbeat/Dummy -usr/lib/ocf/resource.d/heartbeat/IPaddr -usr/lib/ocf/resource.d/heartbeat/IPaddr2 -usr/lib/ocf/resource.d/heartbeat/drbd -usr/lib/ocf/resource.d/heartbeat/anything -usr/lib/ocf/resource.d/heartbeat/AoEtarget -usr/lib/ocf/resource.d/heartbeat/apache -usr/lib/ocf/resource.d/heartbeat/AudibleAlarm -usr/lib/ocf/resource.d/heartbeat/db2 -usr/lib/ocf/resource.d/heartbeat/Delay -usr/lib/ocf/resource.d/heartbeat/eDir88 -usr/lib/ocf/resource.d/heartbeat/EvmsSCC -usr/lib/ocf/resource.d/heartbeat/Evmsd -usr/lib/ocf/resource.d/heartbeat/Filesystem -usr/lib/ocf/resource.d/heartbeat/ids -usr/lib/ocf/resource.d/heartbeat/iscsi -usr/lib/ocf/resource.d/heartbeat/ICP -usr/lib/ocf/resource.d/heartbeat/IPsrcaddr -usr/lib/ocf/resource.d/heartbeat/iSCSITarget -usr/lib/ocf/resource.d/heartbeat/iSCSILogicalUnit -usr/lib/ocf/resource.d/heartbeat/LinuxSCSI -usr/lib/ocf/resource.d/heartbeat/LVM -usr/lib/ocf/resource.d/heartbeat/MailTo -usr/lib/ocf/resource.d/heartbeat/ManageRAID -usr/lib/ocf/resource.d/heartbeat/ManageVE -usr/lib/ocf/resource.d/heartbeat/mysql -usr/lib/ocf/resource.d/heartbeat/mysql-proxy -usr/lib/ocf/resource.d/heartbeat/nfsserver -usr/lib/ocf/resource.d/heartbeat/oracle -usr/lib/ocf/resource.d/heartbeat/oralsnr -usr/lib/ocf/resource.d/heartbeat/pingd -usr/lib/ocf/resource.d/heartbeat/portblock -usr/lib/ocf/resource.d/heartbeat/pgsql -usr/lib/ocf/resource.d/heartbeat/Pure-FTPd -usr/lib/ocf/resource.d/heartbeat/Raid1 -usr/lib/ocf/resource.d/heartbeat/Route -usr/lib/ocf/resource.d/heartbeat/rsyncd -usr/lib/ocf/resource.d/heartbeat/SAPDatabase -usr/lib/ocf/resource.d/heartbeat/SAPInstance -usr/lib/ocf/resource.d/heartbeat/SendArp -usr/lib/ocf/resource.d/heartbeat/ServeRAID -usr/lib/ocf/resource.d/heartbeat/SphinxSearchDaemon -usr/lib/ocf/resource.d/heartbeat/Squid -usr/lib/ocf/resource.d/heartbeat/Stateful -usr/lib/ocf/resource.d/heartbeat/SysInfo -usr/lib/ocf/resource.d/heartbeat/scsi2reservation -usr/lib/ocf/resource.d/heartbeat/sfex -usr/lib/ocf/resource.d/heartbeat/tomcat -usr/lib/ocf/resource.d/heartbeat/VIPArip -usr/lib/ocf/resource.d/heartbeat/VirtualDomain -usr/lib/ocf/resource.d/heartbeat/vmware -usr/lib/ocf/resource.d/heartbeat/WAS -usr/lib/ocf/resource.d/heartbeat/WAS6 -usr/lib/ocf/resource.d/heartbeat/WinPopup -usr/lib/ocf/resource.d/heartbeat/Xen -usr/lib/ocf/resource.d/heartbeat/Xinetd -usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs -usr/lib/ocf/resource.d/heartbeat/.ocf-binaries -usr/lib/ocf/resource.d/heartbeat/.ocf-directories -usr/lib/ocf/resource.d/heartbeat/.ocf-returncodes +usr/lib/heartbeat/* +usr/lib/ocf/resource.d/* usr/share/resource-agents/ra-api-1.dtd usr/sbin/sfex_init usr/sbin/ocf-tester etc/ha.d/shellfuncs -usr/lib/heartbeat/tickle_tcp -usr/lib/ocf/resource.d/heartbeat/CTDB -usr/lib/ocf/resource.d/heartbeat/ldirectord -usr/lib/ocf/resource.d/heartbeat/proftpd -usr/lib/ocf/resource.d/heartbeat/syslog-ng usr/share/man/man7/* diff -u cluster-agents-1.0.2/debian/ldirectord.install cluster-agents-1.0.2/debian/ldirectord.install --- cluster-agents-1.0.2/debian/ldirectord.install +++ cluster-agents-1.0.2/debian/ldirectord.install @@ -4,0 +5 @@ +usr/share/man/man8/* diff -u cluster-agents-1.0.2/debian/control cluster-agents-1.0.2/debian/control --- cluster-agents-1.0.2/debian/control +++ cluster-agents-1.0.2/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman -Build-Depends: cluster-glue-dev, libnet1-dev, debhelper (>= 7), dpatch, docbook-xsl, automake, autoconf, libtool, pkg-config, libglib2.0-dev +Build-Depends: cluster-glue-dev, libnet1-dev, debhelper (>= 7), docbook-xsl, automake, autoconf, libtool, pkg-config, libglib2.0-dev, xsltproc Standards-Version: 3.8.3 Homepage: http://hg.linux-ha.org/agents/ XS-Python-Version: current @@ -11,8 +11,8 @@ Package: cluster-agents Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cluster-glue, libauthen-radius-perl, libcrypt-ssleay-perl, libdbi-perl, libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl, libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl, python -Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5), ldirectord (<< 1.0.2~rc2a+hg20100127-0test1) -Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5), ldirectord (<< 1.0.2~rc2a+hg20100127-0test1) +Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5) +Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5) Description: The reusable cluster components for Linux HA This package contains various reusable cluster components from the Linux HA project. Originally belonging to Heartbeat, they diff -u cluster-agents-1.0.2/debian/changelog cluster-agents-1.0.2/debian/changelog --- cluster-agents-1.0.2/debian/changelog +++ cluster-agents-1.0.2/debian/changelog @@ -1,23 +1,43 @@ -cluster-agents (1:1.0.2-1~bpo50+1) lenny-backports; urgency=low +cluster-agents (1:1.0.2-0ubuntu0ppa2) lucid; urgency=low - * Rebuild for lenny-backports. + * Removed patch and dpatch deps + + -- Ante Karamatic Wed, 03 Feb 2010 16:30:10 +0000 + +cluster-agents (1:1.0.2-0ubuntu0ppa1) lucid; urgency=low + + * New upstream release + * Thank you Martin Loschwitz: + - Fix dependencies for ldirectord and include var/lock/subsys/ldirectord + - Add libsocket6-perl to ldirectord's deps + * Move ldirectord's ocf to cluster-agents + + -- Ante Karamatic Wed, 03 Feb 2010 13:32:17 +0000 + +cluster-agents (1:1.0.2~rc2a+hg20100128-0ubuntu0ppa4) lucid; urgency=low + + * Re-added xsltproc to build depends + + -- Ante Karamatic Fri, 29 Jan 2010 13:33:18 +0000 + +cluster-agents (1:1.0.2~rc2a+hg20100128-0ubuntu0ppa3) lucid; urgency=low + + * Add missing debian/patches/00list file - -- Martin Loschwitz Wed, 03 Feb 2010 07:42:13 +0000 + -- Ante Karamatic Fri, 29 Jan 2010 09:53:08 +0000 -cluster-agents (1:1.0.2-1) unstable; urgency=low +cluster-agents (1:1.0.2~rc2a+hg20100128-0ubuntu0ppa2) lucid; urgency=low - * New upstream release. + * Fixed typo in cluster-agents.install - -- Martin Loschwitz Wed, 03 Feb 2010 08:05:00 +0100 + -- Ante Karamatic Fri, 29 Jan 2010 09:42:11 +0000 -cluster-agents (1:1.0.2~rc2a+hg20100127-0test1) unstable; urgency=low +cluster-agents (1:1.0.2~rc2a+hg20100128-0ubuntu0ppa1) lucid; urgency=low - * Incorporating a whole lot of changes done by Ante Karamatic to - these packages; thank you very much indeed! - * New upstream version taken from linux-ha.org repository - * Fix dependencies for ldirectord and include var/lock/subsys/ldirectord + * New upstream snapshot + * Install manpages and all resources - -- Martin Loschwitz Wed, 27 Jan 2010 01:24:00 +0100 + -- Ante Karamatic Fri, 29 Jan 2010 07:40:16 +0000 cluster-agents (1:1.0.2~rc2a-0ubuntu0ppa5) lucid; urgency=low reverted: --- cluster-agents-1.0.2/debian/patches/01_local_docbook_xsl.dpatch +++ cluster-agents-1.0.2.orig/debian/patches/01_local_docbook_xsl.dpatch @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_local_docbook_xsl.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad cluster-agents-1.0.2~rc2a~/doc/Makefile.am cluster-agents-1.0.2~rc2a/doc/Makefile.am ---- cluster-agents-1.0.2~rc2a~/doc/Makefile.am 2009-12-23 14:48:42.000000000 +0000 -+++ cluster-agents-1.0.2~rc2a/doc/Makefile.am 2010-01-04 15:54:57.000000000 +0000 -@@ -18,7 +18,7 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - --STYLESHEET_PREFIX ?= http://docbook.sourceforge.net/release/xsl/current -+STYLESHEET_PREFIX ?= /usr/share/xml/docbook/stylesheet/docbook-xsl - MANPAGES_STYLESHEET ?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl - HTML_STYLESHEET ?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl - FO_STYLESHEET ?= $(STYLESHEET_PREFIX)/fo/docbook.xsl