Revert "Revert changes in d/rules and deactivate RPATH patch"

This reverts commit b8a194c46277fb95b365484360652b765380ffdb.

Conflicts:
	debian/changelog

diff --git a/debian/patches/series b/debian/patches/series
index 446c7fc94e998d0fa888b77ce302b702ad0d7088..da8b79080b4d9bdb52ef264ac43f936283f0956a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# rpath.patch
+rpath.patch

diff --git a/debian/rules b/debian/rules
index 45f2fff664e06d188467884d10eb7364a708483d..1534c65df7db2eb69b7d906653755d3ebe649d67 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,12 @@ HTSLIBDIR  := /usr/lib/$(DEB_HOST_MULTIARCH)
 export HTSLIB_LIBRARY_DIR=$(HTSLIBDIR)
 export HTSLIB_INCLUDE_DIR=/usr/include
 
-export PYBUILD_TEST_NOSE=1
+#export PYBUILD_TEST_NOSE=1
 # pybuild calls nosetests as `python{version} -m nose tests`
 #
 # The "tests" argument (passed by pybuild as shown above) fails,
 # so don't pass anything:
-export PYBUILD_TEST_ARGS=
+#export PYBUILD_TEST_ARGS=
 # This is how we pass parameters to nose without command-line flags
 export NOSE_WHERE=$(CURDIR)/tests
 export NOSE_VERBOSE=2
@@ -35,7 +35,9 @@ override_dh_install: clean-tests
        dh_install -Xtest.gtf.gz
 
 override_dh_auto_test: pysam_data.all cbcf_data.all
-       dh_auto_test
+       #dh_auto_test
+       dh_auto_test -- --test --system=custom \
+                       --test-args='set -x; echo "{build_dir}/pysam {interpreter}"; LD_LIBRARY_PATH={build_dir}/pysam {interpreter} -m nose'
 
 override_dh_auto_clean:
        dh_auto_clean