Merge branch 'separate-tests-package'
authorAfif Elghraoui <afif@ghraoui.name>
Thu, 23 Jul 2015 06:20:29 +0000 (23:20 -0700)
committerAfif Elghraoui <afif@ghraoui.name>
Thu, 23 Jul 2015 06:24:11 +0000 (23:24 -0700)
Conflicts:
debian/tests/control
Restore the separate tests package, but don't use it
for autopkgtest yet.

1  2 
debian/control
debian/rules

diff --cc debian/control
Simple merge
diff --cc debian/rules
index 05e4a0ede350416b20a83b3014e0380708546801,a6b2252825098382dec10199e657906814c6eb6c..da5b0e84962d319ce34e661017e68d0a642dc3a8
@@@ -15,8 -13,17 +16,13 @@@ export PYBUILD_TEST_ARGS={dir}/test
  %:
        LC_ALL=C.UTF-8 dh $@ --with python2,python3 --buildsystem=pybuild
  
- # Testing and building the test data are handled by autopkgtest,
- # but debian/rules must be able to clean up after it.
+ override_dh_auto_build:
+       dh_auto_build
+       $(MAKE) -C tests/pysam_data
+ override_dh_install:
+       dh_install -Xtest.gtf.gz
 -override_dh_auto_test:
 -#nothing to test until pysam is installed.
 -#test package is provided for both Python versions
 -
  override_dh_auto_clean:
        dh_auto_clean
        $(MAKE) -C tests/pysam_data clean