[28611] in Source-Commits

home help back first fref pref prev next nref lref last post

python-moira commit [debian]: Migrate to debhelper 7

daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Fri Jun 17 23:44:30 2016

Date: Fri, 17 Jun 2016 23:44:28 -0400
From: Victor Vasiliev <vasilvv@mit.edu>
Message-Id: <201606180344.u5I3iSoN011242@drugstore.mit.edu>
To: source-commits@mit.edu

https://github.com/mit-athena/python-moira/commit/c27957d99578c5db88743fa89f3f2a05c73c89b1
commit c27957d99578c5db88743fa89f3f2a05c73c89b1
Author: Victor Vasiliev <vasilvv@mit.edu>
Date:   Fri Jun 17 23:31:54 2016 -0400

    Migrate to debhelper 7

 debian/changelog |    6 ++++++
 debian/compat    |    2 +-
 debian/control   |    5 +++--
 debian/pycompat  |    1 -
 debian/rules     |   12 ++----------
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 804ba4b..2e2f112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-moira (4.3.1-0debathena2) unstable; urgency=medium
+
+  * Replace python-support with dh-python
+
+ -- Victor Vasiliev <vasilvv@mit.edu>  Fri, 17 Jun 2016 23:31:30 -0400
+
 python-moira (4.3.1-0debathena1) unstable; urgency=low
 
   * Release proper Debathena versions
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index b2a13f9..2193ab2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: python-moira
 Section: python
 Priority: extra
 Maintainer: Evan Broder <broder@mit.edu>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3.2), python-pyrex, python-setuptools, debathena-libmoira-dev, debathena-libmrclient-dev
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.6-3~), python2.7, python-pyrex, python-setuptools, debathena-libmoira-dev, debathena-libmrclient-dev
+Standards-Version: 3.9.4
 
 Package: python-moira
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
+X-Python-Version: 2.7
 Description: Python bindings for Moira
  PyMoira provides a set of Python bindings for Moira, the Athena
  Service Management system.
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/rules b/debian/rules
index 9662815..4647c9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,4 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pysupport
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-binary-fixup/python-moira::
-	rm -rf debian/$(cdbs_curpkg)/usr/bin
-
-clean::
-	rm -rf _moira.c PyMoira.egg-info
+%:
+	dh $@ --with python2

home help back first fref pref prev next nref lref last post