[med-svn] r10710 - in trunk/packages/pixelmed/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Sat May 5 17:58:28 UTC 2012
Author: malat
Date: 2012-05-05 17:58:28 +0000 (Sat, 05 May 2012)
New Revision: 10710
Modified:
trunk/packages/pixelmed/trunk/debian/changelog
trunk/packages/pixelmed/trunk/debian/control
trunk/packages/pixelmed/trunk/debian/copyright
trunk/packages/pixelmed/trunk/debian/dicomimageviewer
trunk/packages/pixelmed/trunk/debian/dicomimageviewer.1
trunk/packages/pixelmed/trunk/debian/doseutility
trunk/packages/pixelmed/trunk/debian/doseutility.1
trunk/packages/pixelmed/trunk/debian/ecgviewer
trunk/packages/pixelmed/trunk/debian/ecgviewer.1
trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch
trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch
trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
Log:
Some cleanups
Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/changelog 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,3 +1,10 @@
+pixelmed (20120218-2) UNRELEASED; urgency=low
+
+ * Use my @d.o alias
+ * fix issue with encapsulated DICOM files (need libjai-imageio-core-java)
+
+ -- Mathieu Malaterre <malat at debian.org> Sat, 05 May 2012 18:45:29 +0200
+
pixelmed (20120218-1) unstable; urgency=low
* New upstream
Modified: trunk/packages/pixelmed/trunk/debian/control
===================================================================
--- trunk/packages/pixelmed/trunk/debian/control 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/control 2012-05-05 17:58:28 UTC (rev 10710)
@@ -3,7 +3,7 @@
Priority: optional
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>
+Uploaders: Mathieu Malaterre <malat at debian.org>
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.3
Modified: trunk/packages/pixelmed/trunk/debian/copyright
===================================================================
--- trunk/packages/pixelmed/trunk/debian/copyright 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/copyright 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,25 +1,24 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Debianized-By: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Debianized-Date: Sat, 21 Nov 2009 22:30:57 +0100
-Original-Source: http://www.pixelmed.com/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: PixelMed Java DICOM Toolkit
+Upstream-Contact: pixelmed_dicom at yahoogroups.com
+Source: http://www.pixelmed.com/
Files: *
-Copyright:
- Copyright (c) 2001-2008, David A. Clunie DBA PixelMed Publishing. All rights reserved.
-License:
+Copyright: 2001-2008, David A. Clunie DBA PixelMed Publishing. All rights reserved.
+License: BSD
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
@@ -29,14 +28,13 @@
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'
+ Copyright 2009-2012, Mathieu Malaterre <malat at debian.org>
+License: BSD
+ Same as above
Modified: trunk/packages/pixelmed/trunk/debian/dicomimageviewer
===================================================================
--- trunk/packages/pixelmed/trunk/debian/dicomimageviewer 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/dicomimageviewer 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,7 +1,7 @@
#! /bin/sh
# Shell script wrapper around the dicomimageviewer program,
-# Copyright 2010 by Mathieu Malaterer <mathieu.malaterre at gmail.com>
+# Copyright 2010-2012 by Mathieu Malaterre <malat at debian.org>
#
# Licensed under the same terms as pixelmed toolkit itself, that is under
# the conditions of the BSD licence.
@@ -12,7 +12,7 @@
# We prefer to use openjdk or Sun's java if available
find_java_runtime openjdk sun || find_java_runtime
-find_jars pixelmed hsqldb vecmath jmdns commons-codec jai_imageio
+find_jars pixelmed hsqldb vecmath jmdns commons-codec jai_imageio clibwrapper_jiio
#java -Xmx512m -Xms512m -cp
run_java $HEADLESS com.pixelmed.display.DicomImageViewer "$@"
Modified: trunk/packages/pixelmed/trunk/debian/dicomimageviewer.1
===================================================================
--- trunk/packages/pixelmed/trunk/debian/dicomimageviewer.1 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/dicomimageviewer.1 2012-05-05 17:58:28 UTC (rev 10710)
@@ -12,5 +12,12 @@
.B DICOMImageViewer
command.
+.SH "WARNING"
+.B You will need to install the libjai-imageio-core-java package in order to
+read all the encapsulated DICOM files (eg. JPEG Lossless). The installation
+cannot be made automatic in debian since jai-imageio-core is a package in
+non-free. You will need to edit your default sources.list file to retrieve this
+package.
+
This manual page was written by Mathieu Malaterre
-<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).
+<malat at debian.org> for the Debian GNU/Linux system (but may be used by others).
Modified: trunk/packages/pixelmed/trunk/debian/doseutility
===================================================================
--- trunk/packages/pixelmed/trunk/debian/doseutility 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/doseutility 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,7 +1,7 @@
#! /bin/sh
# Shell script wrapper around the dicomimageviewer program,
-# Copyright 2010 by Mathieu Malaterer <mathieu.malaterre at gmail.com>
+# Copyright 2010-2012 by Mathieu Malaterre <malat at debian.org>
#
# Licensed under the same terms as pixelmed toolkit itself, that is under
# the conditions of the BSD licence.
Modified: trunk/packages/pixelmed/trunk/debian/doseutility.1
===================================================================
--- trunk/packages/pixelmed/trunk/debian/doseutility.1 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/doseutility.1 2012-05-05 17:58:28 UTC (rev 10710)
@@ -12,4 +12,4 @@
command.
This manual page was written by Mathieu Malaterre
-<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).
+<malat at debian.org> for the Debian GNU/Linux system (but may be used by others).
Modified: trunk/packages/pixelmed/trunk/debian/ecgviewer
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ecgviewer 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/ecgviewer 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,7 +1,7 @@
#! /bin/sh
# Shell script wrapper around the dicomimageviewer program,
-# Copyright 2010 by Mathieu Malaterer <mathieu.malaterre at gmail.com>
+# Copyright 2010-2012 by Mathieu Malaterre <malat at debian.org>
#
# Licensed under the same terms as pixelmed toolkit itself, that is under
# the conditions of the BSD licence.
Modified: trunk/packages/pixelmed/trunk/debian/ecgviewer.1
===================================================================
--- trunk/packages/pixelmed/trunk/debian/ecgviewer.1 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/ecgviewer.1 2012-05-05 17:58:28 UTC (rev 10710)
@@ -13,4 +13,4 @@
command.
This manual page was written by Mathieu Malaterre
-<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).
+<malat at debian.org> for the Debian GNU/Linux system (but may be used by others).
Modified: trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,3 +1,8 @@
+Description: Set path according to debian layout
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
+
Index: pixelmed-20101204/com/pixelmed/display/DicomImageViewer.java
===================================================================
--- pixelmed-20101204.orig/com/pixelmed/display/DicomImageViewer.java 2010-11-27 14:54:13.000000000 +0100
Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,4 +1,7 @@
-Set include path according to debian layout
+Description: Set include path according to debian layout
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
Index: pixelmed-20110928/com/pixelmed/display/Makefile
===================================================================
Modified: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,3 +1,8 @@
+Description: add manifest file
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
+
Index: pixelmed-20110717/Makefile
===================================================================
--- pixelmed-20110717.orig/Makefile 2011-08-19 18:28:45.000000000 +0200
Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,4 +1,8 @@
-This patch fix compilation for ftp class
+Description: This patch fix compilation for ftp class
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
+
Index: pixelmed-20111230/Makefile
===================================================================
--- pixelmed-20111230.orig/Makefile 2012-01-16 10:17:15.000000000 +0100
Modified: trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.jnlp.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,4 +1,7 @@
-Fix jnlp path
+Description: Fix jnlp path
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
Index: pixelmed-20101204/webstart/DicomImageViewer.jnlp
===================================================================
Modified: trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/dicomimageviewer.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,4 +1,7 @@
-Fix path according to debian layout
+Description: Fix path according to debian layout
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
Index: pixelmed-20101204/DicomImageViewer.sh
===================================================================
Modified: trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/ecgviewer.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,4 +1,7 @@
-Fix path according to debian layout
+Description: Fix path according to debian layout
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
Index: pixelmed-20120218/ECGViewer.sh
===================================================================
Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,4 +1,7 @@
-*.dat files were removed
+Description: *.dat files were removed
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
Index: pixelmed-20110717/Makefile
===================================================================
Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2012-05-05 15:50:17 UTC (rev 10709)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2012-05-05 17:58:28 UTC (rev 10710)
@@ -1,3 +1,8 @@
+Description: remove failing tests
+Forwarded: http://tech.groups.yahoo.com/group/pixelmed_dicom/message/995
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-05-05
+
Index: pixelmed-20120218/com/pixelmed/test/Makefile
===================================================================
--- pixelmed-20120218.orig/com/pixelmed/test/Makefile 2012-03-05 12:12:51.000000000 +0100
More information about the debian-med-commit
mailing list