[X2Go-Commits] [x2goclient] 31/94: Enforce Python3 build, fix FTBFS. (debian/rules: Switch to pybuild DH build system.)

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.6.1.0
in repository x2goclient.

commit c1ff8d4ad847a8f1036cb0eb175043a850313b30
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 6 20:59:30 2018 +0100

    Enforce Python3 build, fix FTBFS. (debian/rules: Switch to pybuild DH build system.)
---
 debian/changelog | 3 +++
 debian/control   | 6 +++---
 debian/rules     | 4 +---
 setup.py         | 5 ++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51aa0ad2..aad98e3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,14 @@ pyhoca-cli (0.5.99.0-0x2go1) UNRELEASED; urgency=medium
   * Bump upstream version to 0.5.99.0.
   * debian/rules:
     + Build for Python3, not Python2.
+    + Enforce Python3 build, fix FTBFS.
   * debian/control:
     + Fix src:pkg header part.
     + Switch to python3-* dependencies.
     + White-space fix.
     + Bump versioned D (pyhoca-cli): python-x2go (>= 0.5.99.0~).
+  * debian/rules:
+    + Switch to pybuild DH build system.
   * debian/{control,compat}: Bump to DH version level 9.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Sep 2017 14:09:18 +0200
diff --git a/debian/control b/debian/control
index 29db8833..21751792 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  man2html-base | man2html,
- python3 (>=2.6.5-0~),
+ python3-all (>= 3.4),
  python3-setuptools,
- python3-support (>=0.90) | dh-python
+ dh-python,
 Standards-Version: 4.1.0
 Homepage: http://code.x2go.org/releases/source/pyhoca-cli
 Vcs-Git: git://code.x2go.org/pyhoca-cli.git
 Vcs-Browser: http://code.x2go.org/gitweb?p=pyhoca-cli.git;a=summary
-X-Python3-Version: >= 3.6
+X-Python3-Version: >= 3.4
 
 Package: pyhoca-cli
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 3f273214..edd72bc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,8 @@
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 2010-2016 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
-WITH_PYTHON3 = $(shell test -f /usr/bin/dh_python3 && echo "--with python3")
-
 %:
-	dh ${@} ${WITH_PYTHON3}
+	dh ${@} --with=python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	rm -Rf PyHoca_CLI.egg-info/
diff --git a/setup.py b/setup.py
index 03e52dca..cbc069a4 100755
--- a/setup.py
+++ b/setup.py
@@ -22,9 +22,8 @@ import os
 
 from setuptools import setup
 
-# silence pyflakes, __VERSION__ is properly assigned below...
-__VERSION__ = '0.0.0.0'
-for line in file(os.path.join('pyhoca', 'cli', '__init__.py')).readlines():
+__VERSION__ = "0.0.0.0"
+for line in open(os.path.join('x2go', '__init__.py'),encoding='utf-8').readlines():
     if (line.startswith('__VERSION__')):
         exec(line.strip())
 PROGRAM_VERSION = __VERSION__

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git