[med-svn] r19711 - in trunk/packages/pixelmed/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-07-25 06:16:32 +0000 (Sat, 25 Jul 2015)
New Revision: 19711

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch
   trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Add Build-Depends: libcommons-compress-java


Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2015-07-25 06:05:48 UTC (rev 19710)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2015-07-25 06:16:32 UTC (rev 19711)
@@ -3,6 +3,7 @@
   * New upstream version
   * Added myself to uploaders
   * cme fix dpkg-control
+  * Add Build-Depends: libcommons-compress-java
 
  -- Andreas Tille <tille at debian.org>  Tue, 21 Jul 2015 08:51:28 +0200
 

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2015-07-25 06:05:48 UTC (rev 19710)
+++ trunk/packages/pixelmed/trunk/debian/control	2015-07-25 06:16:32 UTC (rev 19711)
@@ -10,6 +10,7 @@
                      junit4,
                      libcommons-codec-java,
                      libcommons-net2-java,
+                     libcommons-compress-java,
                      libhsqldb-java,
                      libjmdns-java (>= 3.4),
                      libvecmath-java

Modified: trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch	2015-07-25 06:05:48 UTC (rev 19710)
+++ trunk/packages/pixelmed/trunk/debian/patches/add_usage.patch	2015-07-25 06:16:32 UTC (rev 19711)
@@ -3,11 +3,9 @@
 Forwarded: not-needed
 Author: Mathieu Malaterre <malat at debian.org>
 
-Index: pixelmed-20131018/com/pixelmed/network/VerificationSOPClassSCU.java
-===================================================================
---- pixelmed-20131018.orig/com/pixelmed/network/VerificationSOPClassSCU.java	2013-04-27 03:23:50.000000000 +0200
-+++ pixelmed-20131018/com/pixelmed/network/VerificationSOPClassSCU.java	2013-12-10 17:51:23.734148896 +0100
-@@ -148,6 +148,11 @@
+--- a/com/pixelmed/network/VerificationSOPClassSCU.java
++++ b/com/pixelmed/network/VerificationSOPClassSCU.java
+@@ -148,6 +148,11 @@ if (debugLevel > 1) System.err.println(n
  	 * @param	arg	array of four to seven strings - their hostname, their port, their AE Title, our AE Title, and optionally a string flag valued SECURE or NONSECURE, an optional username and an optional password
  	 */
  	public static void main(String arg[]) {
@@ -19,11 +17,9 @@
  		boolean secure = arg.length >= 5 && arg[4].toUpperCase(java.util.Locale.US).equals("SECURE");
  		String username = arg.length >= 6 ? arg[5] : null;
  		String password = arg.length >= 7 ? arg[6] : null;
-Index: pixelmed-20131018/com/pixelmed/validate/DicomSRValidator.java
-===================================================================
---- pixelmed-20131018.orig/com/pixelmed/validate/DicomSRValidator.java	2013-07-24 14:35:52.000000000 +0200
-+++ pixelmed-20131018/com/pixelmed/validate/DicomSRValidator.java	2013-12-10 17:51:23.734148896 +0100
-@@ -289,6 +289,11 @@
+--- a/com/pixelmed/validate/DicomSRValidator.java
++++ b/com/pixelmed/validate/DicomSRValidator.java
+@@ -289,6 +289,11 @@ public class DicomSRValidator {
  	 * @param	arg	optionally -describe, optionally -donotmatchcase, then the name of the file containing the DICOM SR instance to be validated
  	 */
  	public static void main(String arg[]) {

Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series	2015-07-25 06:05:48 UTC (rev 19710)
+++ trunk/packages/pixelmed/trunk/debian/patches/series	2015-07-25 06:16:32 UTC (rev 19711)
@@ -10,5 +10,5 @@
 # fixdoc.patch ... somehow went into commons-net-ftp.patch
 fix_jnlp.patch
 add_usage.patch
-removetest.patch
+## removetest.patch ... see whether the test remain failing
 illegalchar.patch