[med-svn] [Git][med-team/paleomix][master] 5 commits: Try to fix test

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / paleomix


Commits:
ba0a2620 by Andreas Tille at 2018-01-17T11:53:58+01:00
Try to fix test

- - - - -
d338fb3e by Andreas Tille at 2018-01-17T12:01:10+01:00
d/rules: do not parse d/changelog

- - - - -
ce3a102f by Andreas Tille at 2018-01-17T12:01:21+01:00
debhelper 11

- - - - -
eeff14d8 by Andreas Tille at 2018-01-17T12:01:32+01:00
Standards-Version: 4.1.3

- - - - -
98efa637 by Andreas Tille at 2018-02-28T13:30:43+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules
- debian/tests/control
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-paleomix (1.2.12-1) UNRELEASED; urgency=medium
+paleomix (1.2.12-1) unstable; urgency=medium
 
   * New upstream version
-  * Standards-Version: 4.1.1
   * Exclude one test that strangely fails
+  * d/rules: do not parse d/changelog
+  * debhelper 11
+  * Standards-Version: 4.1.3
 
- -- Andreas Tille <tille at debian.org>  Thu, 16 Nov 2017 09:39:02 +0100
+ -- Andreas Tille <tille at debian.org>  Wed, 17 Jan 2018 12:01:36 +0100
 
 paleomix (1.2.7-1) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                dh-python,
                python,
                python-setuptools,
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 10),
                default-jre-headless,
                bowtie2,
                rsync
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/paleomix.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/paleomix.git
 Homepage: http://geogenetics.ku.dk/publications/paleomix


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
 
 # DH_VERBOSE := 1
 export LC_ALL=C.UTF-8
 
-#export PYBUILD_TEST_ARGS = --exclude='(test_requirementobj__version__command_not_executable)'
+export PYBUILD_TEST_ARGS = --exclude='(test_requirementobj__version__command_not_executable)'
 
 %:
 	dh $@ --with python2 --buildsystem=pybuild
@@ -36,9 +36,9 @@ override_dh_installdocs:
 	# since tests dir contains empty files which are used afterwards for
 	# testing and dh_installdocs is ignoring empty files we need to make
 	# sure all files are really copied
-	rsync -a -v tests debian/$(DEBPKGNAME)/usr/share/doc/$(DEBPKGNAME)
+	rsync -a -v tests debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)
 	# test runner is seeking for paleomix modules in source - we use inside the installed package
-	sed -i 's:(find paleomix -mindepth 1:(find /usr/lib/python2.7/dist-packages/paleomix -mindepth 1:' debian/*/usr/share/doc/*/tests/run
+	### sed -i 's:(find paleomix -mindepth 1:(find /usr/lib/python2.7/dist-packages/paleomix -mindepth 1:' debian/*/usr/share/doc/*/tests/run
 	#echo "======  Also empty files belong to the docs ======"
 	#find debian -name "empty_file*"
 	#find debian -name "timestamp_*"


=====================================
debian/tests/control
=====================================
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @
+Depends: @, tox
 Restrictions: allow-stderr


=====================================
debian/tests/run-unit-test
=====================================
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -19,5 +19,4 @@ for gz in `find . -name "*.gz"` ; do
     fi
 done
 
-chmod +x tests/run
-tests/run
+tox
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/med-team/paleomix/compare/41f9c710cf935a5ae61f3f5d8903367dcf9bf8c2...98efa63785554c02eafdb5b6d972f14951465af0

---
View it on GitLab: https://salsa.debian.org/med-team/paleomix/compare/41f9c710cf935a5ae61f3f5d8903367dcf9bf8c2...98efa63785554c02eafdb5b6d972f14951465af0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180228/e5d77876/attachment-0001.html>