[pyferret] 07/110: Now into packaging cuts

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit 7ebc398342d788bb5e2a1afccb2c4e1fd530a67f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 18 16:17:30 2014 +0000

    Now into packaging cuts
---
 debian/control               |  2 +-
 debian/python-ferret.install |  2 +-
 debian/rules                 | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 84c8d0f..7ea8f54 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), libreadline-dev, libcurl4-openssl-dev | libcurl
 Package: python-ferret
 Architecture: any
 Section: python
-Depends: ${misc:Depends}, ${shlibs:Depends}, ferret-vis, python
+Depends: ${misc:Depends}, ${shlibs:Depends}, ferret-vis, python, ${python:Depends}
 Recommends: ferret-datasets
 Description: Python wrapper for the Ferret visualization and analysis environment,
  Ferret is an interactive computer visualization and analysis environment
diff --git a/debian/python-ferret.install b/debian/python-ferret.install
index ac650e8..1842cea 100644
--- a/debian/python-ferret.install
+++ b/debian/python-ferret.install
@@ -1 +1 @@
-usr/lib/python2.7/site-packages/*	/usr/lib/python2.7/dist-packages
+lib/python2.7/site-packages/*	/usr/lib/python2.7/dist-packages
diff --git a/debian/rules b/debian/rules
index 7104ea0..5be308c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,10 @@
 
 # magic debhelper rule
 %:
-	dh $@
+	dh $@ --with python
 
-# FER_EXT:=$(CURDIR)/debian/ferret-vis/usr/lib/ferret-vis/external_functions
 ARCH:=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIBDIR:=/usr/lib/${ARCH}
+LIBDIR:=/usr/lib/$(ARCH)
 INSTALLDIR:=$(CURDIR)/debian/tmp
 
 override_dh_auto_build:
@@ -23,7 +22,10 @@ override_dh_auto_build:
 	cp debian/ef_utility/platform_specific.mk.debian external_functions/ef_utility/platform_specific.mk.debian
 	$(MAKE) HOSTTYPE=debian all
 
-override_dh_test:
+override_dh_auto_install:
+	$(MAKE) HOSTTYPE=debian install
+
+override_dh_auto_test:
 	@echo "Tests bypassed for the moment."
 	# (cd bench && ./run_all )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git