Hack packaging to build on py3

3 files changed, 24 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index e2df57679..a908910be 100644
--- a/debian/control
+++ b/debian/control
@@ -4,27 +4,27 @@ Priority: optional
 Maintainer: Arto Jantunen <viiru@debian.org>
 Uploaders: Sami Haahtinen <ressu@debian.org>
 Build-Depends: debhelper (>= 11),
-	       python (>= 2.6),
-	       python-setuptools,
-	       python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
-	       python-lxml,
-	       python-daemon,
-	       python-boto,
-	       python-cherrypy3,
-	       python-gamin,
-	       python-genshi,
-	       python-pyinotify,
-	       python-m2crypto,
-	       python-doc,
-	       python-mock,
-	       python-mock-doc,
+	       python3 (>= 2.6),
+	       python3-setuptools,
+	       python3-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
+	       python3-lxml,
+	       python3-daemon,
+	       python3-boto,
+	       python3-cherrypy3,
+	       python3-genshi,
+	       python3-pyinotify,
+	       python3-m2crypto,
+	       python3-doc,
+	       python3-mock,
+	       python3-pip,
+	       python3-nose,
 	       dh-python
 Standards-Version: 3.8.0.0
 Homepage: http://bcfg2.org/
 
 Package: bcfg2
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, debsums, python-apt (>= 0.7.91), ucf, lsb-base (>= 3.1-9), python (>= 2.6)
+Depends: ${python3:Depends}, ${misc:Depends}, debsums, python3-apt (>= 0.7.91), ucf, lsb-base (>= 3.1-9), python3
 Description: Configuration management client
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
@@ -33,9 +33,9 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python (>= 2.6), python-pyinotify | python-gamin, python-daemon, python-genshi (>= 0.4.4)
+Depends: ${python3:Depends}, ${misc:Depends}, python3-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python3 (>= 2.6), python3-pyinotify | python3-gamin, python3-daemon, python3-genshi (>= 0.4.4)
 Recommends: graphviz, patch
-Suggests: python-cheetah, python-profiler, python-django (>= 1.3), mail-transport-agent, bcfg2-doc (= ${binary:Version})
+Suggests: python3-cheetah, python3-profiler, python3-django (>= 1.3), mail-transport-agent, bcfg2-doc (= ${binary:Version})
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
@@ -44,8 +44,8 @@ Description: Configuration management server
 
 Package: bcfg2-web
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, bcfg2-server (= ${binary:Version}), python-django (>= 1.3)
-Suggests: python-mysqldb, python-psycopg2, python-sqlite, libapache2-mod-wsgi
+Depends: ${python3:Depends}, ${misc:Depends}, bcfg2-server (= ${binary:Version}), python3-django (>= 1.3)
+Suggests: python3-mysqldb, python3-psycopg2, python3-sqlite, libapache2-mod-wsgi
 Description: Configuration management web interface
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
@@ -53,7 +53,7 @@ Description: Configuration management web interface
 
 Package: bcfg2-utils
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, bcfg2 (= ${binary:Version})
+Depends: ${python3:Depends}, ${misc:Depends}, bcfg2 (= ${binary:Version})
 Suggests: bcfg2-doc (= ${binary:Version})
 Description: Configuration management helper package
  Bcfg2 is a configuration management system that generates configuration sets
diff --git a/debian/rules b/debian/rules
index 102a340e9..e20e0306e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
 #!/usr/bin/make -f
 
-# Lucid does not have dh_python2, but we would like to be able to use
-# this rules file to build on lucid as well.
-WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
-WITH_SPHINXDOC = $(shell test -f /usr/bin/dh_sphinxdoc && echo "--with sphinxdoc")
-
 %:
-	dh $@ ${WITH_PYTHON2} ${WITH_SPHINXDOC}
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_installinit:
 	# Install bcfg2 initscript without starting it on postinst
@@ -18,7 +13,6 @@ override_dh_installinit:
 
 override_dh_auto_build:
 	dh_auto_build
-	python setup.py build_sphinx
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -27,3 +21,5 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	dh_auto_install
 	install -m 644 -D tools/bcfg2-completion.bash debian/tmp/etc/bash_completion.d/bcfg2
+
+override_dh_installdocs:
diff --git a/setup.py b/setup.py
index 383202490..79dc0e8a1 100755
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,7 @@ except NameError:
 inst_reqs = [
     'lockfile',
     'lxml',
-    'python-daemon',
-    'argparse'
+    'python-daemon'
 ]
 
 # Use the backported ssl module on < python2.6