[med-svn] [python-pysam] 01/02: Python3 support in place, but package not building yet
Jorge Soares
jssoares-guest at moszumanska.debian.org
Wed Nov 26 17:21:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
jssoares-guest pushed a commit to branch master
in repository python-pysam.
commit 37545b8b05a9c49e6442279a72c349642fb17e0a
Author: Jorge Soares <j.s.soares at gmail.com>
Date: Wed Nov 26 17:11:12 2014 +0000
Python3 support in place, but package not building yet
---
debian/changelog | 7 ++++++
debian/control | 2 --
debian/rules | 72 ++++++++++++++++++++++++++++----------------------------
3 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8f47519..3617315 100644
--- 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 at 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 4c5fa67..c06da2e 100644
--- 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 990128c..423cfce 100755
--- 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pysam.git
More information about the debian-med-commit
mailing list