Control: tags -1 patch Am 23.04.2016 um 01:00 schrieb Andreas Tille: > On Fri, Apr 22, 2016 at 09:50:24AM +0200, Markus Koschany wrote: >> Hi, >> >> pixelmed is the last package that blocks the removal of >> libcommons-net2-java. What is the status? > > I tried to build current SVN status but was running into [...]
Hi, that looks rather unrelated to the issue at hand. Did you forget to add this json package to Build-Depends? Maybe the name of the jar (javax.json-api-1.0.jar) is incorrect? Anyways, please find attached my proposed patch to fix this issue. This is the debdiff against the current version in unstable. Regards, Markus
diff -Nru pixelmed-20140816/debian/changelog pixelmed-20140816/debian/changelog
--- pixelmed-20140816/debian/changelog 2014-09-02 18:40:06.000000000 +0200
+++ pixelmed-20140816/debian/changelog 2016-04-23 12:23:50.000000000 +0200
@@ -1,3 +1,11 @@
+pixelmed (20140816-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Build-depend on libcommons-net-java (>= 3). (Closes: #800762)
+ * debian/patches: Replace occurrences of commons-net2 with commons-net.
+
+ -- Markus Koschany <a...@debian.org> Sat, 23 Apr 2016 11:23:28 +0200
+
pixelmed (20140816-1) unstable; urgency=low
* New upstream. Update dict to DICOM/2014
diff -Nru pixelmed-20140816/debian/control pixelmed-20140816/debian/control
--- pixelmed-20140816/debian/control 2014-04-09 22:44:00.000000000 +0200
+++ pixelmed-20140816/debian/control 2016-04-23 12:23:50.000000000 +0200
@@ -8,7 +8,7 @@
javahelper,
junit4,
libcommons-codec-java,
- libcommons-net2-java (>= 2.0),
+ libcommons-net-java (>= 3),
libhsqldb-java (>= 1.8.0),
libjmdns-java (>= 3.4),
libvecmath-java
diff -Nru pixelmed-20140816/debian/patches/addmanifest.patch
pixelmed-20140816/debian/patches/addmanifest.patch
--- pixelmed-20140816/debian/patches/addmanifest.patch 2014-04-09
22:41:12.000000000 +0200
+++ pixelmed-20140816/debian/patches/addmanifest.patch 2016-04-23
12:23:50.000000000 +0200
@@ -12,7 +12,7 @@
(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-net2.jar" > manifest.txt
++ echo "Class-Path: jmdns.jar hsqldb.jar vecmath.jar commons-codec.jar
bcprov.jar commons-net.jar" > manifest.txt
+ jar -cvfm $@ manifest.txt BUILDDATE COPYRIGHT \
com/pixelmed/display/*.class \
com/pixelmed/display/*.properties \
diff -Nru pixelmed-20140816/debian/patches/commons-net-ftp.patch
pixelmed-20140816/debian/patches/commons-net-ftp.patch
--- pixelmed-20140816/debian/patches/commons-net-ftp.patch 2014-04-09
22:41:12.000000000 +0200
+++ pixelmed-20140816/debian/patches/commons-net-ftp.patch 2016-04-23
12:23:50.000000000 +0200
@@ -12,7 +12,7 @@
webstart/pixelmed.jar \
webstart/commons-codec-1.3.jar \
- webstart/commons-net-ftp-2.0.jar \
-+ webstart/commons-net2.jar \
++ webstart/commons-net.jar \
webstart/hsqldb.jar \
webstart/jmdns.jar \
webstart/excalibur-bzip2-1.0.jar \
@@ -21,7 +21,7 @@
DEPENDENCYRELEASEFILESWITHOUTREADME = \
lib/additional/commons-codec-1.3.jar \
- lib/additional/commons-net-ftp-2.0.jar \
-+ lib/additional/commons-net2.jar \
++ lib/additional/commons-net.jar \
lib/additional/excalibur-bzip2-1.0.jar \
lib/additional/hsqldb.jar \
lib/additional/vecmath1.2-1.14.jar \
@@ -30,7 +30,7 @@
DOSEUTILITYDEPENDENCYRELEASEFILES = \
lib/additional/commons-codec-1.3.jar \
- lib/additional/commons-net-ftp-2.0.jar \
-+ lib/additional/commons-net2.jar \
++ lib/additional/commons-net.jar \
lib/additional/excalibur-bzip2-1.0.jar \
lib/additional/hsqldb.jar \
lib/additional/vecmath1.2-1.14.jar \
@@ -39,7 +39,7 @@
DoseUtility.app/Contents/Resources/Java/excalibur-bzip2-1.0.jar \
DoseUtility.app/Contents/Resources/Java/commons-codec-1.3.jar \
- DoseUtility.app/Contents/Resources/Java/commons-net-ftp-2.0.jar \
-+ DoseUtility.app/Contents/Resources/Java/commons-net2.jar \
++ DoseUtility.app/Contents/Resources/Java/commons-net.jar \
DoseUtility.app/Contents/Resources/Java/jmdns.jar \
DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
DoseUtility.app/Contents/Resources/DoseUtility.icns \
@@ -48,7 +48,7 @@
jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE}
${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
-webstart/commons-net-ftp-2.0.jar: lib/additional/commons-net-ftp-2.0.jar
-+webstart/commons-net.jar: lib/additional/commons-net2.jar
++webstart/commons-net.jar: lib/additional/commons-net.jar
mkdir -p webstart
cp $< $@
jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE}
${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
@@ -57,7 +57,7 @@
cp $< $@
-DoseUtility.app/Contents/Resources/Java/commons-net-ftp-2.0.jar:
lib/additional/commons-net-ftp-2.0.jar
-+DoseUtility.app/Contents/Resources/Java/commons-net2.jar:
lib/additional/commons-net2.jar
++DoseUtility.app/Contents/Resources/Java/commons-net.jar:
lib/additional/commons-net.jar
mkdir -p DoseUtility.app/Contents/Resources/Java
cp $< $@
@@ -66,7 +66,7 @@
rm -rf docs/javadoc
javadoc \
- -classpath
.:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net-ftp-2.0.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar
\
-+ -classpath
.:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar
\
++ -classpath
.:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar
\
-link http://download.oracle.com/javase/1.5.0/docs/api/ \
-link http://jpedal.org/javadoc/ \
-link http://www.hsqldb.org/doc/src/ \
@@ -79,7 +79,7 @@
DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
-FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net-ftp-2.0.jar
-+FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net2.jar
++FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net.jar
VIEWERADDITIONALJARS =
${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
@@ -92,7 +92,7 @@
<jar href="pixelmed.jar"/>
<jar href="commons-codec-1.3.jar" download="eager"/>
- <jar href="commons-net-ftp-2.0.jar" download="eager"/>
-+ <jar href="commons-net2.jar" download="eager"/>
++ <jar href="commons-net.jar" download="eager"/>
<jar href="hsqldb.jar" download="eager"/>
<jar href="jmdns.jar" download="eager"/>
<jar href="excalibur-bzip2-1.0.jar" download="lazy"/>
diff -Nru pixelmed-20140816/debian/patches/fixdoc.patch
pixelmed-20140816/debian/patches/fixdoc.patch
--- pixelmed-20140816/debian/patches/fixdoc.patch 2014-04-09
22:41:12.000000000 +0200
+++ pixelmed-20140816/debian/patches/fixdoc.patch 2016-04-23
12:23:50.000000000 +0200
@@ -1,16 +1,21 @@
-Description: fix doc generation
-Author: Mathieu Malaterre <ma...@debian.org>
+From: Markus Koschany <a...@debian.org>
+Date: Sat, 23 Apr 2016 11:51:34 +0200
+Subject: fixdoc
-Index: pixelmed-20140326/Makefile
-===================================================================
---- pixelmed-20140326.orig/Makefile 2014-04-09 22:30:16.009215268 +0200
-+++ pixelmed-20140326/Makefile 2014-04-09 22:33:55.373222288 +0200
-@@ -929,7 +929,7 @@
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 9182fa8..4ac8b83 100755
+--- a/Makefile
++++ b/Makefile
+@@ -929,7 +929,7 @@ windows.lib:
javadoc:
rm -rf docs/javadoc
javadoc \
-- -classpath
.:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar
\
-+ -classpath
.:/usr/share/java/excalibur-bzip2-1.0.jar:/usr/share/java/hsqldb.jar:/usr/share/java/vecmath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-net2.jar:/usr/share/java/jmdns.jar:/usr/share/java/jpedalSTD.jar:/usr/share/java/junit4.jar
\
+- -classpath
.:lib/additional/excalibur-bzip2-1.0.jar:lib/additional/hsqldb.jar:lib/additional/vecmath1.2-1.14.jar:lib/additional/commons-codec-1.3.jar:lib/additional/commons-net.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit-4.8.1.jar
\
++ -classpath
.:/usr/share/java/excalibur-bzip2-1.0.jar:/usr/share/java/hsqldb.jar:/usr/share/java/vecmath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-net.jar:/usr/share/java/jmdns.jar:/usr/share/java/jpedalSTD.jar:/usr/share/java/junit4.jar
\
-link http://download.oracle.com/javase/1.5.0/docs/api/ \
-link http://jpedal.org/javadoc/ \
-link http://www.hsqldb.org/doc/src/ \
diff -Nru pixelmed-20140816/debian/patches/fix_jnlp.patch
pixelmed-20140816/debian/patches/fix_jnlp.patch
--- pixelmed-20140816/debian/patches/fix_jnlp.patch 2013-06-03
10:57:12.000000000 +0200
+++ pixelmed-20140816/debian/patches/fix_jnlp.patch 2016-04-23
12:23:50.000000000 +0200
@@ -1,11 +1,17 @@
-Description: Allow off-line JNLP apps
-Forwarded: not-needed
-Author: Mathieu Malaterre <ma...@debian.org>
+From: Markus Koschany <a...@debian.org>
+Date: Sat, 23 Apr 2016 12:01:13 +0200
+Subject: fix_jnlp
-Index: pixelmed-20130220/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
-===================================================================
---- pixelmed-20130220.orig/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
2013-04-25 14:05:03.969668634 +0200
-+++ pixelmed-20130220/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
2013-04-25 14:05:35.489668277 +0200
+---
+ webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp | 2 +-
+ webstart/DicomCleaner.jnlp | 10 +++++-----
+ webstart/DoseUtility.jnlp | 6 +++---
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
b/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
+index 96e4be0..aa60504 100644
+--- a/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
++++ b/webstart/ConvertAmicasJPEG2000FilesetToDicom.jnlp
@@ -21,7 +21,7 @@
<jar href="pixelmed.jar"/>
<!--extension
href="http://download.java.net/media/jai-imageio/webstart/release/jai-imageio-1.1.jnlp"/-->
@@ -15,10 +21,10 @@
</resources>
<application-desc
main-class="com.pixelmed.convert.ConvertAmicasJPEG2000FilesetToDicom"/>
</jnlp>
-Index: pixelmed-20130220/webstart/DicomCleaner.jnlp
-===================================================================
---- pixelmed-20130220.orig/webstart/DicomCleaner.jnlp 2013-04-25
14:05:45.489668164 +0200
-+++ pixelmed-20130220/webstart/DicomCleaner.jnlp 2013-04-25
14:06:14.417667840 +0200
+diff --git a/webstart/DicomCleaner.jnlp b/webstart/DicomCleaner.jnlp
+index e264a91..3622ed8 100644
+--- a/webstart/DicomCleaner.jnlp
++++ b/webstart/DicomCleaner.jnlp
@@ -18,14 +18,14 @@
<resources>
<j2se version="1.5+" java-vm-args="-Xmx768m"/>
@@ -39,17 +45,17 @@
</resources>
<application-desc main-class="com.pixelmed.display.DicomCleaner"/>
</jnlp>
-Index: pixelmed-20130220/webstart/DoseUtility.jnlp
-===================================================================
---- pixelmed-20130220.orig/webstart/DoseUtility.jnlp 2013-04-25
14:06:48.673667450 +0200
-+++ pixelmed-20130220/webstart/DoseUtility.jnlp 2013-04-25
14:07:10.069667216 +0200
+diff --git a/webstart/DoseUtility.jnlp b/webstart/DoseUtility.jnlp
+index 9d52189..861db23 100644
+--- a/webstart/DoseUtility.jnlp
++++ b/webstart/DoseUtility.jnlp
@@ -18,15 +18,15 @@
<resources>
<j2se version="1.5+" java-vm-args="-Xmx768m -Xss2m"/>
<jar href="pixelmed.jar"/>
- <jar href="commons-codec-1.3.jar" download="eager"/>
+ <jar href="commons-codec.jar" download="eager"/>
- <jar href="commons-net2.jar" download="eager"/>
+ <jar href="commons-net.jar" download="eager"/>
<jar href="hsqldb.jar" download="eager"/>
<jar href="jmdns.jar" download="eager"/>
<jar href="excalibur-bzip2-1.0.jar" download="lazy"/>
@@ -58,7 +64,7 @@
<!--extension
href="http://download.java.net/media/jai-imageio/webstart/release/jai-imageio-1.1.jnlp"/-->
<!--extension
href="http://download.java.net/media/jai-imageio/webstart/early-access/jai-imageio-1.1.jnlp"/-->
- <extension
href="http://www.dclunie.com/pixelmed/software/webstart/jai-imageio-1.1_DAC.jnlp"/>
-+ <!--extension
href="http://www.dclunie.com/pixelmed/software/webstart/jai-imageio-1.1_DAC.jnlp"/-->
++ <!--<extension
href="http://www.dclunie.com/pixelmed/software/webstart/jai-imageio-1.1_DAC.jnlp"/>-->
</resources>
<application-desc main-class="com.pixelmed.apps.DoseUtility"/>
</jnlp>
diff -Nru pixelmed-20140816/debian/patches/series
pixelmed-20140816/debian/patches/series
--- pixelmed-20140816/debian/patches/series 2014-06-24 21:54:26.000000000
+0200
+++ pixelmed-20140816/debian/patches/series 2016-04-23 12:23:50.000000000
+0200
@@ -7,8 +7,8 @@
commons-net-ftp.patch
addmanifest.patch
fixfonts.patch
-fixdoc.patch
-fix_jnlp.patch
add_usage.patch
removetest.patch
illegalchar.patch
+fixdoc.patch
+fix_jnlp.patch
signature.asc
Description: OpenPGP digital signature
