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

Tue Nov 17 11:22:13 UTC 2009

Author: malat-guest
Date: 2009-11-17 11:22:13 +0000 (Tue, 17 Nov 2009)
New Revision: 4343

Added:
   trunk/packages/pixelmed/trunk/debian/README.source
   trunk/packages/pixelmed/trunk/debian/copyright
Modified:
   trunk/packages/pixelmed/trunk/debian/control
   trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
   trunk/packages/pixelmed/trunk/debian/rules
Log:
fix copyright, fix lintian

Added: trunk/packages/pixelmed/trunk/debian/README.source
===================================================================

--- trunk/packages/pixelmed/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/README.source	2009-11-17 11:22:13 UTC (rev 4343)
@@ -0,0 +1,2 @@
+This packages uses the quilt patch system. Please read
+/usr/share/doc/quilt/README.source for more information.

Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control	2009-11-17 10:58:50 UTC (rev 4342)
+++ trunk/packages/pixelmed/trunk/debian/control	2009-11-17 11:22:13 UTC (rev 4343)
@@ -4,7 +4,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7), default-jdk, libhsqldb-java, libvecmath1.2-java | libjava3d-java, libjmdns-java, quilt
+Build-Depends: debhelper (>= 7), javahelper, default-jdk, libhsqldb-java, libvecmath1.2-java | libjava3d-java, libjmdns-java, quilt
 Standards-Version: 3.8.3
 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/

Added: trunk/packages/pixelmed/trunk/debian/copyright
===================================================================
--- trunk/packages/pixelmed/trunk/debian/copyright	                        (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/copyright	2009-11-17 11:22:13 UTC (rev 4343)
@@ -0,0 +1,42 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Debianized-By: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Debianized-Date: Mon, 12 Jan 2009 11:12:57 +0100
+Original-Source: http://www.pixelmed.com/
+
+Files: *
+Copyright:
+ Copyright (c) 2001-2008, David A. Clunie DBA PixelMed Publishing. All rights reserved.
+License:
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of source code must retain the above copyright notice, this list of
+    conditions and the following disclaimers.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimers in the documentation and/or other materials
+    provided with the distribution.
+ 
+ 3. Neither the name of PixelMed Publishing nor the names of its contributors may
+    be used to endorse or promote products derived from this software.
+ 
+ This software is provided by the copyright holders and contributors "as is" and any
+ express or implied warranties, including, but not limited to, the implied warranties
+ of merchantability and fitness for a particular purpose are disclaimed. In no event
+ shall the copyright owner or contributors be liable for any direct, indirect, incidental,
+ special, exemplary, or consequential damages (including, but not limited to, procurement
+ of substitute goods or services; loss of use, data or profits; or business interruption)
+ however caused and on any theory of liability, whether in contract, strict liability, or
+ tort (including negligence or otherwise) arising in any way out of the use of this software,
+ even if advised of the possibility of such damage.
+ 
+ This software has neither been tested nor approved for clinical use or for incorporation in
+ a medical device. It is the redistributor's or user's responsibility to comply with any
+ applicable local, state, national or international regulations.
+
+Files: debian/*
+Copyright:
+ Copyright 2009, Mathieu Malaterre <mathieu.malaterre at gmail.com>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL-2 or any later version,
+ see `/usr/share/common-licenses/GPL-2'


Property changes on: trunk/packages/pixelmed/trunk/debian/copyright
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2009-11-17 10:58:50 UTC (rev 4342)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch	2009-11-17 11:22:13 UTC (rev 4343)
@@ -1,7 +1,29 @@
 Set include path according to debian layout
 
---- pixelmed-20090816/Makefile.common.mk	2007-12-27 21:23:51.000000000 +0100
-+++ pixelmed/Makefile.common.mk	2009-11-17 11:43:43.000000000 +0100
+--- pixelmed-20091114/com/pixelmed/display/Makefile	2009-06-07 20:13:34.000000000 +0200
++++ pixelmed-20091114.old/com/pixelmed/display/Makefile	2009-11-17 11:58:43.000000000 +0100
+@@ -212,7 +212,7 @@
+ 		com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
+ 
+ testviewerontestimages:	
+-	(cd ${PATHTOROOT}; for i in `cat ${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/testlist`; do echo "$$i"; java -Xms512m -Xmx512m -cp pixelmed.jar:${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/hsqldb.jar:${PATHTOADDITIONAL}/vecmath1.2-1.14.jar:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/commons-codec-1.3.jar:${PATHTOADDITIONAL}/jmdns.jar com.pixelmed.display.DicomImageViewer "${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/$$i"; done)
++	(cd ${PATHTOROOT}; for i in `cat ${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/testlist`; do echo "$$i"; java -Xms512m -Xmx512m -cp pixelmed.jar:${PATHTOADDITIONAL}/excalibur-bzip2-1.0.jar:${PATHTOADDITIONAL}/hsqldb.jar:${PATHTOADDITIONAL}/vecmath.jar:${PATHTOADDITIONAL}/jai_imageio.jar:${PATHTOADDITIONAL}/commons-codec.jar:${PATHTOADDITIONAL}/jmdns.jar com.pixelmed.display.DicomImageViewer "${PATHTODCTOOLSUPPORTFROMROOT}/images/dicom/$$i"; done)
+ 
+ testvieweronallmfmrimages:	
+ 	(for i in ${PATHTOROOT}/../../nemamfmr/DISCIMG/IMAGES/*; do echo "$$i"; java -Xms512m -Xmx512m -cp ${PATHTOROOT}:${VIEWERADDITIONALJARS} com.pixelmed.display.DicomImageViewer "$$i"; done)
+--- pixelmed-20091114/com/pixelmed/geometry/Makefile	2007-07-27 18:43:36.000000000 +0200
++++ pixelmed-20091114.old/com/pixelmed/geometry/Makefile	2009-11-17 11:58:26.000000000 +0100
+@@ -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:
+--- 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 @@
  
  PATHTOHOME = /Users/dclunie

Modified: trunk/packages/pixelmed/trunk/debian/rules
===================================================================
--- trunk/packages/pixelmed/trunk/debian/rules	2009-11-17 10:58:50 UTC (rev 4342)
+++ trunk/packages/pixelmed/trunk/debian/rules	2009-11-17 11:22:13 UTC (rev 4343)
@@ -42,7 +42,8 @@
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	#dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 binary-arch: build-arch


