diff -u heartbeat-3.0.2/debian/rules heartbeat-3.0.2/debian/rules --- heartbeat-3.0.2/debian/rules +++ heartbeat-3.0.2/debian/rules @@ -8,8 +8,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - cfg:=--prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man --disable-crm \ --with-group-name=haclient --with-ccmuser-name=hacluster \ @@ -38,7 +36,7 @@ build: build-stamp -build-stamp: patch-stamp +build-stamp: dh_testdir # Only boostrap as neccessary if test -e ./configure -a ! -x ./configure; then \ @@ -52,7 +50,7 @@ $(MAKE) touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot # Add here commands to clean up after the build process. @@ -177 +175 @@ -.PHONY: build clean binary binary-indep binary-arch install patch unpatch +.PHONY: build clean binary binary-indep binary-arch install diff -u heartbeat-3.0.2/debian/control heartbeat-3.0.2/debian/control --- heartbeat-3.0.2/debian/control +++ heartbeat-3.0.2/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman -Build-Depends: debhelper (>= 5.0.37.2), cluster-glue-dev, libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, dpatch, docbook-xsl, xsltproc +Build-Depends: debhelper (>= 5.0.37.2), cluster-glue-dev, libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, docbook-xsl, xsltproc Standards-Version: 3.8.1 XS-Python-Version: current reverted: --- heartbeat-3.0.2/debian/.cvsignore +++ heartbeat-3.0.2.orig/debian/.cvsignore @@ -1,6 +0,0 @@ -Makefile -Makefile.in -*.substvars -*.beam -parser-messages -MISC_ERRORS diff -u heartbeat-3.0.2/debian/changelog heartbeat-3.0.2/debian/changelog --- heartbeat-3.0.2/debian/changelog +++ heartbeat-3.0.2/debian/changelog @@ -1,22 +1,21 @@ -heartbeat (1:3.0.2-1~bpo50+1) lenny-backports; urgency=low +heartbeat (3.0.2-0ubuntu0ppa2) lucid; urgency=low - * Rebuild for lenny-backports. + * Really remove dpatch :/ - -- Martin Loschwitz Wed, 03 Feb 2010 07:45:17 +0000 + -- Ante Karamatic Wed, 03 Feb 2010 15:46:04 +0000 -heartbeat (1:3.0.2-1) unstable; urgency=low +heartbeat (3.0.2-0ubuntu0ppa1) lucid; urgency=low - * New upstream release. + * New upstream release + * Drop debian/patches/01_docbook_path.dpatch and dpatch build-dep - -- Martin Loschwitz Wed, 03 Feb 2010 08:05:00 +0100 + -- Ante Karamatic Wed, 03 Jan 2010 16:22:14 +0100 -heartbeat (1:3.0.2~rc2+hg20100127-0test1) unstable; urgency=low +heartbeat (3.0.2~rc2+hg20100128-0ubuntu0ppa1) lucid; urgency=low - * Incorporating a whole lot of change introduced by Ante Karamatic - from Ubuntu; thank you very much! - * New heartbeat source checkout + * New upstream snapshot - -- Martin Loschwitz Wed, 27 Jan 2010 13:11:00 +0200 + -- Ante Karamatic Fri, 29 Jan 2010 09:45:01 +0000 heartbeat (3.0.2~rc2-0ubuntu0ppa3) lucid; urgency=low reverted: --- heartbeat-3.0.2/debian/patches/01_docbook_path.dpatch +++ heartbeat-3.0.2.orig/debian/patches/01_docbook_path.dpatch @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_docbook_path.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad heartbeat-3.0.2~rc2~/doc/Makefile.am heartbeat-3.0.2~rc2/doc/Makefile.am ---- heartbeat-3.0.2~rc2~/doc/Makefile.am 2009-12-19 18:46:52.000000000 +0000 -+++ heartbeat-3.0.2~rc2/doc/Makefile.am 2010-01-06 11:24:25.000000000 +0000 -@@ -38,7 +38,7 @@ - hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \ - ha.cf.5 authkeys.5 - --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