[med-svn] r15484 - trunk/packages/pixelmed/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-12-10 17:21:54 +0000 (Tue, 10 Dec 2013)
New Revision: 15484

Modified:
   trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch
   trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch
   trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
Log:
Rework patches

Modified: trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch	2013-12-10 17:06:27 UTC (rev 15483)
+++ trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch	2013-12-10 17:21:54 UTC (rev 15484)
@@ -4,14 +4,14 @@
 
 Index: pixelmed-20131018/com/pixelmed/test/Makefile
 ===================================================================
---- pixelmed-20131018.orig/com/pixelmed/test/Makefile	2013-12-10 17:55:29.000000000 +0100
-+++ pixelmed-20131018/com/pixelmed/test/Makefile	2013-12-10 17:55:42.122145434 +0100
+--- pixelmed-20131018.orig/com/pixelmed/test/Makefile	2013-12-10 18:17:31.000000000 +0100
++++ pixelmed-20131018/com/pixelmed/test/Makefile	2013-12-10 18:18:09.000000000 +0100
 @@ -103,7 +103,7 @@
  clean:
  	rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm
  
--alltests:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testsafeprivate testremoveid testattributelist \
-+alltests:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testsafeprivate testremoveid testattributelist \
- 			testcontentitem testcodingscheme testcharset testcleaner testanatomy testgeometry testdicomdir testnetwork testuuid testbase64 testdates testsequence \
- 			testthread testdatabase testmultiframe
+-alltests:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testremoveid testattributelist \
++alltests:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testremoveid testattributelist \
+ 			testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \
+ 			testthread testmultiframe
  			

Modified: trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch	2013-12-10 17:06:27 UTC (rev 15483)
+++ trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch	2013-12-10 17:21:54 UTC (rev 15484)
@@ -4,14 +4,14 @@
 
 Index: pixelmed-20131018/com/pixelmed/test/Makefile
 ===================================================================
---- pixelmed-20131018.orig/com/pixelmed/test/Makefile	2013-12-10 17:55:42.122145434 +0100
-+++ pixelmed-20131018/com/pixelmed/test/Makefile	2013-12-10 17:55:46.362145374 +0100
+--- pixelmed-20131018.orig/com/pixelmed/test/Makefile	2013-12-10 18:18:09.000000000 +0100
++++ pixelmed-20131018/com/pixelmed/test/Makefile	2013-12-10 18:18:44.118126918 +0100
 @@ -105,7 +105,7 @@
  
- alltests:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testsafeprivate testremoveid testattributelist \
- 			testcontentitem testcodingscheme testcharset testcleaner testanatomy testgeometry testdicomdir testnetwork testuuid testbase64 testdates testsequence \
--			testthread testdatabase testmultiframe
-+			testdatabase testmultiframe
+ alltests:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testremoveid testattributelist \
+ 			testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \
+-			testthread testmultiframe
++			testmultiframe
  			
  testcolorconv:	${OBJS}
  	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestColorConversions_AllTests

Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2013-12-10 17:06:27 UTC (rev 15483)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2013-12-10 17:21:54 UTC (rev 15484)
@@ -5,8 +5,21 @@
 
 Index: pixelmed-20131018/com/pixelmed/test/Makefile
 ===================================================================
---- pixelmed-20131018.orig/com/pixelmed/test/Makefile	2013-10-05 16:02:23.000000000 +0200
-+++ pixelmed-20131018/com/pixelmed/test/Makefile	2013-12-10 17:50:30.770149604 +0100
+--- pixelmed-20131018.orig/com/pixelmed/test/Makefile	2013-12-10 18:02:20.066140105 +0100
++++ pixelmed-20131018/com/pixelmed/test/Makefile	2013-12-10 18:17:31.134127896 +0100
+@@ -103,9 +103,9 @@
+ clean:
+ 	rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm
+ 
+-alltests:	testcolorconv 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:	testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testremoveid testattributelist \
++			testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \
++			testthread testmultiframe
+ 			
+ testcolorconv:	${OBJS}
+ 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestColorConversions_AllTests
 @@ -196,7 +196,7 @@
  	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestAnatomy_AllTests