[med-svn] [Git][med-team/dicomscope][master] 11 commits: Different IDs for doc-base documents
Andreas Tille
gitlab at salsa.debian.org
Sat Sep 26 09:46:31 BST 2020
Andreas Tille pushed to branch master at Debian Med / dicomscope
Commits:
d38ac5fd by Andreas Tille at 2020-09-26T09:10:07+02:00
Different IDs for doc-base documents
- - - - -
da7e2fa9 by Andreas Tille at 2020-09-26T09:11:58+02:00
routine-update: Standards-Version: 4.5.0
- - - - -
e79353ac by Andreas Tille at 2020-09-26T09:11:59+02:00
routine-update: debhelper-compat 13
- - - - -
33997ae9 by Andreas Tille at 2020-09-26T09:12:19+02:00
routine-update: Remove trailing whitespace in debian/changelog
- - - - -
78d27af4 by Andreas Tille at 2020-09-26T09:12:19+02:00
routine-update: Remove trailing whitespace in debian/rules
- - - - -
589c0152 by Andreas Tille at 2020-09-26T09:12:20+02:00
routine-update: Add salsa-ci file
- - - - -
f2b902b9 by Andreas Tille at 2020-09-26T09:12:20+02:00
routine-update: Rules-Requires-Root: no
- - - - -
e0b9a86d by Andreas Tille at 2020-09-26T09:12:22+02:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
d7c92399 by Andreas Tille at 2020-09-26T09:12:25+02:00
Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html
- - - - -
f18954e9 by Andreas Tille at 2020-09-26T10:10:41+02:00
Fix installation
- - - - -
ad1ac3d5 by Andreas Tille at 2020-09-26T10:40:04+02:00
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/dicomscope-doc.doc-base.dsum
- debian/dicomscope.install
- debian/rules
- + debian/salsa-ci.yml
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+dicomscope (3.6.0-21) unstable; urgency=medium
+
+ * Different IDs for doc-base documents
+ Closes: #927089
+ * Standards-Version: 4.5.0 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Remove trailing whitespace in debian/changelog (routine-update)
+ * Remove trailing whitespace in debian/rules (routine-update)
+ * Add salsa-ci file (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+ * Trim trailing whitespace.
+ * Use secure URI in Homepage field.
+
+ -- Andreas Tille <tille at debian.org> Sat, 26 Sep 2020 10:10:51 +0200
+
dicomscope (3.6.0-20) unstable; urgency=medium
[ Jelmer Vernooij ]
@@ -5,7 +20,7 @@ dicomscope (3.6.0-20) unstable; urgency=medium
* Use secure copyright file specification URI.
[ Gert Wollny ]
- * d/p/remove_Tar..: Add patch to remove use of removed
+ * d/p/remove_Tar..: Add patch to remove use of removed
interface, Closes: #919739
-- Gert Wollny <gewo at debian.org> Wed, 23 Jan 2019 11:20:35 +0100
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -4,16 +4,17 @@ Uploaders: Andreas Tille <tille at debian.org>,
Gert Wollny <gewo at debian.org>
Section: graphics
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
cmake,
libdcmtk-dev,
default-jdk,
javahelper,
zip
-Standards-Version: 4.2.1
+Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/dicomscope
Vcs-Git: https://salsa.debian.org/med-team/dicomscope.git
-Homepage: http://dicom.offis.de/dscope.php.en
+Homepage: https://dicom.offis.de/dscope.php.en
+Rules-Requires-Root: no
Package: dicomscope
Architecture: all
=====================================
debian/dicomscope-doc.doc-base.dsum
=====================================
@@ -1,4 +1,4 @@
-Document: dicomscope
+Document: dicomscopemanual
Title: DICOMscope 3.6.0 User Manual
Author: M. Eichelberg, K. Kleber, J. Riesmeier, A. Schröter, A. Thiel
Abstract: The OFFIS DICOM Viewer
=====================================
debian/dicomscope.install
=====================================
@@ -1,2 +1,4 @@
usr/share/dicomscope/
etc/dcmtk/DICOMscope.cfg
+usr/share/java
+usr/share/dcmtk
=====================================
debian/rules
=====================================
@@ -2,7 +2,7 @@
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export JAVA_HOME=/usr/lib/jvm/default-java
@@ -16,12 +16,9 @@ CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE:STRING="" \
override_dh_auto_configure-arch:
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-override_dh_install:
- # fix exe bit before install
- chmod 755 debian/tmp/usr/share/dicomscope/tcl/dcmpsdmp.tcl
- chmod 755 debian/tmp/usr/share/dicomscope/tcl/dcmpschk.tcl
- dh_install
- find debian/tmp/usr -name "*.jar" -exec zip -d \{\} docs/*.pdf \;
+override_dh_fixperms:
+ dh_fixperms
+ find debian -name "dcmps*.tcl" -exec chmod +x \{\} \;
override_dh_clean:
dh_clean
@@ -62,4 +59,3 @@ get-orig-source: $(UPSTREAM_SRC).zip
# put orig.tar in ../tarballs (-> default location for svn-buildpackage)
mkdir -p ../tarballs
mv *.orig.tar.gz ../tarballs
-
=====================================
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/dicomscope/-/compare/3c1df7f2943e5fda39b504a804234842303afd4f...ad1ac3d5573435f3bd80b5676c9bf52cc16fbc96
--
View it on GitLab: https://salsa.debian.org/med-team/dicomscope/-/compare/3c1df7f2943e5fda39b504a804234842303afd4f...ad1ac3d5573435f3bd80b5676c9bf52cc16fbc96
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/20200926/d853ec62/attachment-0001.html>
More information about the debian-med-commit
mailing list