[Debian-ha-commits] [cluster-glue] 06/73: Imported Debian patch 1.0.5-2~bpo50+1

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit 13afcc2007ef8cc8e5d3bac72c7e178b42780862
Author: Martin Loschwitz <madkiss at debian.org>
Date:   Thu Jul 8 10:22:19 2010 +0000

    Imported Debian patch 1.0.5-2~bpo50+1
---
 debian/changelog                         | 13 +++++++++++++
 debian/control                           |  2 +-
 debian/patches/01_stylesheet_path.dpatch |  0
 debian/rules                             |  6 +++++-
 debian/source/format                     |  1 -
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5373aa..87805b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+cluster-glue (1.0.5-2~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+  * Converted package back from 3.0 to 1.0 format
+
+ -- Martin Loschwitz <madkiss at debian.org>  Thu, 08 Jul 2010 10:22:19 +0000
+
+cluster-glue (1.0.5-2) unstable; urgency=low
+
+  * Add build dependency on docbook-xml.
+
+ -- Frederik Schüler <fs at debian.org>  Mon, 03 May 2010 20:05:32 +0200
+
 cluster-glue (1.0.5-1) unstable; urgency=low
 
   * New upstream version 1.0.5 
diff --git a/debian/control b/debian/control
index 1af794e..a88322b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Schüler <fs at debian.org>
-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, libsensors4-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 [...]
+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, libsensors4-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 [...]
 Standards-Version: 3.8.4
 Homepage: http://hg.linux-ha.org/glue/
 XS-Python-Version: current
diff --git a/debian/patches/01_stylesheet_path.dpatch b/debian/patches/01_stylesheet_path.dpatch
old mode 100755
new mode 100644
diff --git a/debian/rules b/debian/rules
index 02156f6..9b55539 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# include the quilt ruleset for backports
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -31,7 +34,7 @@ RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
 
 
-configure: configure-stamp
+configure: patch configure-stamp
 configure-stamp: 
 	dh_testdir
 	test -x ./configure || ./autogen.sh
@@ -57,6 +60,7 @@ clean:
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) clean
 	[ ! -f Makefile ] || $(MAKE) distclean
+	$(MAKE) -f debian/rules unpatch
 	dh_clean 
 
 install: install-indep install-arch
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git