[med-svn] r21863 - in trunk/packages/pixelmed/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Sun May 8 06:23:56 UTC 2016
Author: tille
Date: 2016-05-08 06:23:55 +0000 (Sun, 08 May 2016)
New Revision: 21863
Modified:
trunk/packages/pixelmed/trunk/debian/changelog
trunk/packages/pixelmed/trunk/debian/control
trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch
Log:
Get the code build but 4 tests are failing
Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog 2016-05-08 06:23:06 UTC (rev 21862)
+++ trunk/packages/pixelmed/trunk/debian/changelog 2016-05-08 06:23:55 UTC (rev 21863)
@@ -1,14 +1,20 @@
-pixelmed (20150917-1) UNRELEASED; urgency=medium
+pixelmed (20150917-1) unstable; urgency=medium
* New upstream version (Build-Depends: libpixelmed-codec-java)
* Added myself to uploaders
* cme fix dpkg-control
- * Add Build-Depends: libcommons-compress-java
- * Replace libcommons-net2-java by libcommons-net-java
- Closes: #800762
+ * Add Build-Depends: libcommons-compress-java, libjsonp-java
-- Andreas Tille <tille at debian.org> Wed, 13 Jan 2016 15:05:06 +0100
+pixelmed (20140816-1.1) unstable; 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 <apo at debian.org> Sat, 23 Apr 2016 11:23:28 +0200
+
pixelmed (20140816-1) unstable; urgency=low
* New upstream. Update dict to DICOM/2014
Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control 2016-05-08 06:23:06 UTC (rev 21862)
+++ trunk/packages/pixelmed/trunk/debian/control 2016-05-08 06:23:55 UTC (rev 21863)
@@ -9,14 +9,15 @@
javahelper,
junit4,
libcommons-codec-java,
- libcommons-net2-java,
+ libcommons-net-java (>= 3),
libcommons-compress-java,
libhsqldb-java,
libjmdns-java (>= 3.4),
libvecmath-java,
- libpixelmed-codec-java
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/pixelmed/trunk/
+ libpixelmed-codec-java,
+ libjsonp-java
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/pixelmed/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/pixelmed/trunk/
Homepage: http://www.pixelmed.com
Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2016-05-08 06:23:06 UTC (rev 21862)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2016-05-08 06:23:55 UTC (rev 21863)
@@ -12,7 +12,7 @@
- webstart/commons-codec-1.3.jar \
- webstart/commons-net-ftp-2.0.jar \
+ webstart/commons-codec.jar \
-+ webstart/commons-net2.jar \
++ webstart/commons-net.jar \
webstart/hsqldb.jar \
webstart/jmdns.jar \
- webstart/commons-compress-1.9.jar \
@@ -30,7 +30,7 @@
- lib/additional/commons-net-ftp-2.0.jar \
- lib/additional/commons-compress-1.9.jar \
+ lib/additional/commons-codec.jar \
-+ lib/additional/commons-net2.jar \
++ lib/additional/commons-net.jar \
+ lib/additional/commons-compress.jar \
lib/additional/hsqldb.jar \
- lib/additional/vecmath1.2-1.14.jar \
@@ -63,7 +63,7 @@
- lib/additional/commons-net-ftp-2.0.jar \
- lib/additional/commons-compress-1.9.jar \
+ lib/additional/commons-codec.jar \
-+ lib/additional/commons-net2.jar \
++ lib/additional/commons-net.jar \
+ lib/additional/commons-compress.jar \
lib/additional/hsqldb.jar \
- lib/additional/vecmath1.2-1.14.jar \
@@ -103,7 +103,7 @@
- DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar \
+ DoseUtility.app/Contents/Java/commons-compress.jar \
+ DoseUtility.app/Contents/Java/commons-codec.jar \
-+ DoseUtility.app/Contents/Java/commons-net2.jar \
++ DoseUtility.app/Contents/Java/commons-net.jar \
DoseUtility.app/Contents/Java/jmdns.jar \
DoseUtility.app/Contents/Java/jai_imageio.jar
@@ -127,7 +127,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}
@@ -230,7 +230,7 @@
- DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar \
+ DoseUtility.app/Contents/Java/commons-compress.jar \
+ DoseUtility.app/Contents/Java/commons-codec.jar \
-+ DoseUtility.app/Contents/Java/commons-net2.jar \
++ DoseUtility.app/Contents/Java/commons-net.jar \
DoseUtility.app/Contents/Java/jmdns.jar \
DoseUtility.app/Contents/Java/jai_imageio.jar \
DoseUtility.app/Contents/Resources/DoseUtility.icns \
@@ -249,7 +249,7 @@
cp $< $@
-DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar: lib/additional/commons-net-ftp-2.0.jar
-+DoseUtility.app/Contents/Java/commons-net2.jar: lib/additional/commons-net2.jar
++DoseUtility.app/Contents/Java/commons-net.jar: lib/additional/commons-net.jar
mkdir -p DoseUtility.app/Contents/Java
cp $< $@
@@ -263,7 +263,7 @@
rm -rf docs/javadoc
javadoc \
- -classpath .:lib/additional/commons-compress-1.9.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:lib/additional/javax.json-api-1.0.jar \
-+ -classpath .:lib/additional/commons-compress.jar:lib/additional/hsqldb.jar:lib/additional/vecmath.jar:lib/additional/commons-codec.jar:lib/additional/commons-net2.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit4.jar:lib/additional/javax.json-api-1.0.jar \
++ -classpath .:lib/additional/commons-compress.jar:lib/additional/hsqldb.jar:lib/additional/vecmath.jar:lib/additional/commons-codec.jar:lib/additional/commons-net.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit4.jar:lib/additional/javax.json-api-1.0.jar \
-link http://docs.oracle.com/javase/7/docs/api/ \
-link http://jpedal.org/javadoc/ \
-link http://www.hsqldb.org/doc/src/ \
@@ -274,7 +274,7 @@
DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
-FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net-ftp-2.0.jar
-+FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net2.jar
++FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net.jar
NETWORKADDITIONALJARS = ${PATHTOADDITIONAL}/jmdns.jar
@@ -285,7 +285,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="commons-compress-1.9.jar" download="lazy"/>
Modified: trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch 2016-05-08 06:23:06 UTC (rev 21862)
+++ trunk/packages/pixelmed/trunk/debian/patches/fix_jnlp.patch 2016-05-08 06:23:55 UTC (rev 21863)
@@ -43,7 +43,7 @@
<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="commons-compress-1.9.jar" download="lazy"/>
More information about the debian-med-commit
mailing list