[med-svn] [Git][med-team/mrtrix3][master] 7 commits: Architecture: any-amd64 arm64

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mrtrix3


Commits:
e06e684d by Andreas Tille at 2020-03-12T14:13:47+01:00
Architecture: any-amd64 arm64

- - - - -
3c8b0e0d by Andreas Tille at 2020-03-12T14:14:07+01:00
routine-update: Standards-Version: 4.5.0

- - - - -
faa4251f by Andreas Tille at 2020-03-12T14:14:07+01:00
routine-update: debhelper-compat 12

- - - - -
893c5b4f by Andreas Tille at 2020-03-12T14:18:03+01:00
routine-update: DEB_BUILD_OPTIONS allow override_dh_auto_test

- - - - -
6a2dc3a9 by Andreas Tille at 2020-03-12T14:18:03+01:00
routine-update: Add salsa-ci file

- - - - -
8589ae50 by Andreas Tille at 2020-03-12T14:18:03+01:00
routine-update: Rules-Requires-Root: no

- - - - -
dfe0b351 by Andreas Tille at 2020-03-12T15:04:05+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/rules
- + debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,18 @@
-mrtrix3 (3.0~rc3+git135-g2b8e7d0c2-5) UNRELEASED; urgency=medium
+mrtrix3 (3.0~rc3+git135-g2b8e7d0c2-5) unstable; urgency=medium
 
+  * Team upload.
   * Build-Depends: s/qtbase5-dev-tools/qtbase5-dev/
     Closes: #949526
-
- -- Andreas Tille <tille at debian.org>  Wed, 22 Jan 2020 11:30:53 +0100
+  * Architecture: any-amd64 arm64
+    Closes: #953063, #916284
+  * Standards-Version: 4.5.0 (routine-update)
+  * debhelper-compat 12 (routine-update)
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine-
+    update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Thu, 12 Mar 2020 14:18:14 +0100
 
 mrtrix3 (3.0~rc3+git135-g2b8e7d0c2-4) unstable; urgency=medium
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Michael Hanke <mih at debian.org>,
            Yaroslav Halchenko <debian at onerussian.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper-compat (= 12),
                dh-python,
                liboctave-dev,
                libgsl-dev | libgsl0-dev,
@@ -20,13 +20,14 @@ Build-Depends: debhelper (>= 10~),
                libtiff-dev,
                matlab-support-dev,
                bc,
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/mrtrix3
 Vcs-Git: https://salsa.debian.org/med-team/mrtrix3.git
 Homepage: https://www.mrtrix.org
+Rules-Requires-Root: no
 
 Package: mrtrix3
-Architecture: any
+Architecture: any-amd64 arm64
 Section: science
 Depends: ${shlibs:Depends},
          ${misc:Depends},


=====================================
debian/rules
=====================================
@@ -41,7 +41,9 @@ override_dh_install:
 	find debian -name __pycache__ -type d | xargs rm -rf
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	./run_tests || { cat testing.log; exit 1; }
+endif
 
 override_dh_link:
 	cp debian/mrtrix3.links.in debian/mrtrix3.links


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml



View it on GitLab: https://salsa.debian.org/med-team/mrtrix3/-/compare/6993054a419ff96ce68d86720373592c36ef5e3c...dfe0b3512b9976233dd7dbe6f9f4043761b1050c

-- 
View it on GitLab: https://salsa.debian.org/med-team/mrtrix3/-/compare/6993054a419ff96ce68d86720373592c36ef5e3c...dfe0b3512b9976233dd7dbe6f9f4043761b1050c
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/20200312/6bc02a57/attachment-0001.html>