[med-svn] [Git][med-team/pixelmed][master] 9 commits: Adapt Makefile after new libjsonp-java upstream version
Pierre Gruet
gitlab at salsa.debian.org
Wed Jan 27 08:06:07 GMT 2021
Pierre Gruet pushed to branch master at Debian Med / pixelmed
Commits:
5e8f6b33 by Pierre Gruet at 2021-01-24T16:00:24+01:00
Adapt Makefile after new libjsonp-java upstream version
- - - - -
8632874a by Pierre Gruet at 2021-01-24T23:17:32+01:00
Refreshing d/copyright
- - - - -
79e6ea68 by Pierre Gruet at 2021-01-24T23:17:56+01:00
Bumping Standards version to 4.5.1 (no changes needed)
- - - - -
8fea252c by Pierre Gruet at 2021-01-25T22:51:29+01:00
Adding missing jar in classpath for the build-time tests
This jar should be properly references in the manifest of
/usr/share/java/javax.json.jar provided by libjsonp-java, but it seems it would
introduce some round-trip dependency between the two jars built by
libjsonp-java.
- - - - -
6ed112f1 by Pierre Gruet at 2021-01-25T23:26:46+01:00
Setting the classpath properly with /usr/share/java/ prefix
- - - - -
1eb0d243 by Pierre Gruet at 2021-01-25T23:26:58+01:00
Refreshing patch
- - - - -
25f4413f by Pierre Gruet at 2021-01-27T08:29:55+01:00
Revert "Adding missing jar in classpath for the build-time tests"
This reverts commit 8fea252c611552636921b4b91c555900a706b4a5.
Issue has been solved in package libjsonp-java.
- - - - -
28550f84 by Pierre Gruet at 2021-01-27T08:31:33+01:00
Adding /usr/share/java/javax.json-api.jar in classpath of the built jar
- - - - -
de0bd890 by Pierre Gruet at 2021-01-27T09:06:00+01:00
Updating changelog
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/Makefile.common.mk.patch
- debian/patches/addmanifest.patch
- debian/patches/remove-build-date-file.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+pixelmed (20200416-4) UNRELEASED; urgency=medium
+
+ [ Pierre Gruet ]
+ * Team upload.
+ * Adapt Makefile after new libjsonp-java upstream version (Closes: #980604)
+ * Refreshing d/copyright
+ * Bumping Standards version to 4.5.1 (no changes needed)
+ * Setting the classpath properly with /usr/share/java/ prefix
+ * Adding /usr/share/java/javax.json-api.jar in classpath of the built jar
+
+ [ Mathieu Malaterre ]
+ * d/control: libjai-imageio-core-java is long gone
+
+ -- Pierre Gruet <pgtdebian at free.fr> Wed, 27 Jan 2021 08:31:46 +0100
+
pixelmed (20200416-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends-Indep: default-jdk,
libpixelmed-codec-java,
libpixelmed-imageio-java,
libvecmath-java
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Vcs-Browser: https://salsa.debian.org/med-team/pixelmed
Vcs-Git: https://salsa.debian.org/med-team/pixelmed.git
Homepage: http://www.pixelmed.com
=====================================
debian/copyright
=====================================
@@ -5,9 +5,13 @@ Source: http://www.pixelmed.com/
Files-Excluded: com/pixelmed/display/testmammohome
Files: *
-Copyright: 2001-2015, David A. Clunie DBA PixelMed Publishing. All rights reserved.
+Copyright: 2001-2020, David A. Clunie DBA PixelMed Publishing. All rights reserved.
License: BSD-3-clause
+Files: apple/*
+Copyright: 2003-2007 Apple, Inc.
+License: AML
+
Files: debian/*
Copyright: 2009-2014 Mathieu Malaterre <malat at debian.org>
2016-2017 Andreas Tille <tille at debian.org>
@@ -40,3 +44,42 @@ License: BSD-3-clause
This software has neither been tested nor approved for clinical use or for incorporation in
a medical device. It is the redistributor's or user's responsibility to comply with any
applicable local, state, national or international regulations.
+
+License: AML
+ Disclaimer: IMPORTANT: This Apple software is supplied to you by
+ Apple Inc. ("Apple") in consideration of your agreement to the
+ following terms, and your use, installation, modification or
+ redistribution of this Apple software constitutes acceptance of these
+ terms. If you do not agree with these terms, please do not use,
+ install, modify or redistribute this Apple software.
+ .
+ In consideration of your agreement to abide by the following terms, and
+ subject to these terms, Apple grants you a personal, non-exclusive
+ license, under Apple's copyrights in this original Apple software (the
+ "Apple Software"), to use, reproduce, modify and redistribute the Apple
+ Software, with or without modifications, in source and/or binary forms;
+ provided that if you redistribute the Apple Software in its entirety and
+ without modifications, you must retain this notice and the following
+ text and disclaimers in all such redistributions of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc.
+ may be used to endorse or promote products derived from the Apple
+ Software without specific prior written permission from Apple. Except
+ as expressly stated in this notice, no other rights or licenses, express
+ or implied, are granted by Apple herein, including but not limited to
+ any patent rights that may be infringed by your derivative works or by
+ other works in which the Apple Software may be incorporated.
+ .
+ The Apple Software is provided by Apple on an "AS IS" basis. APPLE
+ MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+ THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+ OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ .
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+ MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+ AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+ STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
=====================================
debian/patches/Makefile.common.mk.patch
=====================================
@@ -1,12 +1,11 @@
Description: Set include path according to debian layout
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: Tue, 21 Jul 2015 08:51:28 +0200
+ Pierre Gruet <pgtdebian at free.fr>
+Last-Update: Tue, 24 Jan 2021 15:42:23 +0100
-Index: pixelmed/Makefile.common.mk
-===================================================================
---- pixelmed.orig/Makefile.common.mk
-+++ pixelmed/Makefile.common.mk
+--- a/Makefile.common.mk
++++ b/Makefile.common.mk
@@ -2,9 +2,10 @@
# Note that PATHTOROOT must have been specified prior to including this file
#
@@ -20,7 +19,7 @@ Index: pixelmed/Makefile.common.mk
PATHTODCTOOLSUPPORTFROMROOT = ../../dctool.support
-@@ -17,6 +18,7 @@ PATHTOTESTFILESFROMROOT = ./testpaths
+@@ -17,6 +18,7 @@
PATHTOTESTRESULTSFROMROOT = ./testresults
PATHTOADDITIONAL = ${PATHTOROOT}/${ADDITIONALJARDIRINROOT}
@@ -28,7 +27,7 @@ Index: pixelmed/Makefile.common.mk
PATHTODCTOOLSUPPORT = ${PATHTOROOT}/${PATHTODCTOOLSUPPORTFROMROOT}
-@@ -25,23 +27,23 @@ PATHTODCTOOLS = ${PATHTOROOT}/${PATHTODC
+@@ -25,23 +27,23 @@
PATHTOSTANDARDFROMHOME = DICOM_Publish_XML
# commons-compress for bzip2 not needed for compile, but useful for execution if available ...
@@ -43,7 +42,8 @@ Index: pixelmed/Makefile.common.mk
-VECMATHADDITIONALJAR = ${PATHTOADDITIONAL}/vecmath1.2-1.14.jar
+VECMATHADDITIONALJAR = ${PATHTOADDITIONAL}/vecmath.jar
- JSONADDITIONALJAR = ${PATHTOADDITIONAL}/javax.json-1.0.4.jar
+-JSONADDITIONALJAR = ${PATHTOADDITIONAL}/javax.json-1.0.4.jar
++JSONADDITIONALJAR = ${PATHTOADDITIONAL}/javax.json-api.jar
-SLF4JCOMPILEADDITIONALJAR = ${PATHTOADDITIONAL}/slf4j-api-1.7.22.jar
+SLF4JCOMPILEADDITIONALJAR = ${PATHTOADDITIONAL}/slf4j-api.jar
=====================================
debian/patches/addmanifest.patch
=====================================
@@ -1,18 +1,17 @@
Description: add manifest file
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: 2012-05-05
+ Pierre Gruet <pgtdebian at free.fr>
+Last-Update: 2021-01-25
-Index: pixelmed/Makefile
-===================================================================
---- pixelmed.orig/Makefile
-+++ pixelmed/Makefile
-@@ -391,7 +391,8 @@ pixelmed.jar: generateicons
+--- a/Makefile
++++ b/Makefile
+@@ -391,7 +391,8 @@
(cd com/pixelmed/apps; make all)
(cd com/pixelmed/test; make all)
date >BUILDDATE
- jar -cvf $@ BUILDDATE COPYRIGHT \
-+ echo "Class-Path: jmdns.jar hsqldb.jar vecmath.jar commons-codec.jar bcprov.jar commons-net.jar slf4j-api.jar slf4j-jdk14.jar" > manifest.txt
++ echo "Class-Path: /usr/share/java/jmdns.jar /usr/share/java/hsqldb.jar /usr/share/java/vecmath.jar /usr/share/java/commons-codec.jar /usr/share/java/bcprov.jar /usr/share/java/commons-net.jar /usr/share/java/slf4j-api.jar /usr/share/java/slf4j-jdk14.jar /usr/share/java/javax.json-api.jar" > manifest.txt
+ jar -cvfm $@ manifest.txt BUILDDATE COPYRIGHT \
com/pixelmed/display/*.class \
com/pixelmed/display/*.properties \
=====================================
debian/patches/remove-build-date-file.patch
=====================================
@@ -8,7 +8,7 @@ Index: pixelmed/Makefile
@@ -392,7 +392,7 @@ pixelmed.jar: generateicons
(cd com/pixelmed/test; make all)
date >BUILDDATE
- echo "Class-Path: jmdns.jar hsqldb.jar vecmath.jar commons-codec.jar bcprov.jar commons-net.jar slf4j-api.jar slf4j-jdk14.jar" > manifest.txt
+ echo "Class-Path: /usr/share/java/jmdns.jar /usr/share/java/hsqldb.jar /usr/share/java/vecmath.jar /usr/share/java/commons-codec.jar /usr/share/java/bcprov.jar /usr/share/java/commons-net.jar /usr/share/java/slf4j-api.jar /usr/share/java/slf4j-jdk14.jar /usr/share/java/javax.json-api.jar" > manifest.txt
- jar -cvfm $@ manifest.txt BUILDDATE COPYRIGHT \
+ jar -cvfm $@ manifest.txt COPYRIGHT \
com/pixelmed/display/*.class \
View it on GitLab: https://salsa.debian.org/med-team/pixelmed/-/compare/c2ef9559bd9db64c0d2da56b87f80729575b5268...de0bd8901f92d6a68a1735f7e3e8e57231059066
--
View it on GitLab: https://salsa.debian.org/med-team/pixelmed/-/compare/c2ef9559bd9db64c0d2da56b87f80729575b5268...de0bd8901f92d6a68a1735f7e3e8e57231059066
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/20210127/384c5975/attachment-0001.html>
More information about the debian-med-commit
mailing list