[med-svn] [Git][med-team/khmer][master] 8 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / khmer


Commits:
eabc1126 by Andreas Tille at 2019-01-07T12:32:23Z
debhelper 11

- - - - -
d809c0a8 by Andreas Tille at 2019-01-07T12:34:00Z
Point Vcs fields to salsa.debian.org

- - - - -
e1c36459 by Andreas Tille at 2019-01-07T12:34:00Z
Standards-Version: 4.3.0

- - - - -
13f322a5 by Andreas Tille at 2019-01-07T12:34:02Z
Drop useless get-orig-source target

- - - - -
92839918 by Andreas Tille at 2019-01-07T12:37:07Z
Respect DEB_BUILD_OPTIONS in override_dh_auto_test target

- - - - -
0f665883 by Andreas Tille at 2019-01-07T12:37:07Z
Drop ancient X-Python-Version field

- - - - -
464b6b58 by Andreas Tille at 2019-01-07T14:22:18Z
package khmer is: Multi-Arch: foreign

- - - - -
bfaee765 by Andreas Tille at 2019-01-07T14:35:51Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,20 @@
-khmer (2.1.2+dfsg-4) UNRELEASED; urgency=medium
+khmer (2.1.2+dfsg-4) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Michael R. Crusoe ]
   * deal with embedded-javascript-library.
 
- -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sun, 11 Feb 2018 03:06:00 -0800
+  [ Andreas Tille ]
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.3.0
+  * Drop useless get-orig-source target
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
+  * Drop ancient X-Python-Version field
+  * package khmer is: Multi-Arch: foreign
+
+ -- Andreas Tille <tille at debian.org>  Mon, 07 Jan 2019 15:22:24 +0100
 
 khmer (2.1.2+dfsg-3) unstable; urgency=medium
 


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


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Michael R. Crusoe <michael.crusoe at gmail.com>,
            Kevin Murray <spam at kdmurray.id.au>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                dh-python,
                dh-exec,
                python3-guzzle-sphinx-theme,
@@ -23,11 +23,10 @@ Build-Depends: debhelper (>= 10),
                asciidoctor,
                libjs-jquery,
                libjs-twitter-bootstrap
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/khmer.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/khmer.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/med-team/khmer
+Vcs-Git: https://salsa.debian.org/med-team/khmer.git
 Homepage: http://khmer.readthedocs.org
-X-Python-Version: 3.4
 
 Package: khmer-common
 Architecture: all
@@ -45,7 +44,7 @@ Description: common files for the khmer project tools
 
 Package: khmer
 Architecture: amd64 any-arm64 any-ia64 any-sparc64
-Multi-Arch: same
+Multi-Arch: foreign
 Depends: khmer-common,
          python3 (>= 3.3),
          python3-screed (>= 1.0),


=====================================
debian/rules
=====================================
@@ -23,12 +23,13 @@ override_dh_auto_build:
 	cd src/oxli && $(MAKE) clean all
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_install
 	PYBUILD_SYSTEM=custom \
 	    PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/lib/khmer/bin:$$PATH ; \
 	    cd {build_dir}; export PYTHONPATH=$$(pwd); {interpreter} -m pytest \
 	    -m 'not known_failing and not jenkins and not huge'" dh_auto_test
-
+endif
 
 override_dh_auto_clean:
 	dh_auto_clean || /bin/true
@@ -43,5 +44,3 @@ override_dh_install:
 override_dh_sphinxdoc:
 	dh_sphinxdoc -X jquery.js
 
-get-orig-source:
-	uscan --verbose --force-download --repack --compression xz



View it on GitLab: https://salsa.debian.org/med-team/khmer/compare/412b2acf0134e38427f24ad8f759327f9f476460...bfaee76542be628908ef3784d2f481afe604fac4

-- 
View it on GitLab: https://salsa.debian.org/med-team/khmer/compare/412b2acf0134e38427f24ad8f759327f9f476460...bfaee76542be628908ef3784d2f481afe604fac4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190107/c2a3b61e/attachment-0001.html>