[med-svn] [Git][med-team/connectome-workbench][master] 9 commits: Remove old FSF address

Andreas Tille (@tille) gitlab at salsa.debian.org
Sun Apr 12 21:29:27 BST 2026 


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


Commits:
46c4ff37 by Andreas Tille at 2026-04-12T08:07:40+02:00
Remove old FSF address

- - - - -
7408c292 by Andreas Tille at 2026-04-12T08:09:42+02:00
d/rules: Use /usr/share/dpkg/architecture.mk

- - - - -
603b4d90 by Andreas Tille at 2026-04-12T08:12:01+02:00
Remove explicit -dbg package

- - - - -
93e557ec by Andreas Tille at 2026-04-12T08:15:03+02:00
Do not parse changelog in d/rules

- - - - -
82399723 by Andreas Tille at 2026-04-12T08:16:21+02:00
d/watch: version=5

- - - - -
e9b9ffc6 by Andreas Tille at 2026-04-12T08:17:39+02:00
debhelper-compat (= 13)

- - - - -
a2debf20 by Andreas Tille at 2026-04-12T09:28:07+02:00
Do not link against minizip by using Debian packaged Quazip

- - - - -
bd84f813 by Andreas Tille at 2026-04-12T09:31:24+02:00
Fix help2man call to align with debhelper compat 13 directory layout

- - - - -
0166efcd by Andreas Tille at 2026-04-12T10:38:23+02:00
Fix install

- - - - -


9 changed files:

- debian/changelog
- − debian/compat
- debian/connectome-workbench.install
- debian/control
- debian/copyright
- + debian/patches/0004-debian-packaged-quazip.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -3,12 +3,21 @@ connectome-workbench (2.1.0-2) UNRELEASED; urgency=medium
   * Team upload.
   * Maintain in Debian Med team
   * Use Debian Med default repository layout and remove debian/gbp.conf
-  * d/copyright: Secure URIs in Format and Source
+  * d/copyright:
+     - Secure URIs in Format and Source
+     - Remove old FSF address
   * Secure URI in Homepage
   * Fix build with CMake4
     Closes: #1112806
   * Add missing include to build with gcc15
     Closes: #1096460
+  * d/rules:
+     - Use /usr/share/dpkg/architecture.mk
+     - Do not parse changelog
+  * Remove explicit -dbg package
+  * d/watch: version=5
+  * debhelper-compat (= 13)
+  * Do not link against minizip by using Debian packaged Quazip
 
  -- Andreas Tille <tille at debian.org>  Sat, 11 Apr 2026 08:00:21 +0200
 


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


=====================================
debian/connectome-workbench.install
=====================================
@@ -1,2 +1 @@
-usr/*
 debian/connectome-workbench.desktop usr/share/applications/


=====================================
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,
@@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 9),
                opencl-c-headers,
                xauth,
                xvfb,
-               libftgl-dev
+               libftgl-dev,
+               libquazip1-qt5-dev
 Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/med-team/connectome-workbench
 Vcs-Git: https://salsa.debian.org/med-team/connectome-workbench.git
@@ -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
=====================================
@@ -81,11 +81,6 @@ License: GPL-2+
  PURPOSE.  See the GNU General Public License for more
  details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
@@ -101,10 +96,6 @@ License: LGPL-2.0+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  General Public License for more details.
  .
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2'.
@@ -120,9 +111,9 @@ License: LGPL-2.1
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  General Public License for more details.
  .
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
 
 License: GPL-3.0
  This program is free software; you can redistribute it and/or modify it
@@ -134,10 +125,6 @@ License: GPL-3.0
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  General Public License for more details.
  .
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
@@ -326,10 +313,6 @@ License: GPL-2+ with Font exception
  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  more details.
  .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc., 51
- Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
  As a special exception, if you create a document which uses this font, and
  embed this font or unaltered portions of this font into the document, this
  font does not by itself cause the resulting document to be covered by the


=====================================
debian/patches/0004-debian-packaged-quazip.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Use system QuaZip instead of bundled copy
+             This would avoid using a code copy of minizip
+Author: Andreas Tille <tille at debian.org>
+Forwarded: no
+Last-Update: 2026-04-12
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -496,10 +496,17 @@ ENDIF (ZLIB_FOUND)
+ # Try to find QuaZip, otherwise use bundled
+ #
+ SET(QUAZIP_RESULT "Not Found")
+-FIND_PACKAGE(QuaZip  QUIET)
++FIND_PACKAGE(QuaZip5 QUIET)
+ IF (QUAZIP_FOUND)
+   SET(QUAZIP_RESULT "Using QuaZip Library ${QUAZIP_LIBRARIES}")
+-ELSE (QUAZIP_FOUND)
++ELSEIF (QuaZip5_FOUND)
++  SET(QUAZIP_FOUND TRUE)
++  # QuaZip5 exposes an imported target; extract include dirs and libraries
++  # from it so the rest of the build can use the same variables as before.
++  GET_TARGET_PROPERTY(QUAZIP_INCLUDE_DIRS QuaZip5::QuaZip INTERFACE_INCLUDE_DIRECTORIES)
++  SET(QUAZIP_LIBRARIES QuaZip5::QuaZip)
++  SET(QUAZIP_RESULT "Using system QuaZip5 library")
++ELSE ()
+     #
+     # Quazip needs this defined here for static linking on windows
+     #


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ up_include_cpuinfo
 0001-attempted-general-fix-for-qEnvironment-include.patch
 0002-cmake4.patch
 0003-gcc15.patch
+0004-debian-packaged-quazip.patch


=====================================
debian/rules
=====================================
@@ -1,11 +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 )
+include /usr/share/dpkg/default.mk
 
-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 do_parallel=$(shell echo $(DEB_HOST_ARCH) | grep -q mips && echo '' || echo '--parallel')
 do_help=$(shell echo $(DEB_HOST_ARCH) | grep -q -E '(mipsel|m68k|sh4)' && echo 'OFF' || echo 'ON')
 
@@ -14,11 +11,6 @@ export  https_proxy=http://127.0.0.1:9/
 
 # export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    export CFLAGS += -O0
-else
-    export CFLAGS += -O2
-endif
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_CFLAGS_MAINT_APPEND = -DNDEBUG
@@ -52,20 +44,17 @@ override_dh_auto_install:
 	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) \
+	mkdir -p debian/$(DEB_SOURCE)/usr/share/man/man1
+	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
+		debian/$(DEB_SOURCE)/usr/bin/wb_view \
+		>| debian/$(DEB_SOURCE)/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
+		debian/$(DEB_SOURCE)/usr/bin/wb_command \
+		>| debian/$(DEB_SOURCE)/usr/share/man/man1/wb_command.1
 
 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/watch
=====================================
@@ -1,5 +1,6 @@
-version=4
-opts="uversionmangle=s/v//,filenamemangle=s/.*\/(.*)/connectome-workbench-$1/" \
-  https://github.com/Washington-University/workbench/tags .*/v?(\d.*)@ARCHIVE_EXT@
-# http://github.com/Washington-University/workbench/releases .*archive/v?([\d\.rc]+).tar.gz
+Version: 5
 
+Template: Github
+Owner: Washington-University
+Project: workbench
+Uversion-Mangle: s/v//



View it on GitLab: https://salsa.debian.org/med-team/connectome-workbench/-/compare/98a4d3604b280c7158c4ef009eb0f27d0901ceef...0166efcdead7f13efc21d0a541e7f7d4e436f380

-- 
View it on GitLab: https://salsa.debian.org/med-team/connectome-workbench/-/compare/98a4d3604b280c7158c4ef009eb0f27d0901ceef...0166efcdead7f13efc21d0a541e7f7d4e436f380
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/20260412/c5f63d85/attachment-0001.htm>

More information about the debian-med-commit mailing list