[med-svn] [Git][med-team/dicom3tools][master] 8 commits: Fix clean target. Closes: #1044253.

[Santiago Vila (@sanvila)]

Santiago Vila pushed to branch master at Debian Med / dicom3tools


Commits:
d98ffce5 by Santiago Vila at 2026-03-04T10:56:00+01:00
Fix clean target. Closes: #1044253.

Ignore changes in the *.awk files.

- - - - -
daad5a83 by Santiago Vila at 2026-03-04T10:57:00+01:00
Do not fiddle with Makefile or Makefile.backup anymore.

Clean both of them in debian/clean instead.

- - - - -
15ed02f8 by Santiago Vila at 2026-03-04T10:58:00+01:00
d/control: Drop "Rules-Requires-Root: no" (default).

- - - - -
f8cd7919 by Santiago Vila at 2026-03-04T10:59:00+01:00
d/control: Drop "Priority: optional" (default).

- - - - -
d8641c62 by Santiago Vila at 2026-03-04T11:00:00+01:00
d/control: Update standards-version.

- - - - -
a5421e92 by Santiago Vila at 2026-03-04T11:01:00+01:00
d/salsa-ci.yml: Fix override for blhc.

- - - - -
187d0249 by Santiago Vila at 2026-03-04T11:02:00+01:00
d/salsa-ci.yml: Disable redundant/duplicate jobs.

- - - - -
c277ccca by Santiago Vila at 2026-03-04T11:03:00+01:00
Upload for unstable as 1.00~20240118131615-2

- - - - -


6 changed files:

- debian/changelog
- debian/clean
- debian/control
- debian/rules
- debian/salsa-ci.yml
- + debian/source/options


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+dicom3tools (1.00~20240118131615-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix clean target. Closes: #1044253.
+  * Do not fiddle with Makefile or Makefile.backup anymore.
+  * Drop "Rules-Requires-Root: no" (default).
+  * Drop "Priority: optional" (default).
+  * Update standards-version.
+  * d/salsa-ci.yml: Fix override for blhc.
+  * d/salsa-ci.yml: Disable redundant/duplicate jobs.
+
+ -- Santiago Vila <sanvila at debian.org>  Wed, 04 Mar 2026 11:03:00 +0100
+
 dicom3tools (1.00~20240118131615-1) unstable; urgency=medium
 
   [ Mohammed Bilal ]


=====================================
debian/clean
=====================================
@@ -1,2 +1,4 @@
+Makefile
+Makefile.backup
 config/generic.cf
 libsrc/src/generic/platform.cc


=====================================
debian/control
=====================================
@@ -2,17 +2,15 @@ Source: dicom3tools
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>, Gert Wollny <gewo at debian.org>
 Section: graphics
-Priority: optional
 Build-Depends: debhelper-compat (= 13),
                gawk,
                libx11-dev,
                libxext-dev,
                xutils-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.3
 Vcs-Browser: https://salsa.debian.org/med-team/dicom3tools
 Vcs-Git: https://salsa.debian.org/med-team/dicom3tools.git
 Homepage: https://www.dclunie.com/dicom3tools.html
-Rules-Requires-Root: no
 
 Package: dicom3tools
 Architecture: any


=====================================
debian/rules
=====================================
@@ -30,12 +30,9 @@ endif
 override_dh_clean:
 	dh_clean
 	find . -mindepth 2 -name Makefile -delete
-	# Use the name Makefile.backup since Makefile.bak is removed somehow magickally
-	if [ -f Makefile.backup ] ; then mv Makefile.backup Makefile ; fi
 	if [ -d libsrc/support.bak ] ; then rm -rf libsrc/support; mv libsrc/support.bak libsrc/support ; fi
 
 override_dh_auto_configure:
-	cp -a Makefile Makefile.backup
 	cp -a libsrc/support libsrc/support.bak
 	# http://www.gnu.org/manual/gawk/html_node/Special-FD.html
 	find . -name \*.awk -exec sed -i -e 's@/dev/tty@/dev/stderr at g' {} \;


=====================================
debian/salsa-ci.yml
=====================================
@@ -4,4 +4,6 @@ include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 variables:
 # Getting blhc failure for this line. Needs further inspection of the build system to fix this
-  SALSA_CI_BLHC_ARGS: '--ignore-line=andump.cc'
+  SALSA_CI_BLHC_ARGS: '--ignore-line=.*andump.cc'
+  SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1
+  SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1


=====================================
debian/source/options
=====================================
@@ -0,0 +1 @@
+extend-diff-ignore = "^libsrc/support/.*\.awk$"



View it on GitLab: https://salsa.debian.org/med-team/dicom3tools/-/compare/f7a4a4ca4196ed55e55d5eb5fe6268bf6b7faf3e...c277ccca96fe7d2c6171f8c7aa69b3886f539677

-- 
View it on GitLab: https://salsa.debian.org/med-team/dicom3tools/-/compare/f7a4a4ca4196ed55e55d5eb5fe6268bf6b7faf3e...c277ccca96fe7d2c6171f8c7aa69b3886f539677
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/20260304/81cbaf1f/attachment-0001.htm>