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

[Mathieu Malaterre]

Author: malat
Date: 2012-05-31 12:03:31 +0000 (Thu, 31 May 2012)
New Revision: 11137

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
   trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
Log:
Update patch

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2012-05-31 11:22:43 UTC (rev 11136)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2012-05-31 12:03:31 UTC (rev 11137)
@@ -1,3 +1,9 @@
+pixelmed (20120508-1) UNRELEASED; urgency=low
+
+  * New upstream
+
+ -- Mathieu Malaterre <malat at debian.org>  Sat, 12 May 2012 14:50:48 +0200
+
 pixelmed (20120405-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2012-05-31 11:22:43 UTC (rev 11136)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2012-05-31 12:03:31 UTC (rev 11137)
@@ -3,10 +3,10 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20111230/Makefile
+Index: pixelmed-20120508/Makefile
 ===================================================================
---- pixelmed-20111230.orig/Makefile	2012-01-16 10:17:15.000000000 +0100
-+++ pixelmed-20111230/Makefile	2012-01-16 10:17:16.000000000 +0100
+--- pixelmed-20120508.orig/Makefile	2012-05-31 13:53:44.159037789 +0200
++++ pixelmed-20120508/Makefile	2012-05-31 13:53:44.715037782 +0200
 @@ -165,7 +165,7 @@
  WEBSTARTFILES = \
  	webstart/pixelmed.jar \
@@ -42,7 +42,7 @@
 +	DoseUtility.app/Contents/Resources/Java/commons-net2.jar \
  	DoseUtility.app/Contents/Resources/Java/jmdns.jar \
  	DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \
- 	DoseUtility.app/Contents/Resources/DicomCleaner.icns \
+ 	DoseUtility.app/Contents/Resources/DoseUtility.icns \
 @@ -443,7 +443,7 @@
  	cp $< $@
  	jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS}
@@ -70,10 +70,10 @@
  		-link http://download.oracle.com/javase/1.5.0/docs/api/ \
  		-link http://jpedal.org/javadoc/ \
  		-link http://www.hsqldb.org/doc/src/ \
-Index: pixelmed-20111230/Makefile.common.mk
+Index: pixelmed-20120508/Makefile.common.mk
 ===================================================================
---- pixelmed-20111230.orig/Makefile.common.mk	2012-01-16 10:17:11.000000000 +0100
-+++ pixelmed-20111230/Makefile.common.mk	2012-01-16 10:17:16.000000000 +0100
+--- pixelmed-20120508.orig/Makefile.common.mk	2012-05-31 13:53:40.879037835 +0200
++++ pixelmed-20120508/Makefile.common.mk	2012-05-31 13:53:44.715037782 +0200
 @@ -35,7 +35,7 @@
  
  DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
@@ -83,10 +83,10 @@
  
  VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
  
-Index: pixelmed-20111230/webstart/DoseUtility.jnlp
+Index: pixelmed-20120508/webstart/DoseUtility.jnlp
 ===================================================================
---- pixelmed-20111230.orig/webstart/DoseUtility.jnlp	2011-12-08 14:10:09.000000000 +0100
-+++ pixelmed-20111230/webstart/DoseUtility.jnlp	2012-01-16 10:17:16.000000000 +0100
+--- pixelmed-20120508.orig/webstart/DoseUtility.jnlp	2011-12-19 21:51:03.000000000 +0100
++++ pixelmed-20120508/webstart/DoseUtility.jnlp	2012-05-31 13:53:44.715037782 +0200
 @@ -19,7 +19,7 @@
      <j2se version="1.5+" java-vm-args="-Xmx768m -Xss2m"/>
      <jar href="pixelmed.jar"/>

Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2012-05-31 11:22:43 UTC (rev 11136)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2012-05-31 12:03:31 UTC (rev 11137)
@@ -3,18 +3,18 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20120405/com/pixelmed/test/Makefile
+Index: pixelmed-20120508/com/pixelmed/test/Makefile
 ===================================================================
---- pixelmed-20120405.orig/com/pixelmed/test/Makefile	2012-05-08 14:42:54.000000000 +0200
-+++ pixelmed-20120405/com/pixelmed/test/Makefile	2012-05-08 15:22:58.000000000 +0200
-@@ -75,8 +75,8 @@
+--- pixelmed-20120508.orig/com/pixelmed/test/Makefile	2012-05-31 11:55:32.000000000 +0000
++++ pixelmed-20120508/com/pixelmed/test/Makefile	2012-05-31 12:02:11.055030791 +0000
+@@ -81,8 +81,8 @@
  clean:
  	rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm
  
 -alltests:	testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testsafeprivate testattributelist \
--			testcontentitem testcodingscheme testcharset testcleaner testgeometry testdicomdir testnetwork testuuid
+-			testcontentitem testcodingscheme testcharset testcleaner testgeometry testdicomdir testnetwork testuuid testbase64
 +alltests:	testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testattributelist \
-+			testcontentitem testcodingscheme testcharset testdicomdir testuuid
++			testcontentitem testcodingscheme testcharset testdicomdir testuuid testbase64
  
  testsuv:	${OBJS}
  	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestSUVTransform_AllTests