[Debian-ha-commits] [cluster-glue] 13/73: Imported Debian patch 1.0.6-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 df3076491d8f181a915765e1d2ff59a35bad36ef
Author: Simon Horman <horms at debian.org>
Date:   Wed Jul 14 09:53:50 2010 +0900

    Imported Debian patch 1.0.6-1
---
 debian/changelog     | 14 --------------
 debian/control       |  2 +-
 debian/rules         |  6 +-----
 debian/source/format |  1 +
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f27b98f..716b88e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-cluster-glue (1.0.6-1~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>  Wed, 04 Aug 2010 13:12:47 +0000
-
 cluster-glue (1.0.6-1) unstable; urgency=low
 
   * New upstream (closes: #588938)
@@ -12,13 +5,6 @@ cluster-glue (1.0.6-1) unstable; urgency=low
 
  -- Simon Horman <horms at debian.org>  Wed, 14 Jul 2010 09:53:50 +0900
 
-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.
diff --git a/debian/control b/debian/control
index 6e60a13..431d427 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.9.0
 Homepage: http://hg.linux-ha.org/glue/
 Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
diff --git a/debian/rules b/debian/rules
index d8618a5..02156f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-# enable quilt usage
-include /usr/share/quilt/quilt.make
-
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -34,7 +31,7 @@ RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
 
 
-configure: patch configure-stamp
+configure: configure-stamp
 configure-stamp: 
 	dh_testdir
 	test -x ./configure || ./autogen.sh
@@ -60,7 +57,6 @@ 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
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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