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

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-03-05 12:36:56 +0000 (Mon, 05 Mar 2012)
New Revision: 9885

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
   trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
Log:
Prepare next upstream

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2012-03-05 12:35:47 UTC (rev 9884)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2012-03-05 12:36:56 UTC (rev 9885)
@@ -1,9 +1,18 @@
-pixelmed (20111230-1) UNRELEASED; urgency=low
+pixelmed (20120218-1) unstable; urgency=low
 
+  * New upstream
+   - Major code update to support locale other than english.
+  * Bump Std-Vers to 3.9.3, no changes needed
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 05 Mar 2012 11:04:22 +0100
+
+pixelmed (20111230-1) unstable; urgency=low
+
   * Fix Vcs URLs. Remove quilt for BD
   * New upstream
+  * Fix OCR for GE machine
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 16 Jan 2012 10:14:55 +0100
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 16 Jan 2012 10:21:21 +0100
 
 pixelmed (20111205-1) unstable; urgency=low
 

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2012-03-05 12:35:47 UTC (rev 9884)
+++ trunk/packages/pixelmed/trunk/debian/control	2012-03-05 12:36:56 UTC (rev 9885)
@@ -6,7 +6,7 @@
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: javahelper, default-jdk, libhsqldb-java, libcommons-net2-java (>= 2.0), libvecmath-java, libjmdns-java (>= 3.4), junit4
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/pixelmed/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/pixelmed/trunk/
 Homepage: http://www.pixelmed.com
@@ -15,6 +15,7 @@
 Section: java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}
+Suggests: libjai-imageio-core-java
 Description: DICOM implementation containing Image Viewer and a ECG Viewer
  This is a stand-alone DICOM toolkit that implements code for reading
  and creating DICOM data, DICOM network and file support, a database of

Modified: trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch	2012-03-05 12:35:47 UTC (rev 9884)
+++ trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch	2012-03-05 12:36:56 UTC (rev 9885)
@@ -1,11 +1,12 @@
 Fix path according to debian layout
 
-Index: pixelmed-20101204/ECGViewer.sh
+Index: pixelmed-20120218/ECGViewer.sh
 ===================================================================
---- pixelmed-20101204.orig/ECGViewer.sh	2006-03-12 13:19:18.000000000 +0100
-+++ pixelmed-20101204/ECGViewer.sh	2011-01-16 19:11:11.000000000 +0100
-@@ -1,3 +1,3 @@
- #!/bin/sh
+--- pixelmed-20120218.orig/ECGViewer.sh	2012-03-05 11:05:51.000000000 +0100
++++ pixelmed-20120218/ECGViewer.sh	2012-03-05 11:10:04.000000000 +0100
+@@ -4,4 +4,4 @@
  
--java -cp "./pixelmed.jar:./lib/additional/commons-codec-1.3.jar" com.pixelmed.displaywave.ECGViewer
-+java -cp "/usr/share/java/pixelmed.jar:/usr/share/java/commons-codec.jar" com.pixelmed.displaywave.ECGViewer
+ PIXELMEDDIR=.
+ 
+-java -Xmx1g -cp "${PIXELMEDDIR}/pixelmed.jar:${PIXELMEDDIR}/lib/additional/commons-codec-1.3.jar" com.pixelmed.displaywave.ECGViewer "${dicomfile}"
++java -Xmx1g -cp "/usr/share/java/pixelmed.jar:/usr/share/java/commons-codec.jar" com.pixelmed.displaywave.ECGViewer "${dicomfile}"

Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2012-03-05 12:35:47 UTC (rev 9884)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch	2012-03-05 12:36:56 UTC (rev 9885)
@@ -1,13 +1,13 @@
-Index: pixelmed-20111230/com/pixelmed/test/Makefile
+Index: pixelmed-20120218/com/pixelmed/test/Makefile
 ===================================================================
---- pixelmed-20111230.orig/com/pixelmed/test/Makefile	2011-12-28 16:51:46.000000000 +0100
-+++ pixelmed-20111230/com/pixelmed/test/Makefile	2012-01-16 10:17:21.000000000 +0100
-@@ -65,7 +65,7 @@
+--- 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 @@
  clean:
  	rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm
  
--alltests:	testunkown testctdose testcompositecontext testsafeprivate testattributelist testcontentitem testcodingscheme testcharset testcleaner testgeometry testdicomdir testnetwork
-+alltests:	testunkown testctdose testcompositecontext testattributelist testcontentitem testcodingscheme testcharset testdicomdir
+-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
  
- testunkown:	${OBJS}
- 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestUnknownAttribute_AllTests
+ testsuv:	${OBJS}
+ 	java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestSUVTransform_AllTests