[Debian-ha-commits] [crmsh] 01/02: Import versions 1.2.6+git+e77add-1.4 and 1.2.6+git+e77add-2

[Christoph Berg]

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

myon pushed a commit to branch master
in repository crmsh.

commit a783bd15d2e7973e3755040e8c5268048c9138ea
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Thu Jan 28 13:57:48 2016 +0100

    Import versions 1.2.6+git+e77add-1.4 and 1.2.6+git+e77add-2
---
 debian/changelog | 13 +++++++++++++
 debian/control   | 35 ++++++++++++++++++++++++++++++-----
 debian/rules     |  2 +-
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0fbba1..00cc62f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+crmsh (1.2.6+git+e77add-2) unstable; urgency=medium
+
+  * Update control for new pacemaker dev packages.
+
+ -- Christoph Berg <myon at debian.org>  Sat, 16 Jan 2016 16:26:36 +0100
+
+crmsh (1.2.6+git+e77add-1.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Port from python-support to dh_python2 (Closes: #785973)
+
+ -- Stefano Rivera <stefanor at debian.org>  Thu, 20 Aug 2015 15:31:26 +0200
+
 crmsh (1.2.6+git+e77add-1.3) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index e600903..a9c04f6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,46 @@ Source: crmsh
 Section: admin
 Priority: extra
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>
-Build-Depends: debhelper (>= 9.0.0), cluster-glue-dev, hardening-wrapper, python-all-dev, python-support, dh-autoreconf, libcib3-dev, libcrmcluster4-dev, libcrmcommon3-dev (>= 1.1.8+git20121010), libpe-rules2-dev, libpe-status4-dev, libpengine4-dev (>= 1.1.8+git20121010), libstonithd2-dev, libtransitioner2-dev, liblrmd1-dev, libcrmservice1-dev, python-support, pkg-config, asciidoc, libxml2-utils, docbook-xml, xsltproc, docbook-xsl
+Uploaders: Martin Loschwitz <madkiss at debian.org>,
+ Christoph Berg <myon at debian.org>
+Build-Depends:
+ asciidoc,
+ cluster-glue-dev,
+ debhelper (>= 9.0.0),
+ dh-autoreconf,
+ dh-python,
+ docbook-xml,
+ docbook-xsl,
+ hardening-wrapper,
+ libcib3-dev,
+ libcrmcluster-dev,
+ libcrmcommon-dev (>= 1.1.8+git20121010),
+ libcrmservice1-dev,
+ liblrmd-dev,
+ libpengine-dev (>= 1.1.8+git20121010),
+ libstonithd-dev,
+ libxml2-utils,
+ pkg-config,
+ python-all-dev,
+ xsltproc
 Standards-Version: 3.9.5
 Homepage: http://savannah.nongnu.org/projects/crmsh/
 
 Package: crmsh
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.6.6-9), python-support (>= 0.90), python-lxml, python-yaml
+Depends:
+ python-lxml,
+ python-yaml,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Recommends: pacemaker (>= 1.1.8-1)
 Replaces: pacemaker (<< 1.1.8-1)
 Breaks: pacemaker (<< 1.1.8-1)
 Description: CRM shell for the pacemaker cluster manager
- This package contains the famous CRM shell (crmsh) written by Dejan 
+ This package contains the famous CRM shell (crmsh) written by Dejan
  Muhamedagic. Use it to manipulate the cluster information base (CIB)
- of a running pacemaker cluster without having to fiddle with XML 
+ of a running pacemaker cluster without having to fiddle with XML
  snipets. The CRM shell used to be part of the pacemaker package
  itself and became a separate project lately. If you are running a
  pacemaker cluster, then you should most definetely have this package
diff --git a/debian/rules b/debian/rules
index 368bf05..677f200 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf 
+	dh $@ --with autoreconf,python2
 
 override_dh_installdocs:
 	dh_installdocs

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