[med-svn] [Git][med-team/heudiconv][master] 14 commits: routine-update: New upstream version

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Nov 17 10:41:51 GMT 2021



Andreas Tille pushed to branch master at Debian Med / heudiconv


Commits:
4e426769 by Andreas Tille at 2021-11-17T10:33:49+01:00
routine-update: New upstream version

- - - - -
f85fb3e0 by Andreas Tille at 2021-11-17T10:41:37+01:00
New upstream version 0.10.0
- - - - -
fec813ba by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: Standards-Version: 4.6.0

- - - - -
02f56225 by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: debhelper-compat 13

- - - - -
8a0aeb19 by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: Secure URI in copyright format

- - - - -
9726959f by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: Remove trailing whitespace in debian/rules

- - - - -
3be18b85 by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: Do not parse d/changelog

- - - - -
1637a674 by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: Add salsa-ci file

- - - - -
ee8d2024 by Andreas Tille at 2021-11-17T10:41:37+01:00
routine-update: Rules-Requires-Root: no

- - - - -
8abaff75 by Andreas Tille at 2021-11-17T10:41:38+01:00
Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse.

Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html
Fixes: lintian: upstream-metadata-missing-bug-tracking
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html
Fixes: lintian: upstream-metadata-missing-repository
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html

- - - - -
b937a802 by Andreas Tille at 2021-11-17T10:41:38+01:00
routine-update: watch file standard 4

- - - - -
4265f1de by Andreas Tille at 2021-11-17T10:41:38+01:00
New upstream version 0.9.0
- - - - -
b6480aab by Andreas Tille at 2021-11-17T10:42:06+01:00
Revert to version 0.9.0 since 0.10.0 has test issues and thus fails to build

- - - - -
30d5c007 by Andreas Tille at 2021-11-17T10:44:37+01:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/rules
- + debian/salsa-ci.yml
- + debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,20 @@
-heudiconv (0.9.0-3) UNRELEASED; urgency=medium
+heudiconv (0.9.0-3) unstable; urgency=medium
 
   * Team upload.
   * remove debian/gbp.conf
   * Move package to Debian Med team
-
- -- Andreas Tille <tille at debian.org>  Wed, 17 Nov 2021 10:20:14 +0100
+  * Standards-Version: 4.6.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Secure URI in copyright format (routine-update)
+  * Remove trailing whitespace in debian/rules (routine-update)
+  * Do not parse d/changelog (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * watch file standard 4 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 17 Nov 2021 10:42:36 +0100
 
 heudiconv (0.9.0-2.1) unstable; urgency=medium
 


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


=====================================
debian/control
=====================================
@@ -1,9 +1,10 @@
 Source: heudiconv
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Michael Hanke <mih at debian.org>, Yaroslav Halchenko <debian at onerussian.com>
+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 (= 13),
                dh-python,
                python3-all,
                python3-datalad,
@@ -12,14 +13,16 @@ Build-Depends: debhelper (>= 10),
                python3-setuptools,
                python3-six,
                python3-pytest,
-               python3-nipype (>= 1.2.3~), dcm2niix,
+               python3-nipype,
+               dcm2niix,
                help2man,
                python3-dcmstack,
-               python3-dicom,
-Standards-Version: 4.3.0
+               python3-dicom
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/heudiconv
 Vcs-Git: https://salsa.debian.org/med-team/heudiconv.git
 Homepage: https://github.com/nipy/heudiconv
+Rules-Requires-Root: no
 
 Package: heudiconv
 Architecture: all
@@ -31,10 +34,10 @@ Depends: ${misc:Depends},
          python3-filelock,
          python3-nibabel,
          python3-numpy,
-         python3-nipype (>= 1.2.3~),
+         python3-nipype
 Recommends: python3-pytest,
             python3-datalad,
-            python3-etelemetry,
+            python3-etelemetry
 Description: DICOM converter with support for structure heuristics
  This is a flexible dicom converter for organizing brain imaging data into
  structured directory layouts. It allows for flexible directory layouts and


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: heudiconv
 Source: https://github.com/nipy/heudiconv
 


=====================================
debian/rules
=====================================
@@ -1,15 +1,5 @@
 #!/usr/bin/make -f
 
-srcpkg = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Source:' | cut -d ' ' -f 2,2)
-debver = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Version:' | cut -d ' ' -f 2,2 )
-upstreamver = $(shell echo $(debver) | cut -d '-' -f 1,1 )
-
-# this figures out the last merge point from 'master' into the Debian branch and
-# then described this commit relative to the last release tag (V...)
-# If this should make any sense the local master branch must track upstream's
-# master or whatever other source branch.
-gitver = $(shell [ -x /usr/bin/git ] && git describe --tags --match 'v[0-9].*' $$(git merge-base -a HEAD master) | sed -e 's/^v//' -e 's/-/+git/')
-
 export DH_VERBOSE = 1
 export PYBUILD_NAME = heudiconv
 
@@ -21,13 +11,12 @@ export EMAIL=debian at example.com
 export GIT_AUTHOR_NAME="The Name"
 export GIT_COMMITTER_NAME=$(GIT_AUTHOR_NAME)
 
-# one ring to rule them all ...
 %:
 	dh $@ --buildsystem=pybuild
 
 override_dh_auto_install:
 	dh_auto_install
-	mkdir -p build 
+	mkdir -p build
 	PYTHONPATH=$$(/bin/ls -d ./debian/heudiconv/usr/lib/python*/*-packages | head -n 1)
 	help2man -n 'DICOM converter for organizing brain imaging data into structured directory layouts' \
 		-N --no-discard-stderr \
@@ -38,14 +27,8 @@ override_dh_auto_install:
 	find debian -name __pycache__ | xargs rm -rf
 
 
-clean::
+override_dh_clean:
 	dh_clean
 	# Ahhhhhhh!
 	rm -rf .pybuild build .pytest_cache/
 	-rm -rf heudiconv.egg-info/
-
-# make orig tarball from repository content
-get-orig-source:
-	# orig tarball, turn directory into something nicer
-	git archive --format=tar --prefix=$(srcpkg)-$(gitver)/ HEAD | \
-		gzip -9 > $(srcpkg)_$(gitver).orig.tar.gz


=====================================
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


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/nipy/heudiconv/issues
+Bug-Submit: https://github.com/nipy/heudiconv/issues/new
+Repository: https://github.com/nipy/heudiconv.git
+Repository-Browse: https://github.com/nipy/heudiconv


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts="filenamemangle=s/.*\/v(\d)\.(\d).*/heudiconv-$1.$2\.tar\.gz/" \
   http://github.com/nipy/heudiconv/tags .*archive/.*/v(\d[\d.]+).tar.gz



View it on GitLab: https://salsa.debian.org/med-team/heudiconv/-/compare/d15f3ca82dd3b9bbb1e8199eaac0f1261f9d5768...30d5c0073bbe5ca1c5f68c26ff346d73bbde3cf3

-- 
View it on GitLab: https://salsa.debian.org/med-team/heudiconv/-/compare/d15f3ca82dd3b9bbb1e8199eaac0f1261f9d5768...30d5c0073bbe5ca1c5f68c26ff346d73bbde3cf3
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/20211117/3faf43de/attachment-0001.htm>


More information about the debian-med-commit mailing list