[SCM] Packaging for pytables branch, master, updated. debian/2.4.0-1-41-g31a9d4c

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 31a9d4ccd3e6738cb21e0ec5343614f134579531
Merge: c098989d4316156c2b46f26124b8ef0e346d47f4 6d4da16ac091e78037e4553e39aee0250e9587f5
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Jun 24 22:57:41 2013 +0200

    Merge branch '2.4.0-4'

diff --combined debian/changelog
index e643f8f,1e43ead..ea9be81
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,13 +1,27 @@@
 +pytables (3.0.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +  * Fix PDF doc installation after upstream changes
 +  * Added a man page for the new pt2pt3 command line tool
 +  * Build-Depend on numexpr >= 2.1
 +  * Minimum Python version is now 2.6
 +  * New packages for Python 3
 +  * Refresh all patches
 +  * Drop 0002-Fix-detection-od-platforms-supporting-blosc.patch
 +    (applied upstream)
 +
 + -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 23 Jun 2013 14:14:23 +0000
 +
+ pytables (2.4.0-4) unstable; urgency=low
+ 
+   * Fix the override_dh_sphinxdoc rule to avoid failures when the -doc
+     package is not built
+ 
+  -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 24 Jun 2013 20:20:45 +0000
+ 
  pytables (2.4.0-3) unstable; urgency=low
  
 -  * Added build-deendency from jquery-cookie and updated debian/rules
 +  * Added build-dependency from jquery-cookie and updated debian/rules
      to avoid embedded javascript
    * New patch: fix tests of nested record reperesentation on big-endian
      machines.  Backport of upstream fix for gh-237 (see also
diff --combined debian/rules
index 4bb558b,d8d83aa..5f838e6
--- a/debian/rules
+++ b/debian/rules
@@@ -4,30 -4,19 +4,30 @@@
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
 +
 +# Get the supported Python versions
 +PY2VERS = $(shell pyversions -r -v)
 +PY3VERS = $(shell py3versions -r -v)
 +
  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
  export CFLAGS ?= -O0
  endif
 -PY2VERS=$(shell pyversions -vs)
 +
  
  %:
 -	dh $@ --with python2 --with sphinxdoc --buildsystem=python_distutils
 +	dh $@ --with python2,python3 --with sphinxdoc --buildsystem=python_distutils
 +
  
 +build-python%:
 +	python$* setup.py build
 +	python$*-dbg setup.py build
  
 -override_dh_auto_build:
 +
 +override_dh_auto_build: $(PY3VERS:%=build-python%)
  ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 -	$(MAKE)
 -	mv doc/usersguide-?.?.?.pdf doc/usersguide.pdf
 +	$(MAKE) PWD=$(CURDIR)
 +	$(MAKE) -C doc PWD=$(CURDIR) latexpdf
 +	mv doc/build/latex/usersguide-*.pdf doc/usersguide.pdf
  else
  	$(MAKE) ANNOUNCE.txt
  	$(MAKE) -C src all
@@@ -37,28 -26,16 +37,28 @@@ endi
  	dh_auto_build --buildsystem=python_distutils
  
  
 +install-python%:
 +	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 +	python$*-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 +
 +
 +override_dh_auto_install: $(PY3VERS:%=install-python%)
 +	dh_auto_install
 +
 +
  override_dh_install:
  	# Install everything excluding the *_d.so debug extensions to python-tables
  	dh_install -X"*_d.so" "debian/tmp/usr/lib/python2*" -p python-tables
 +	dh_install -X"*dmu.so" -X"*dm.so" "debian/tmp/usr/lib/python3*" -p python3-tables
  
  	# Install the debug extensions to python-tables-dbg
  	dh_install "debian/tmp/usr/lib/python2*/*-packages/tables/*_d.so" -p python-tables-dbg
 +	dh_install "debian/tmp/usr/lib/python3*/*-packages/tables/*.cpython-??dm*.so" -p python3-tables-dbg
  
  	# Continue with regular dh_install
  	dh_install -p python-tables-doc
  	dh_numpy
 +	dh_numpy3
  	# using override_dh_auto_test causes problems for dbg versions
  ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
  	set -e -x; \
@@@ -68,13 -45,6 +68,13 @@@
  		cd $(CURDIR)/debian/tmp/usr/lib/python$$py/dist-packages; \
  		env PYTHONPATH=. python$$py-dbg tables/tests/test_all.py -vvv; \
  	done
 +	set -e -x; \
 +	for py in $(PY3VERS); do \
 +		cd $(CURDIR)/build/lib.*-$$py; \
 +		env PYTHONPATH=. python$$py tables/tests/test_all.py -vvv; \
 +		cd $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages; \
 +		env PYTHONPATH=. python$$py-dbg tables/tests/test_all.py -vvv; \
 +	done
  endif
  
  
@@@ -84,12 -54,15 +84,12 @@@ override_dh_auto_clean
  	#dh_auto_clean --buildsystem=python_distutils
  	$(MAKE) distclean
  	rm -f doc/*.pdf
 -	# distutils.ccompiler leaves this behind
 -	rm -f a.out
 -	rm -rf tmp/
  
  
  override_dh_sphinxdoc:
  ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
  	dh_sphinxdoc -ppython-tables-doc
- 	rm $(CURDIR)/debian/python-tables-doc/usr/share/doc/python-tables-doc/html/_static/jquery.cookie.js
+ 	rm -f $(CURDIR)/debian/python-tables-doc/usr/share/doc/python-tables-doc/html/_static/jquery.cookie.js
  endif
  
  
@@@ -101,6 -74,5 +101,6 @@@ override_dh_compress
  	dh_compress -X.txt -X.pdf -X.py -X.h5
  
  
 -.PHONY: override_dh_auto_build override_dh_auto_clean override_dh_sphinxdoc \
 -        override_dh_install override_dh_installchangelogs override_dh_compress
 +.PHONY: override_dh_auto_build override_dh_auto_install override_dh_auto_clean \
 +        override_dh_sphinxdoc override_dh_install \
 +        override_dh_installchangelogs override_dh_compress

-- 
Packaging for pytables