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

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-07-05 18:20:02 +0000 (Mon, 05 Jul 2010)
New Revision: 4996

Modified:
   trunk/packages/pixelmed/trunk/debian/changelog
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
Log:
working toward next release

Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog	2010-07-05 12:56:58 UTC (rev 4995)
+++ trunk/packages/pixelmed/trunk/debian/changelog	2010-07-05 18:20:02 UTC (rev 4996)
@@ -1,3 +1,9 @@
+pixelmed (20100617-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 05 Jul 2010 20:13:41 +0200
+
 pixelmed (20100430-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2010-07-05 12:56:58 UTC (rev 4995)
+++ trunk/packages/pixelmed/trunk/debian/control	2010-07-05 18:20:02 UTC (rev 4996)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 7), quilt
-Build-Depends-Indep: javahelper, default-jdk, libhsqldb-java, libvecmath-java, libjmdns-java
+Build-Depends-Indep: javahelper, default-jdk, libhsqldb-java, libvecmath-java, libjmdns-java, junit4
 Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/pixelmed/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/pixelmed/trunk/

Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2010-07-05 12:56:58 UTC (rev 4995)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2010-07-05 18:20:02 UTC (rev 4996)
@@ -22,27 +22,30 @@
  		-sourcepath ${PATHTOROOT} $<
  
  archive:
---- pixelmed-20091114/Makefile.common.mk	2007-12-27 21:23:51.000000000 +0100
-+++ pixelmed-20091114.old/Makefile.common.mk	2009-11-17 11:54:17.000000000 +0100
-@@ -4,7 +4,8 @@
+--- pixelmed-20100617/Makefile.common.mk	2010-05-23 19:55:10.000000000 +0200
++++ pixelmed-20100617.old/Makefile.common.mk	2010-07-05 20:16:34.000000000 +0200
+@@ -4,9 +4,10 @@
  
  PATHTOHOME = /Users/dclunie
  
+-JUNITJAR = ${PATHTOROOT}/lib/junit/junit-4.8.1.jar
++JUNITJAR = /usr/share/java/junit4.jar
+ 
 -ADDITIONALJARDIRINROOT = lib/additional
 +#ADDITIONALJARDIRINROOT = lib/additional
 +#ADDITIONALJARDIRINROOT = /usr/share/java
  
  PATHTODCTOOLSUPPORTFROMROOT = ../../dctool.support
  
-@@ -13,6 +14,7 @@
- PATHTOSCPECGSAMPLESFROMROOT = ../../../Documents/Medical/stuff/ECG/OpenECG
+@@ -17,6 +18,7 @@
+ PATHTOTESTFILESFROMROOT = ./testpaths
  
  PATHTOADDITIONAL = ${PATHTOROOT}/${ADDITIONALJARDIRINROOT}
 +PATHTOADDITIONAL = /usr/share/java
  
  PATHTODCTOOLSUPPORT = ${PATHTOROOT}/${PATHTODCTOOLSUPPORTFROMROOT}
  
-@@ -20,7 +22,8 @@
+@@ -24,7 +26,8 @@
  
  # excalibur not needed for compile, but useful for execution if available ...
  # commons-codec not needed for compile, but useful for execution if available ...