Python3 support in place, but package not building yet

diff --git a/debian/changelog b/debian/changelog
index 8f475194b6f2dfc4f69a797ce6dff5c93ab1a78e..3617315747401290ceba03069fb66fbba8879eff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-pysam (0.8.1-1) UNRELEASED; urgency=medium
+
+  [ Jorge Soares ]
+  * New upstream version
+
+ -- Jorge Soares <j.s.soares@gmail.com>  Wed, 26 Nov 2014 09:34:45 +0200
+
 python-pysam (0.8.0-1) UNRELEASED; urgency=medium
 
   [ Charles Plessy ]

diff --git a/debian/control b/debian/control
index 4c5fa6798dab331b1bfb435480fe5403b37a4f43..c06da2eb65794f8806b2dc5613a1ffefda28b07f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,9 @@ Section: python
 XS-Testsuite: autopkgtest
 Priority: optional
 Build-Depends: debhelper (>= 9),
-              dh-python,
               python-all-dev,
               python-setuptools,
               cython,
-              dh-python3,
               python3-all-dev,
               python3-setuptools,
               cython3,

diff --git a/debian/rules b/debian/rules
index 990128cf12fd594ceb2e1eca52f71f9ad6a82b2a..423cfce6e33239ccd1476e56f3ecd18e6b7229f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,40 +10,40 @@ HTSLIBDIR  := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 # DEB_BUILD_OPTIONS := nocheck
 
 %:
-       dh $@ --with python3 --buildsystem=pybuild
-
-# Make sure Cython is recreating some c-files.  To enable building twice in a
-# row these will be saved in advance and restored afterwards
-# debian/savefiles:
-#      if grep -q -l "Generated by Cython" pysam/*.c ; then \
-#          mkdir -p debian/savefiles ; \
-#          mv `grep -l "Generated by Cython" pysam/*.c` debian/savefiles ; \
-#      fi
-
-# override_dh_clean:
-#      dh_clean
-#      # restore cython generated files
-#      if [ -d debian/savefiles ] ; then \
-#          mv debian/savefiles/* pysam ; \
-#          rm -rf debian/savefiles ; \
-#      fi
-
-# override_dh_auto_build: debian/savefiles
-#      HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include dh_auto_build
-
-# override_dh_auto_test:
-# ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#      LC_ALL=C.UTF-8 dh_auto_test -- --test --system=custom \
-#              --test-args='set -e; \
-#                           cp -a $(CURDIR)/tests {build_dir}/tests ; \
-#                           cd {build_dir}/tests && HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include PYTHONPATH={build_dir} {interpreter} ./pysam_test.py \
-#                                                && HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include PYTHONPATH={build_dir} {interpreter} ./tabix_test.py '
-# endif
-
-# override_dh_install-indep:
-#      dh_install -p $(TESTPKG)
-#      cd debian/$(TESTPKG)/usr/share/doc/python-pysam/tests; \
-#          make clean; \
-#          rm -f log.txt ; \
-#          chmod a+x tabix_test.py
+       dh $@ --with python2,python3 --buildsystem=pybuild
+
+#Make sure Cython is recreating some c-files.  To enable building twice in a
+#row these will be saved in advance and restored afterwards
+debian/savefiles:
+       if grep -q -l "Generated by Cython" pysam/*.c ; then \
+           mkdir -p debian/savefiles ; \
+           mv `grep -l "Generated by Cython" pysam/*.c` debian/savefiles ; \
+       fi
+
+override_dh_clean:
+       dh_clean
+# restore cython generated files
+       if [ -d debian/savefiles ] ; then \
+           mv debian/savefiles/* pysam ; \
+           rm -rf debian/savefiles ; \
+       fi
+
+override_dh_auto_build: debian/savefiles
+       HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include dh_auto_build
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+       LC_ALL=C.UTF-8 dh_auto_test -- --test --system=custom \
+               --test-args='set -e; \
+                            cp -a $(CURDIR)/tests {build_dir}/tests ; \
+                            cd {build_dir}/tests && HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include PYTHONPATH={build_dir} {interpreter} ./pysam_test.py \
+                                                 && HTSLIB_LIBRARY_DIR=$(HTSLIBDIR) HTSLIB_INCLUDE_DIR=/usr/include PYTHONPATH={build_dir} {interpreter} ./tabix_test.py '
+endif
+
+override_dh_install-indep:
+       dh_install -p $(TESTPKG)
+       cd debian/$(TESTPKG)/usr/share/doc/python-pysam/tests; \
+           make clean; \
+           rm -f log.txt ; \
+           chmod a+x tabix_test.py