[med-svn] [python-ruffus] 02/05: Upstream plans a new release based on our hints. This packaging should match the new release

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository python-ruffus.

commit 14d47abb41660c302c089e9e753e8c9d89be0816
Author: Andreas Tille <tille at debian.org>
Date:   Tue Mar 10 11:50:12 2015 +0100

    Upstream plans a new release based on our hints.  This packaging should match the new release
---
 debian/changelog                         |  2 +-
 debian/patches/run_test_executable.patch | 17 +++++++++++++++++
 debian/patches/series                    |  1 +
 debian/python-ruffus-doc.docs            |  2 +-
 debian/rules                             | 11 ++++++-----
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f6c354..5e22738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-ruffus (2.5+dfsg-1) UNRELEASED; urgency=low
+python-ruffus (2.6~beta2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #<bug>)
 
diff --git a/debian/patches/run_test_executable.patch b/debian/patches/run_test_executable.patch
new file mode 100644
index 0000000..a6e4c2e
--- /dev/null
+++ b/debian/patches/run_test_executable.patch
@@ -0,0 +1,17 @@
+Description: run_test executable
+Author: Andreas Tille <tille at debian.org>
+
+--- a/ruffus/test/run_all_unit_tests.cmd
++++ b/ruffus/test/run_all_unit_tests.cmd
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ echo Running test_file_name_parameters.py                                           && \
+ python  -m unittest test_file_name_parameters                                       && \
+ echo Running test_exceptions.py                                                     && \
+--- a/ruffus/test/run_all_unit_tests3.cmd
++++ b/ruffus/test/run_all_unit_tests3.cmd
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ echo Running test_file_name_parameters.py                                           && \
+ python3 -m unittest test_file_name_parameters                                       && \
+ echo Running test_exceptions.py                                                     && \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7fbc074
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+run_test_executable.patch
diff --git a/debian/python-ruffus-doc.docs b/debian/python-ruffus-doc.docs
index 8c183b2..e5ed74f 100644
--- a/debian/python-ruffus-doc.docs
+++ b/debian/python-ruffus-doc.docs
@@ -1,2 +1,2 @@
 ruffus/test
-doc/_build/latex/ruffus.pdf
+doc/static_data/ruffus.pdf
diff --git a/debian/rules b/debian/rules
index 3045e50..7abbeb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ export PYBUILD_NAME=ruffus
 
 override_dh_installdocs:
 	PYTHONPATH=`pwd` make -C doc html
+	## latexpdf # <--- several LaTeX errors occure - just take the PDF provided by upstream
 	dh_installdocs -ppython-ruffus-doc doc/_build/html
 	dh_installdocs -A
 
@@ -20,11 +21,11 @@ override_dh_sphinxdoc:
 	find debian/$(docpkg)/usr/share/doc/$(docpkg)/html -type f -name "*.html" -exec sed -i 's?http://cdn.mathjax.org/mathjax/latest/?/usr/share/javascript/mathjax?g' \{\} \;
 
 override_dh_auto_test:
-### No idea why this fails :-(
-#	LC_ALL=C.UTF-8 dh_auto_test -- --test --system=custom --test-args='set -e; cd ruffus/test; for tst in test*.py ; do {interpreter} $$tst ; done'
-### Try find ...
-#	LC_ALL=C.UTF-8 dh_auto_test -- --test --system=custom --test-args='set -e; cd ruffus/test; find . -type f -name "test*.py" -exec {interpreter} \{\} \; ; done'
-	cd ruffus/test && . $(CURDIR)/debian/tests/run-unit-test
+	# cd ruffus/test && . $(CURDIR)/debian/tests/run-unit-test
+	cd ruffus/test && \
+	sh ./run_all_unit_tests.cmd && \
+	sh ./run_all_unit_tests3.cmd && \
+	rm -rf .ruffus_history.sqlite __pycache__ *.pyc
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-ruffus.git