[Debian-ha-commits] [cluster-glue] 38/73: Imported Debian patch 1.0.10+hg2722-1.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 6e3d7a57c911f48834b181fd9ee3db3110738546
Author: Luca Falavigna <dktrkranz at debian.org>
Date:   Tue Jul 9 22:25:36 2013 +0200

    Imported Debian patch 1.0.10+hg2722-1.1
---
 debian/changelog | 8 ++++++++
 debian/control   | 5 ++---
 debian/rules     | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 002b1ad..40c0d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cluster-glue (1.0.10+hg2722-1.1) unstable; urgency=low
+
+  [ Arthur de Jong ]
+  * Non-maintainer upload
+  * Switch from python-central to dh_python2 (Closes: #616777).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 09 Jul 2013 22:25:36 +0200
+
 cluster-glue (1.0.10+hg2722-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 86372e1..f781e8c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ 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 (>=2.6.6-3~), 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, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltproc, docbook-xsl, chrpath,  [...]
 Standards-Version: 3.9.3
 Homepage: http://hg.linux-ha.org/glue/
 Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
 Vcs-Browser: http://hg.debian.org/hg/debian-ha/cluster-glue
-XS-Python-Version: current
 
 Package: libcluster-glue
 Architecture: all
@@ -140,7 +139,7 @@ Description: Reusable cluster components for Linux HA (transitional package)
 
 Package: cluster-glue
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, python, libtimedate-perl, liblrm2 (= ${binary:Version}), libpils2 (= ${binary:Version}), libplumb2 (= ${binary:Version}), libplumbgpl2 (= ${binary:Version}), libstonith1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtimedate-perl, liblrm2 (= ${binary:Version}), libpils2 (= ${binary:Version}), libplumb2 (= ${binary:Version}), libplumbgpl2 (= ${binary:Version}), libstonith1 (= ${binary:Version})
 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: Reusable cluster components for Linux HA
diff --git a/debian/rules b/debian/rules
index 54704b5..9534cfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,8 @@ binary-common:
 	dh_installman
 	dh_lintian
 	dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
+	dh_python2
+	dh_python2 /usr/lib/stonith/plugins/stonith2
 	dh_strip
 	dh_compress
 	dh_fixperms

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