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

Mathieu Malaterre malat at alioth.debian.org
Wed Apr 24 13:52:11 UTC 2013 

Author: malat
Date: 2013-04-24 13:52:11 +0000 (Wed, 24 Apr 2013)
New Revision: 13400

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
   trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
   trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch
   trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
   trunk/packages/pixelmed/trunk/debian/rules
Log:
Prepare next upload

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2013-04-24 13:52:11 UTC (rev 13400)
@@ -1,3 +1,9 @@
+pixelmed (20130220-1) UNRELEASED; urgency=low
+
+  * New upstream
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 24 Apr 2013 15:20:43 +0200
+
 pixelmed (20120508-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch	2013-04-24 13:52:11 UTC (rev 13400)
@@ -3,10 +3,10 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20101204/com/pixelmed/display/DicomImageViewer.java
+Index: pixelmed-20130220/com/pixelmed/display/DicomImageViewer.java
 ===================================================================
---- pixelmed-20101204.orig/com/pixelmed/display/DicomImageViewer.java	2010-11-27 14:54:13.000000000 +0100
-+++ pixelmed-20101204/com/pixelmed/display/DicomImageViewer.java	2011-01-16 19:11:12.000000000 +0100
+--- pixelmed-20130220.orig/com/pixelmed/display/DicomImageViewer.java	2013-02-20 19:27:29.000000000 +0100
++++ pixelmed-20130220/com/pixelmed/display/DicomImageViewer.java	2013-04-24 15:24:56.210587461 +0200
 @@ -63,7 +63,7 @@
  	static final char screenSnapShotKeyChar = 'K';
  
@@ -16,11 +16,11 @@
  
  	// property names ...
  
-Index: pixelmed-20101204/com/pixelmed/utils/FileUtilities.java
+Index: pixelmed-20130220/com/pixelmed/utils/FileUtilities.java
 ===================================================================
---- pixelmed-20101204.orig/com/pixelmed/utils/FileUtilities.java	2009-12-04 21:37:00.000000000 +0100
-+++ pixelmed-20101204/com/pixelmed/utils/FileUtilities.java	2011-01-16 19:11:12.000000000 +0100
-@@ -225,7 +225,8 @@
+--- pixelmed-20130220.orig/com/pixelmed/utils/FileUtilities.java	2012-11-18 11:25:36.000000000 +0100
++++ pixelmed-20130220/com/pixelmed/utils/FileUtilities.java	2013-04-24 15:24:56.210587461 +0200
+@@ -226,7 +226,8 @@
  	 * @param	fileName	 the file name to make a path to
  	 */
  	static public final String makePathToFileInUsersHomeDirectory(String fileName) {

Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2013-04-24 13:52:11 UTC (rev 13400)
@@ -3,11 +3,11 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20120405/com/pixelmed/display/Makefile
+Index: pixelmed-20130220/com/pixelmed/display/Makefile
 ===================================================================
---- pixelmed-20120405.orig/com/pixelmed/display/Makefile	2012-03-26 09:26:22.000000000 +0200
-+++ pixelmed-20120405/com/pixelmed/display/Makefile	2012-05-08 14:42:25.000000000 +0200
-@@ -215,7 +215,7 @@
+--- pixelmed-20130220.orig/com/pixelmed/display/Makefile	2013-04-24 15:27:52.898585473 +0200
++++ pixelmed-20130220/com/pixelmed/display/Makefile	2013-04-24 15:27:55.046585446 +0200
+@@ -243,7 +243,7 @@
  		com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
  
  testviewerontestimages:	
@@ -16,23 +16,10 @@
  
  testvieweronallmfmrimages:	
  	(for i in ${PATHTOROOT}/../../nemamfmr/DISCIMG/IMAGES/*; do echo "$$i"; java -Xms512m -Xmx512m -cp ${PATHTOROOT}:${VIEWERADDITIONALJARS} com.pixelmed.display.DicomImageViewer "$$i"; done)
-Index: pixelmed-20120405/com/pixelmed/geometry/Makefile
+Index: pixelmed-20130220/Makefile.common.mk
 ===================================================================
---- pixelmed-20120405.orig/com/pixelmed/geometry/Makefile	2007-07-27 18:43:36.000000000 +0200
-+++ pixelmed-20120405/com/pixelmed/geometry/Makefile	2012-05-08 14:42:25.000000000 +0200
-@@ -16,7 +16,7 @@
- .SUFFIXES:	.class .java
- 
- .java.class:
--	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar \
-+	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${PATHTOADDITIONAL}/vecmath.jar \
- 		-sourcepath ${PATHTOROOT} $<
- 
- archive:
-Index: pixelmed-20120405/Makefile.common.mk
-===================================================================
---- pixelmed-20120405.orig/Makefile.common.mk	2011-05-02 09:22:11.000000000 +0200
-+++ pixelmed-20120405/Makefile.common.mk	2012-05-08 14:42:25.000000000 +0200
+--- pixelmed-20130220.orig/Makefile.common.mk	2013-04-24 15:27:52.934585470 +0200
++++ pixelmed-20130220/Makefile.common.mk	2013-04-24 15:27:55.062585449 +0200
 @@ -4,9 +4,10 @@
  
  PATHTOHOME = /Users/dclunie
@@ -64,3 +51,16 @@
  
  DISPLAYADDITIONALJARS = ${DICOMADDITIONALJARS}:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/clibwrapper_jiio.jar
  
+Index: pixelmed-20130220/com/pixelmed/geometry/Makefile
+===================================================================
+--- pixelmed-20130220.orig/com/pixelmed/geometry/Makefile	2013-04-24 15:28:09.838585281 +0200
++++ pixelmed-20130220/com/pixelmed/geometry/Makefile	2013-04-24 15:28:17.758585190 +0200
+@@ -16,7 +16,7 @@
+ .SUFFIXES:	.class .java
+ 
+ .java.class:
+-	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar -sourcepath ${PATHTOROOT} $<
++	javac ${JAVACOPTIONS} -classpath ${PATHTOROOT}:${PATHTOADDITIONAL}/vecmath.jar -sourcepath ${PATHTOROOT} $<
+ 
+ archive:
+ 	tar -cvf - Makefile *.java | gzip -best > ../../../geometry.`date '+%Y%m%d'`.tar.gz

Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch	2013-04-24 13:52:11 UTC (rev 13400)
@@ -3,10 +3,10 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20120508/Makefile
+Index: pixelmed-20130220/Makefile
 ===================================================================
---- pixelmed-20120508.orig/Makefile	2012-05-31 13:53:44.159037789 +0200
-+++ pixelmed-20120508/Makefile	2012-05-31 13:53:44.715037782 +0200
+--- pixelmed-20130220.orig/Makefile	2013-04-24 15:25:01.182587405 +0200
++++ pixelmed-20130220/Makefile	2013-04-24 15:25:02.030587394 +0200
 @@ -165,7 +165,7 @@
  WEBSTARTFILES = \
  	webstart/pixelmed.jar \
@@ -61,7 +61,7 @@
  	mkdir -p DoseUtility.app/Contents/Resources/Java
  	cp $< $@
  
-@@ -897,7 +897,7 @@
+@@ -898,7 +898,7 @@
  javadoc:
  	rm -rf docs/javadoc
  	javadoc \
@@ -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-20120508/Makefile.common.mk
+Index: pixelmed-20130220/Makefile.common.mk
 ===================================================================
---- 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
+--- pixelmed-20130220.orig/Makefile.common.mk	2013-04-24 15:24:46.986587566 +0200
++++ pixelmed-20130220/Makefile.common.mk	2013-04-24 15:25:02.034587393 +0200
 @@ -35,7 +35,7 @@
  
  DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar
@@ -83,10 +83,10 @@
  
  VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar
  
-Index: pixelmed-20120508/webstart/DoseUtility.jnlp
+Index: pixelmed-20130220/webstart/DoseUtility.jnlp
 ===================================================================
---- 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
+--- pixelmed-20130220.orig/webstart/DoseUtility.jnlp	2011-12-08 14:10:09.000000000 +0100
++++ pixelmed-20130220/webstart/DoseUtility.jnlp	2013-04-24 15:25:02.034587393 +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/fixfonts.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/patches/fixfonts.patch	2013-04-24 13:52:11 UTC (rev 13400)
@@ -2,11 +2,11 @@
  No such things as Arial Unicode MS or Bitstream Cybertif on debian OS
 Author: Mathieu Malaterre <malat at debian.org>
 
-Index: pixelmed-20120218/com/pixelmed/display/ApplicationFrame.java
+Index: pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java
 ===================================================================
---- pixelmed-20120218.orig/com/pixelmed/display/ApplicationFrame.java	2012-05-07 10:50:17.956072578 +0200
-+++ pixelmed-20120218/com/pixelmed/display/ApplicationFrame.java	2012-05-07 10:50:44.912071605 +0200
-@@ -238,7 +238,10 @@
+--- pixelmed-20130220.orig/com/pixelmed/display/ApplicationFrame.java	2013-02-21 00:07:48.000000000 +0100
++++ pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java	2013-04-24 15:25:07.590587331 +0200
+@@ -302,7 +302,10 @@
  		if (font == null || !font.getFamily().equals("Arial Unicode MS")) {
  			font = new Font("Bitstream Cyberbit",Font.PLAIN,13);
  			if (font == null || !font.getFamily().equals("Bitstream Cyberbit")) {

Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2013-04-24 13:52:11 UTC (rev 13400)
@@ -3,18 +3,29 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20120508/com/pixelmed/test/Makefile
+Index: pixelmed-20130220/com/pixelmed/test/Makefile
 ===================================================================
---- 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 @@
+--- pixelmed-20130220.orig/com/pixelmed/test/Makefile	2013-04-24 15:37:48.278578770 +0200
++++ pixelmed-20130220/com/pixelmed/test/Makefile	2013-04-24 15:44:55.274573961 +0200
+@@ -100,9 +100,9 @@
  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 testbase64
-+alltests:	testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testattributelist \
-+			testcontentitem testcodingscheme testcharset testdicomdir testuuid testbase64
+-alltests:	testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testsafeprivate testremoveid testattributelist \
+-			testcontentitem testcodingscheme testcharset testcleaner testanatomy testgeometry testdicomdir testnetwork testuuid testbase64 testdates testsequence \
+-			testthread testdatabase testmultiframe
++alltests:	testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testremoveid testattributelist \
++			testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \
++			testthread testmultiframe
+ 			
+ testmultiframe:	${OBJS}
+ 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestMultiFrameImageFactory_AllTests
+@@ -190,7 +190,7 @@
+ 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestAnatomy_AllTests
  
- testsuv:	${OBJS}
- 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestSUVTransform_AllTests
+ testgeometry:	${OBJS}
+-	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestGeometry_AllTests
++	java -cp ${PATHTOROOT}:${JUNITJAR}:/usr/share/java/vecmath.jar -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestGeometry_AllTests
+ 
+ testdicomdir:	${OBJS}
+ 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestDicomDirectory_AllTests

Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules	2013-04-24 12:54:00 UTC (rev 13399)
+++ trunk/packages/pixelmed/trunk/debian/rules	2013-04-24 13:52:11 UTC (rev 13400)
@@ -16,5 +16,10 @@
 	chmod -x .com.pixelmed.display.DicomImageViewer.properties 
 	dh_auto_install
 
+override_dh_clean:
+	dh_clean com/pixelmed/test/tmp/TestCleanerReceiveAndClean/1.3.6.1.4.1.5962.99.1.4198289672.2040812585.1361407987975.4.0
+	dh_clean BUILDDATE
+	dh_clean manifest.txt
+
 get-orig-source:
 	./debian/get-orig-source

More information about the debian-med-commit mailing list