[28656] in Source-Commits

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

printing-config commit: Replace python-support with dh_python2

daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Mon Jun 27 01:49:10 2016

Date: Mon, 27 Jun 2016 01:49:07 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201606270549.u5R5n7er007967@drugstore.mit.edu>
To: source-commits@mit.edu

https://github.com/mit-athena/printing-config/commit/2a5129a6f3c6da5676679aa4b3bd832005d0f437
commit 2a5129a6f3c6da5676679aa4b3bd832005d0f437
Author: Anders Kaseorg <andersk@mit.edu>
Date:   Sat Jun 25 22:48:56 2016 -0400

    Replace python-support with dh_python2

 debian/changelog |    6 ++++++
 debian/control   |    4 ++--
 debian/rules     |    6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f85107..d96b54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-printing-config (1.34.4) unstable; urgency=medium
+
+  * Replace python-support with dh_python2.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sat, 25 Jun 2016 22:48:43 -0400
+
 debathena-printing-config (1.34.3) unstable; urgency=low
 
   * And Build-Depend on lsb-release, since we use it in the rules file
diff --git a/debian/control b/debian/control
index 2adee30..12efeb2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: debathena-printing-config
 Section: debathena-config/net
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), config-package-dev (>= 4.12~), python-all (>= 2.3.5-11), python-support (>= 0.3.2), gettext, python-setuptools, python-nose, python-hesiod, python-cups, python-debian, python-apt, cups, libgtk-3-0, lsb-release
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), config-package-dev (>= 4.12~), python-all (>= 2.6.6-3~), python2.7, gettext, python-setuptools, python-nose, python-hesiod, python-cups, python-debian, python-apt, cups, libgtk-3-0, lsb-release
+X-Python-Version: 2.7
 Standards-Version: 3.9.3
 
 Package: debathena-printing-config
@@ -11,7 +12,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debathena-cupsys
 Recommends: debathena-apparmor-config, rlpr
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
-XB-Python-Version: ${python:Versions}
 Description: Printing configuration for Debathena
  This package configures both graphical and command-line printing in a way that
  is compatible with the traditional Athena printing infrastructure and eases
diff --git a/debian/rules b/debian/rules
index 9d1c15c..53086b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = pysupport
+DEB_PYTHON2_MODULE_PACKAGES = debathena-printing-config
 
 DEB_DIVERT_EXTENSION = .debathena
 
@@ -39,8 +39,8 @@ endif
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 common-build-arch common-build-indep:: $(addprefix python-check-stamp-, $(cdbs_python_build_versions))
-python-check-stamp-%: python-build-stamp-%
-	$(call cdbs_python_binary,python$(cdbs_python_compile_version)) setup.py nosetests
+python-check-stamp-%: debian/python-module-stampdir/debathena-printing-config
+	$(call cdbs_python_binary,$*) setup.py nosetests
 	touch $@
 
 clean::

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