debian: use dh_python

Signed-off-by: Johannes Dewender <github@JonnyJD.net>

9 files changed, 13 insertions, 88 deletions

diff --git a/debian/control b/debian/control
index e21ac50..ead2073 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: targetcli-fb
 Section: python
 Priority: optional
 Maintainer: Andy Grover <andy@groveronline.com>
-Build-Depends: debhelper(>= 5.0.1), python (>=2.6), python-setuptools, python-configshell-fb, python-rtslib-fb
-Standards-Version: 3.8.1
+Build-Depends: debhelper(>= 8), python (>=2.6.6-3~), python-setuptools, python-configshell-fb, python-rtslib-fb
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.6
 
 Package: targetcli-fb
 Architecture: all
-Depends: python (>= 2.6), python-configshell-fb, python-rtslib-fb
+Depends: ${python:Depends}, ${misc:Depends}, python-configshell-fb, python-rtslib-fb
 Suggests: targetcli-fb-doc
 Conflicts: targetcli, targetcli-frozen
 Description: CLI shell for the RisingTide Systems target (free branch).
diff --git a/debian/rules b/debian/rules
index ff471ba..0287663 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,54 +1,17 @@
 #!/usr/bin/make -f
 
 build_dir   = build
-install_dir = debian/tmp
-setup       = python ./setup.py --quiet
+install_dir = $(CURDIR)/debian/tmp
 
-export PYTHONPATH = $$PYTHONPATH:./$(install_dir)/lib/targetcli/
+#export DH_VERBOSE=1
 
-binary: binary-indep
+export http_proxy = http://127.0.0.1:9
 
-binary-arch:
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installman
-	dh_install --list-missing --sourcedir $(install_dir)
-	dh_fixperms
-	dh_compress -X.py
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs 
-
-build: build-stamp
-build-stamp: 
-	dh_testdir
-	mkdir -p $(install_dir)/lib/targetcli
-	# Build the source package
-	$(setup) build --build-base $(build_dir) install --no-compile --install-purelib $(install_dir)/lib/targetcli --install-scripts $(install_dir)/bin
-	echo "2.6" > $(install_dir)/lib/targetcli/.version
-	# Cleanup
-	rm -f $(install_dir)/lib/targetcli/targetcli/*.pyc
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(setup) clean
-	find . -name "*.pyc" | xargs rm -f
-	find . -name "*.pyo" | xargs rm -f
-	rm -rf $(build_dir) $(install_dir)
-	dh_clean
-
-.PHONY: binary binary-indep install build clean
+%:
+	dh $@ --with python2
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf *.egg-info
diff --git a/debian/targetcli-fb-doc.docs b/debian/targetcli-fb-doc.docs
deleted file mode 100644
index 7363993..0000000
--- a/debian/targetcli-fb-doc.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-doc/README.md
-doc/COPYING
-doc/targetcli_reference.html
-doc/targetcli_reference.pdf
-doc/targetcli_reference_for_print.pdf
-doc/rtslogo.png
diff --git a/debian/targetcli-fb.dirs b/debian/targetcli-fb.dirs
deleted file mode 100644
index f430183..0000000
--- a/debian/targetcli-fb.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/python-support/
diff --git a/debian/targetcli-fb.docs b/debian/targetcli-fb.docs
deleted file mode 100644
index 7758d58..0000000
--- a/debian/targetcli-fb.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.md
-COPYING
diff --git a/debian/targetcli-fb.install b/debian/targetcli-fb.install
deleted file mode 100644
index 5a1dd4b..0000000
--- a/debian/targetcli-fb.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/targetcli      usr/share/python-support
-bin /usr
diff --git a/debian/targetcli-fb.postinst b/debian/targetcli-fb.postinst
deleted file mode 100755
index 8412fc6..0000000
--- a/debian/targetcli-fb.postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-for lib in lib lib64; do
-	for python in python2.6; do
-		if [ -e /usr/${lib}/${python} ]; then
-			if [ ! -e /usr/${lib}/${python}/targetcli ]; then
-				mkdir /usr/${lib}/${python}/targetcli
-				for source in /usr/share/python-support/targetcli/targetcli/*.py; do
-					ln -sf ${source} /usr/${lib}/${python}/targetcli/
-				done
-				python_path=$(which ${python} 2>/dev/null)
-				if [ ! -z $python_path ]; then
-					${python} -c "import compileall; compileall.compile_dir('/usr/${lib}/${python}/targetcli', force=1)"
-				fi
-			fi
-		fi
-	done
-done
diff --git a/debian/targetcli-fb.preinst b/debian/targetcli-fb.preinst
deleted file mode 100755
index 58f5f2a..0000000
--- a/debian/targetcli-fb.preinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f /usr/share/python-support/targetcli/targetcli/*.pyc
-rm -f /usr/share/python-support/targetcli/targetcli/*.pyo
diff --git a/debian/targetcli-fb.prerm b/debian/targetcli-fb.prerm
deleted file mode 100755
index 7603750..0000000
--- a/debian/targetcli-fb.prerm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-for lib in lib lib64; do
-	for python in python2.6; do
-		if [ -e /usr/${lib}/${python}/targetcli ]; then
-			rm -rf /usr/${lib}/${python}/targetcli
-		fi
-	done
-done