diff -u cluster-glue-1.0.3/debian/rules cluster-glue-1.0.3/debian/rules --- cluster-glue-1.0.3/debian/rules +++ cluster-glue-1.0.3/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-glue-1.0.3/debian/control cluster-glue-1.0.3/debian/control --- cluster-glue-1.0.3/debian/control +++ cluster-glue-1.0.3/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman -Build-Depends: debhelper (>= 7), 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, xsltproc, docbook-xsl, dpatch +Build-Depends: debhelper (>= 7), 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, xsltproc, docbook-xsl Standards-Version: 3.8.3 Homepage: http://hg.linux-ha.org/glue/ XS-Python-Version: current diff -u cluster-glue-1.0.3/debian/changelog cluster-glue-1.0.3/debian/changelog --- cluster-glue-1.0.3/debian/changelog +++ cluster-glue-1.0.3/debian/changelog @@ -1,22 +1,20 @@ -cluster-glue (1.0.3-1~bpo50+1) lenny-backports; urgency=low +cluster-glue (1.0.3-0ubuntnu0ppa2) lucid; urgency=low - * Rebuild for lenny-backports. + * Remove debian/patches and dpatch - -- Martin Loschwitz Wed, 03 Feb 2010 07:37:41 +0000 + -- Ante Karamatic Wed, 03 Feb 2010 16:13:17 +0000 -cluster-glue (1.0.3-1) unstable; urgency=low +cluster-glue (1.0.3-0ubuntnu0ppa1) lucid; urgency=low - * New upstream release. + * New upstream release - -- Martin Loschwitz Wed, 03 Feb 2010 08:05:00 +0100 + -- Ante Karamatic Wed, 03 Feb 2010 13:21:41 +0000 -cluster-glue (1.0.2~rc2b+hg20100127-0test1) unstable; urgency=low +cluster-glue (1.0.2~rc2a+hg20100128-0ubuntu0ppa1) lucid; urgency=low - * New build of the Debian version of this package, incorporating many - changes done by Ante Karamatic (thank you very much!) - * New upstream checkout + * New upstream snapshot - -- Martin Loschwitz Wed, 26 Jan 2010 12:58:00 +0200 + -- Ante Karamatic Fri, 29 Jan 2010 07:29:49 +0000 cluster-glue (1.0.2~rc2a-0ubuntu0ppa2) lucid; urgency=low reverted: --- cluster-glue-1.0.3/debian/patches/01_stylesheet_path.dpatch +++ cluster-glue-1.0.3.orig/debian/patches/01_stylesheet_path.dpatch @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_stylesheet_path.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad cluster-glue-1.0.2~rc2a~/doc/Makefile.am cluster-glue-1.0.2~rc2a/doc/Makefile.am ---- cluster-glue-1.0.2~rc2a~/doc/Makefile.am 2009-12-23 14:34:45.000000000 +0000 -+++ cluster-glue-1.0.2~rc2a/doc/Makefile.am 2010-01-04 15:17:59.000000000 +0000 -@@ -33,7 +33,7 @@ - - EXTRA_DIST = $(man_MANS) - --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