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

[Mathieu Malaterre]

Author: malat
Date: 2012-05-08 13:25:37 +0000 (Tue, 08 May 2012)
New Revision: 10755

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
   trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
   trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Prepare next upload

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2012-05-08 13:22:32 UTC (rev 10754)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2012-05-08 13:25:37 UTC (rev 10755)
@@ -1,5 +1,6 @@
-pixelmed (20120218-2) UNRELEASED; urgency=low
+pixelmed (20120405-1) UNRELEASED; urgency=low
 
+  * New upstream
   * Use my @d.o alias
   * fix issue with encapsulated DICOM files (need libjai-imageio-core-java)
   * Add missing jmdns.jar in manifest file

Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2012-05-08 13:22:32 UTC (rev 10754)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2012-05-08 13:25:37 UTC (rev 10755)
@@ -3,11 +3,11 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20110928/com/pixelmed/display/Makefile
+Index: pixelmed-20120405/com/pixelmed/display/Makefile
 ===================================================================
---- pixelmed-20110928.orig/com/pixelmed/display/Makefile	2011-09-02 22:38:54.000000000 +0200
-+++ pixelmed-20110928/com/pixelmed/display/Makefile	2011-10-26 16:00:27.000000000 +0200
-@@ -213,7 +213,7 @@
+--- 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 @@
  		com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
  
  testviewerontestimages:	
@@ -16,10 +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-20110928/com/pixelmed/geometry/Makefile
+Index: pixelmed-20120405/com/pixelmed/geometry/Makefile
 ===================================================================
---- pixelmed-20110928.orig/com/pixelmed/geometry/Makefile	2007-07-27 18:43:36.000000000 +0200
-+++ pixelmed-20110928/com/pixelmed/geometry/Makefile	2011-10-26 16:00:27.000000000 +0200
+--- 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
  
@@ -29,10 +29,10 @@
  		-sourcepath ${PATHTOROOT} $<
  
  archive:
-Index: pixelmed-20110928/Makefile.common.mk
+Index: pixelmed-20120405/Makefile.common.mk
 ===================================================================
---- pixelmed-20110928.orig/Makefile.common.mk	2011-05-02 09:22:11.000000000 +0200
-+++ pixelmed-20110928/Makefile.common.mk	2011-10-26 16:00:27.000000000 +0200
+--- 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
 @@ -4,9 +4,10 @@
  
  PATHTOHOME = /Users/dclunie

Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2012-05-08 13:22:32 UTC (rev 10754)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2012-05-08 13:25:37 UTC (rev 10755)
@@ -3,16 +3,18 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Last-Update: 2012-05-05
 
-Index: pixelmed-20120218/com/pixelmed/test/Makefile
+Index: pixelmed-20120405/com/pixelmed/test/Makefile
 ===================================================================
---- pixelmed-20120218.orig/com/pixelmed/test/Makefile	2012-03-05 12:12:51.000000000 +0100
-+++ pixelmed-20120218/com/pixelmed/test/Makefile	2012-03-05 12:19:19.000000000 +0100
-@@ -73,7 +73,7 @@
+--- 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 @@
  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
-+alltests:	testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testattributelist testcontentitem testcodingscheme testcharset testdicomdir
+-alltests:	testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testsafeprivate testattributelist \
+-			testcontentitem testcodingscheme testcharset testcleaner testgeometry testdicomdir testnetwork testuuid
++alltests:	testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testattributelist \
++			testcontentitem testcodingscheme testcharset testdicomdir testuuid
  
  testsuv:	${OBJS}
  	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestSUVTransform_AllTests

Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series	2012-05-08 13:22:32 UTC (rev 10754)
+++ trunk/packages/pixelmed/trunk/debian/patches/series	2012-05-08 13:25:37 UTC (rev 10755)
@@ -6,5 +6,5 @@
 makefile.patch
 commons-net-ftp.patch
 addmanifest.patch
+fixfonts.patch
 removetest.patch
-fixfonts.patch