[med-svn] [Git][med-team/connectome-workbench][master] 13 commits: routine-update: Standards-Version: 4.6.0

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Nov 17 08:07:15 GMT 2021 


Andreas Tille pushed to branch master at Debian Med / connectome-workbench


Commits:
159c6092 by Andreas Tille at 2021-11-17T08:47:45+01:00
routine-update: Standards-Version: 4.6.0

- - - - -
147d8a2d by Andreas Tille at 2021-11-17T08:47:45+01:00
routine-update: debhelper-compat 13

- - - - -
f81baae0 by Andreas Tille at 2021-11-17T08:47:49+01:00
routine-update: Secure URI in copyright format

- - - - -
0d3a1947 by Andreas Tille at 2021-11-17T08:47:49+01:00
routine-update: Remove trailing whitespace in debian/changelog

- - - - -
b7695d09 by Andreas Tille at 2021-11-17T08:47:49+01:00
routine-update: Remove trailing whitespace in debian/copyright

- - - - -
29b65eb3 by Andreas Tille at 2021-11-17T08:56:03+01:00
routine-update: Do not parse d/changelog

- - - - -
88f69e67 by Andreas Tille at 2021-11-17T08:56:49+01:00
Remove manual -dbg package

- - - - -
9a76a0e3 by Andreas Tille at 2021-11-17T08:57:07+01:00
routine-update: Add salsa-ci file

- - - - -
3806d20d by Andreas Tille at 2021-11-17T08:57:07+01:00
routine-update: Rules-Requires-Root: no

- - - - -
560bf54e by Andreas Tille at 2021-11-17T08:57:20+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

- - - - -
1c71168f by Andreas Tille at 2021-11-17T08:57:22+01:00
Remove deprecated Encoding key from desktop file debian/connectome-workbench.desktop.

Changes-By: lintian-brush
Fixes: lintian: desktop-entry-contains-encoding-key
See-also: https://lintian.debian.org/tags/desktop-entry-contains-encoding-key.html

- - - - -
5ef0491c by Andreas Tille at 2021-11-17T08:57:24+01:00
Avoid explicitly specifying -Wl,--as-needed linker flag.

Changes-By: lintian-brush
Fixes: lintian: debian-rules-uses-as-needed-linker-flag
See-also: https://lintian.debian.org/tags/debian-rules-uses-as-needed-linker-flag.html

- - - - -
ba43213d by Andreas Tille at 2021-11-17T09:06:55+01:00
Do not fiddle around with d/copyright in d/rules

- - - - -


8 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -5,6 +5,20 @@ connectome-workbench (1.5.0-3) UNRELEASED; urgency=medium
   * Fix copyright of debian/*
   * Move package to Debian Med team
   * Fix watch file
+  * Standards-Version: 4.6.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Secure URI in copyright format (routine-update)
+  * Remove trailing whitespace in debian/changelog (routine-update)
+  * Remove trailing whitespace in debian/copyright (routine-update)
+  * Do not parse d/changelog (routine-update)
+  * Remove manual -dbg package
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+  * Remove deprecated Encoding key from desktop file
+    debian/connectome-workbench.desktop.
+  * Avoid explicitly specifying -Wl,--as-needed linker flag.
 
  -- Andreas Tille <tille at debian.org>  Wed, 17 Nov 2021 08:40:32 +0100
 
@@ -135,8 +149,8 @@ connectome-workbench (1.2.3+git41-gc4c6c90-1) experimental; urgency=medium
 
 connectome-workbench (1.2.3+git3-g7b83782-1) unstable; urgency=medium
 
-  * New upstream snapshot from v1.2.3-3-g7b83782 
-    in attempt to resolve FTBFS on mips,  mipsel due to heavy memory 
+  * New upstream snapshot from v1.2.3-3-g7b83782
+    in attempt to resolve FTBFS on mips,  mipsel due to heavy memory
     resource demand -- some files were moved around and possibly split.
   * debian/control
     - removed libqtwebkit-dev from build-depends (Closes: #784458)


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


=====================================
debian/connectome-workbench.desktop
=====================================
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Connectome Workbench
 GenericName=Human Connectome Project Viewing and Analysis Tools
 Exec=wb_view


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Yaroslav Halchenko <debian at onerussian.com>,
            Michael Hanke <michael.hanke at gmail.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 13),
                help2man,
                cmake,
                libosmesa6-dev,
@@ -18,10 +18,11 @@ Build-Depends: debhelper (>= 9),
                xauth,
                xvfb,
                libftgl-dev
-Standards-Version: 4.4.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/connectome-workbench
 Vcs-Git: https://salsa.debian.org/med-team/connectome-workbench.git
 Homepage: http://www.nitrc.org/projects/workbench/
+Rules-Requires-Root: no
 
 Package: connectome-workbench
 Architecture: any
@@ -38,21 +39,3 @@ Description: brain visualization, analysis and discovery tool
  Package includes wb_command, a command-line program for performing a
  variety of analytical tasks for volume, surface, and CIFTI
  grayordinates data.
-
-Package: connectome-workbench-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         connectome-workbench (= ${binary:Version})
-Description: brain visualization, analysis and discovery tool -- debug symbols
- Connectome Workbench is a brain visualization, analysis and discovery
- tool for fMRI and dMRI brain imaging data, including functional and
- structural connectivity data generated by the Human Connectome
- Project.
- .
- Package includes wb_command, a command-line program for performing a
- variety of analytical tasks for volume, surface, and CIFTI
- grayordinates data.
- .
- This package contains debug symbols for the binaries.


=====================================
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: Connectome Workbench
 Source: http://www.humanconnectome.org/software/get-connectome-workbench.html
 
@@ -173,7 +173,7 @@ License: Qwt-1.0
        Qwt libraries, or link their applications or
        widgets against a user-supplied version of Qwt.
        If you link the application or widget to a modified
-       version of Qwt, then the changes to Qwt must be 
+       version of Qwt, then the changes to Qwt must be
        provided under the terms of the LGPL in sections
        1, 2, and 4.
  .
@@ -544,7 +544,7 @@ License: Apache-2
  .
  Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University.
  .
- Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. 
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
  .
  http://www.apache.org/licenses/LICENSE-2.0


=====================================
debian/rules
=====================================
@@ -1,12 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-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 )
-uver = $(shell echo $(debver) | cut -d '-' -f 1,1 )
-
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-do_parallel=$(shell echo $(DEB_HOST_ARCH) | grep -q mips && echo '' || echo '--parallel')
+do_parallel=$(shell echo $(DEB_HOST_ARCH) | grep -q mips && echo '' || echo '')
 do_help=$(shell echo $(DEB_HOST_ARCH) | grep -q -E '(mipsel|m68k|sh4)' && echo 'OFF' || echo 'ON')
 
 export  http_proxy=http://127.0.0.1:9/
@@ -20,7 +16,6 @@ else
     export CFLAGS += -O2
 endif
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_CFLAGS_MAINT_APPEND = -DNDEBUG
 export DEB_CXXFLAGS_MAINT_APPEND = -DNDEBUG
 
@@ -32,7 +27,6 @@ export DH_VERBOSE=1
 	dh $@ $(do_parallel) --sourcedirectory=src
 
 override_dh_clean:
-	cat src/debian/copyright debian/copyright.debian >| debian/copyright
 	# Bring shipped version back
 	[ -e src/FtglFont.aside ] && mv src/FtglFont.aside src/FtglFont || :
 	dh_clean
@@ -52,12 +46,12 @@ override_dh_auto_install:
 
 	: # Sloppy man pages for now. Improve with templates
 	mkdir -p debian/tmp/usr/share/man/man1
-	help2man --no-info --help-option=-help --version-string=$(uver) \
+	help2man --no-info --help-option=-help --version-string=$(DEB_VERSION_UPSTREAM) \
 		-n "visualization and discovery tool used to map neuroimaging data" \
 		debian/tmp/usr/bin/wb_view \
 		>| debian/tmp/usr/share/man/man1/wb_view.1
 
-	help2man --no-info --help-option=-all-commands-help --version-string=$(uver) \
+	help2man --no-info --help-option=-all-commands-help --version-string=$(DEB_VERSION_UPSTREAM) \
 		-n "command-line program for performing a variety of algorithmic tasks using volume, surface, and grayordinate data" \
 		debian/tmp/usr/bin/wb_command \
 		>| debian/tmp/usr/share/man/man1/wb_command.1
@@ -65,6 +59,3 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install
 	install -D -m 0644 icons/linux/workbench_128x128x32.png debian/connectome-workbench/usr/share/pixmaps/connectome-workbench.png
-
-override_dh_strip:
-	dh_strip --dbg-package=connectome-workbench-dbg


=====================================
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/Washington-University/workbench/issues
+Bug-Submit: https://github.com/Washington-University/workbench/issues/new
+Repository: https://github.com/Washington-University/workbench.git
+Repository-Browse: https://github.com/Washington-University/workbench



View it on GitLab: https://salsa.debian.org/med-team/connectome-workbench/-/compare/843cce0738f3aab62a9ef6f7e7744af4b2d5004a...ba43213da5bc0264ca8ab95cfd7edd290b5a1415

-- 
View it on GitLab: https://salsa.debian.org/med-team/connectome-workbench/-/compare/843cce0738f3aab62a9ef6f7e7744af4b2d5004a...ba43213da5bc0264ca8ab95cfd7edd290b5a1415
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/a0dc52d5/attachment-0001.htm>

More information about the debian-med-commit mailing list