Revert changes in d/rules and deactivate RPATH patch

diff --git a/debian/changelog b/debian/changelog
index e886b01bd11aee42ca22df01ebb6271c0905cd4e..f42253eecf4fc13c66fcd95eec61944562432b9b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ python-pysam (0.10.0+ds-1) UNRELEASED; urgency=medium
 
   [ Andreas Tille ]
   * d/rules: Remove redundant get-orig-source target
-  * provide LD_LIBRARY_PATH for run time test to avoid RPATH setting
 
  -- Afif Elghraoui <afif@debian.org>  Mon, 23 Jan 2017 19:13:47 -0800
 

diff --git a/debian/patches/series b/debian/patches/series
index da8b79080b4d9bdb52ef264ac43f936283f0956a..446c7fc94e998d0fa888b77ce302b702ad0d7088 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 cdddf037ed230f4021707766f12d548ef99b6451..838cc31ea3dd67fb8ef38fdee6b019c7cd4a74e8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,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
@@ -33,9 +33,7 @@ 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 -- --test --system=custom \
-                       --test-args='set -x; echo "{build_dir}/pysam {interpreter}"; LD_LIBRARY_PATH={build_dir}/pysam {interpreter} -m nose'
+       dh_auto_test
 
 override_dh_auto_clean:
        dh_auto_clean