[med-svn] r11140 - in trunk/packages/dicomscope/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu May 31 13:37:16 UTC 2012
Author: malat
Date: 2012-05-31 13:37:16 +0000 (Thu, 31 May 2012)
New Revision: 11140
Added:
trunk/packages/dicomscope/trunk/debian/dicomscope.links
Removed:
trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch
trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch
Modified:
trunk/packages/dicomscope/trunk/debian/README.Debian
trunk/packages/dicomscope/trunk/debian/changelog
trunk/packages/dicomscope/trunk/debian/compat
trunk/packages/dicomscope/trunk/debian/control
trunk/packages/dicomscope/trunk/debian/copyright
trunk/packages/dicomscope/trunk/debian/dicomscope.1
trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
trunk/packages/dicomscope/trunk/debian/patches/series
trunk/packages/dicomscope/trunk/debian/rules
Log:
Update package
Modified: trunk/packages/dicomscope/trunk/debian/README.Debian
===================================================================
--- trunk/packages/dicomscope/trunk/debian/README.Debian 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/README.Debian 2012-05-31 13:37:16 UTC (rev 11140)
@@ -7,4 +7,4 @@
which simply starts: java -jar /usr/share/dicomscope/DICOMscope.jar
--- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed Jan 21 14:51:47 CET 2009
+-- Mathieu Malaterre <malat at debian.org> Wed Jan 21 14:51:47 CET 2009
Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/changelog 2012-05-31 13:37:16 UTC (rev 11140)
@@ -4,6 +4,15 @@
* debian/rules get-orig-source: put orig.tar.gz in ../tarballs to allow
automatic build with svn-buildpackage
+ [ Mathieu Malaterre ]
+ * Use my @d.o alias
+ * Bump Std-Vers to 3.9.3, no changes needed
+ * Use jarwrapper for simplification
+ * Use javahelper to track deps
+ * Use DEP3 for patches
+ * Use format-1.0 for d/copyright
+ * Remove warnings during java compilation by specifying encoding
+
-- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 10 Jan 2012 18:29:15 +0100
dicomscope (3.6.0-8) unstable; urgency=low
Modified: trunk/packages/dicomscope/trunk/debian/compat
===================================================================
--- trunk/packages/dicomscope/trunk/debian/compat 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/compat 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1 +1 @@
-8
+9
Modified: trunk/packages/dicomscope/trunk/debian/control
===================================================================
--- trunk/packages/dicomscope/trunk/debian/control 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/control 2012-05-31 13:37:16 UTC (rev 11140)
@@ -2,18 +2,18 @@
Section: graphics
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>
Priority: extra
-Build-Depends: debhelper (>= 8), cmake, libdcmtk2-dev (>= 3.6.0), default-jdk,
- libssl-dev, libxml2-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), cmake (>= 2.8.2), libdcmtk2-dev (>= 3.6.0), default-jdk,
+ libssl-dev, libxml2-dev, javahelper
+Standards-Version: 3.9.3
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dicomscope/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dicomscope/trunk/
Homepage: http://dicom.offis.de/dscope.php.en
Package: dicomscope
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.6 | tk8.5 | tk8.4 | wish, default-jre
+Depends: ${java:Depends}, ${shlibs:Depends}, ${misc:Depends}, tk8.6 | tk8.5 | tk8.4 | wish, default-jre, jarwrapper
Description: OFFIS DICOM Viewer
DICOMscope is a free DICOM viewer which can display uncompressed, monochrome
DICOM images from all modalities and which supports monitor calibration
Modified: trunk/packages/dicomscope/trunk/debian/copyright
===================================================================
--- trunk/packages/dicomscope/trunk/debian/copyright 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/copyright 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,21 +1,17 @@
-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://dicom.offis.de/dscope.php.en
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: DICOMScope
+Upstream-Source: http://dicom.offis.de/dscope.php.en
Files: *
-Copyright:
- Copyright (C) 1999-2009, OFFIS and Institute for MicroTherapy
+Copyright: (C) 1999-2009, OFFIS and Institute for MicroTherapy
License:
This software and supporting documentation were developed by
-
+ .
OFFIS e.V.
Escherweg 2
26121 Oldenburg
Germany
-
and
-
University of Witten/Herdecke
Department of Radiology and MicroTherapy
Institute for MicroTherapy
@@ -23,14 +19,14 @@
Universitaetsstrasse 142
44799 Bochum
Germany
-
+ .
THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS AND THE INSTITUTE
FOR MICROTHERAPY MAKE NO WARRANTY REGARDING THE SOFTWARE, ITS
PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR USE,
FREEDOM FROM ANY COMPUTER DISEASES OR ITS CONFORMITY TO ANY SPECIFI-
CATION. THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE
IS WITH THE USER.
-
+ .
Copyright of the software and supporting documentation is, unless
otherwise stated, owned by OFFIS and the Institute of MicroTherapy,
and free access is hereby granted as a license to use this software,
@@ -41,8 +37,7 @@
notice.
Files: debian/*
-Copyright:
- Copyright 2009, Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Copyright: 2009, Mathieu Malaterre <malat at debian.org>
License: GPL-2+
The Debian packaging is licensed under the GPL-2 or any later version,
see `/usr/share/common-licenses/GPL-2'
Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.1
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.1 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.1 2012-05-31 13:37:16 UTC (rev 11140)
@@ -13,12 +13,31 @@
command.
.PP
-DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting.
+DICOMscope is a free DICOM viewer which can display uncompressed, monochrome
+DICOM images from all modalities and which supports monitor calibration
+according to DICOM part 14 as well as presentation states. DICOMscope offers a
+print client (DICOM Basic Grayscale Print Management) which also implements the
+optional Presentation LUT SOP Class. The development of this prototype was
+commissioned by the "Committee for the Advancement of DICOM" and demonstrated
+at the European Congress of Radiology ECR 1999. An enhanced version was
+developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD
+1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains
+numerous extensions, including a print server, support for encrypted DICOM
+communication, digital signatures and structured reporting.
-DICOMscope is not meant as a competition for commercial DICOM viewers. The application is rather a feasibility study for DICOM presentation states. The program is not appropriate to be used in a clinical environment, e.g. for reporting.
+DICOMscope is not meant as a competition for commercial DICOM viewers. The
+application is rather a feasibility study for DICOM presentation states. The
+program is not appropriate to be used in a clinical environment, e.g. for
+reporting.
.SH "DISCLAIMER"
-This software is made available, as is, and OFFIS, the Institute for Microtherapy / VISUS-TT and OTech make no warranty regarding the software, its performance, its merchantability or fitness for any particular use, freedom from any computer diseases or its conformity to any specification. The entire risk as to quality and performance of the software is with the user. This software is intended for investigational use only. It has not been tested or approved for clinical application or production environments.
+This software is made available, as is, and OFFIS, the Institute for
+Microtherapy / VISUS-TT and OTech make no warranty regarding the software, its
+performance, its merchantability or fitness for any particular use, freedom
+from any computer diseases or its conformity to any specification. The entire
+risk as to quality and performance of the software is with the user. This
+software is intended for investigational use only. It has not been tested or
+approved for clinical application or production environments.
.SH SEE ALSO
See the project homepage
@@ -26,7 +45,8 @@
for more information.
.SH "COPYRIGHT"
-Copyright (C) 1994-2005 by Kuratorium OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+Copyright (C) 1994-2005 by Kuratorium OFFIS e.V., Escherweg 2, 26121 Oldenburg,
+Germany.
-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).
+This manual page was written by Mathieu Malaterre <malat at debian.org> for the
+Debian GNU/Linux system (but may be used by others).
Added: trunk/packages/dicomscope/trunk/debian/dicomscope.links
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.links (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.links 2012-05-31 13:37:16 UTC (rev 11140)
@@ -0,0 +1 @@
+usr/share/java/DICOMscope.jar usr/bin/dicomscope
Modified: trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,4 +1,6 @@
-This is undefined in the source (fix compilation)
+Description: This is undefined in the source (fix compilation)
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
===================================================================
Modified: trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,5 +1,7 @@
-Apparently the original package was compiled on 32bits and thus long and Sint32
-could be interchanged
+Description: Apparently the original package was compiled on 32bits and thus
+ long and Sint32 could be interchanged
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp
===================================================================
Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,14 +1,16 @@
-Instead of using the in-src dcmtk build system, provide a replacement one
-that allow building dicomscope outside of dcmtk
+Description: Instead of using the in-src dcmtk build system, provide a
+ replacement one that allow building dicomscope outside of dcmtk
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dicomscope-3.6.0/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
-@@ -0,0 +1,24 @@
++++ dicomscope-3.6.0/CMakeLists.txt 2012-05-31 13:33:28.826955164 +0000
+@@ -0,0 +1,27 @@
+PROJECT(DICOMSCOPE)
+
-+cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8)
+
+#-----------------------------------------------------------------------------
+SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
@@ -22,8 +24,11 @@
+IF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
+ SET(DICOMSCOPE_INSTALL_LIB_DIR "lib")
+ENDIF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
++IF(NOT DICOMSCOPE_INSTALL_SHARE_DIR)
++ SET(DICOMSCOPE_INSTALL_SHARE_DIR "share/dicomscope")
++ENDIF(NOT DICOMSCOPE_INSTALL_SHARE_DIR)
+IF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
-+ SET(DICOMSCOPE_INSTALL_JAVA_DIR "share/dicomscope")
++ SET(DICOMSCOPE_INSTALL_JAVA_DIR "share/java")
+ENDIF(NOT DICOMSCOPE_INSTALL_JAVA_DIR)
+
+INCLUDE_DIRECTORIES(interface/include)
@@ -33,32 +38,29 @@
Index: dicomscope-3.6.0/interface/libsrc/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
-@@ -0,0 +1,60 @@
++++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt 2012-05-31 13:33:22.638955249 +0000
+@@ -0,0 +1,55 @@
+SET(dsgui_SRCS
-+DSRCodeValue.cpp
-+DSRCompositeValue.cpp
-+DSRDocument.cpp
-+DSRDocumentTree.cpp
-+DSRImageValue.cpp
-+DSRNumericValue.cpp
-+DSRSCoordValue.cpp
-+DSRTCoordValue.cpp
-+DSRWaveformValue.cpp
-+DVInterface.cpp
-+DVPresentationState.cpp
-+DVPSCurve.cpp
-+DVPSGraphicObject.cpp
-+DVPSStoredPrint.cpp
-+DVPSTextObject.cpp
++ DSRCodeValue.cpp
++ DSRCompositeValue.cpp
++ DSRDocument.cpp
++ DSRDocumentTree.cpp
++ DSRImageValue.cpp
++ DSRNumericValue.cpp
++ DSRSCoordValue.cpp
++ DSRTCoordValue.cpp
++ DSRWaveformValue.cpp
++ DVInterface.cpp
++ DVPresentationState.cpp
++ DVPSCurve.cpp
++ DVPSGraphicObject.cpp
++ DVPSStoredPrint.cpp
++ DVPSTextObject.cpp
+)
+FIND_PACKAGE(JNI REQUIRED)
+INCLUDE_DIRECTORIES(
-+ #${JNI_INCLUDE_PATH} # cmake bug #
-+ ${JAVA_INCLUDE_PATH}
-+ ${JAVA_INCLUDE_PATH2}
-+ ${JAVA_AWT_INCLUDE_PATH}
-+ )
++ ${JNI_INCLUDE_PATH}
++)
+
+FIND_PACKAGE(DCMTK REQUIRED)
+# /usr/include/dcmtk/dcmpstat/dviface.h
@@ -77,7 +79,6 @@
+ ${DCMTK_DIR}/include/dcmsr
+)
+
-+# MESSAGE(${DCMTK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(
+ ${DCMTK_INCLUDE_DIR}
+ ${DCMTK_dcmpstat_INCLUDE_DIR}
@@ -86,33 +87,29 @@
+
+ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H)
+
-+#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
-+TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
-+ INSTALL(TARGETS jInterface
-+ RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
-+ LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
-+ ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
-+ )
-+
++TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg
++ ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog)
++INSTALL(TARGETS jInterface
++ RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
++ LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}
++ ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
++)
Index: dicomscope-3.6.0/tkgui/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/tkgui/CMakeLists.txt 2011-06-15 01:17:08.000000000 +0200
-@@ -0,0 +1,43 @@
++++ dicomscope-3.6.0/tkgui/CMakeLists.txt 2012-05-31 13:32:18.354956137 +0000
+@@ -0,0 +1,44 @@
+# Java
+FIND_PACKAGE(Java REQUIRED) # javac, jar
+
+file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
+file(GLOB lutfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/lut/*.lut")
+file(GLOB reportfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/reports/*.dcm")
-+#message(${lutfiles})
+
-+#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
-+
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
-+ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
++ COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS ${javafiles}
+ COMMENT "javac *.java"
@@ -121,8 +118,6 @@
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
+ COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF -C ${DICOMSCOPE_SOURCE_DIR}/DICOMscope .
-+ # manifest thingy
-+ #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
+ WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope
+ DEPENDS ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
+ COMMENT "jar cvf -> DICOMscope.jar"
@@ -133,13 +128,19 @@
+ COMMENT "building DICOMscope.jar"
+)
+
-+ INSTALL(FILES ${reportfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/reports COMPONENT Runtime)
-+ INSTALL(FILES ${lutfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/lut COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/dicomscope DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/tcl COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg DESTINATION /etc/dcmtk COMPONENT Runtime)
-+ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic DESTINATION /usr/share/dcmtk COMPONENT Runtime)
-+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
-+ DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime
-+ )
-+
++INSTALL(FILES ${reportfiles} DESTINATION
++ ${DICOMSCOPE_INSTALL_SHARE_DIR}/reports COMPONENT Runtime)
++INSTALL(FILES ${lutfiles} DESTINATION ${DICOMSCOPE_INSTALL_SHARE_DIR}/lut
++ COMPONENT Runtime)
++INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl
++ ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION
++ ${DICOMSCOPE_INSTALL_SHARE_DIR}/tcl COMPONENT Runtime
++)
++INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg DESTINATION
++ /etc/dcmtk COMPONENT Runtime)
++INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic DESTINATION
++ /usr/share/dcmtk COMPONENT Runtime)
++INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic
++ DESTINATION ${DICOMSCOPE_INSTALL_SHARE_DIR} COMPONENT Runtime)
++INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime)
Modified: trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,6 +1,8 @@
-This patch is due to the following change:
+Description: This patch is due to the following change:
+ http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
-http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20
Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
===================================================================
--- dicomscope-3.6.0.orig/interface/libsrc/DSRDocument.cpp 2011-06-15 01:17:52.000000000 +0200
Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.cfg.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,4 +1,7 @@
-Fix the default path to those as defined in debian packaging of dcmtk
+Description: Fix the default path to those as defined in debian packaging of
+ dcmtk
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dicomscope-3.6.0/DICOMscope/DICOMscope.cfg
===================================================================
Deleted: trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,10 +0,0 @@
-Provide a special helper script to start dicomscope
-
-Index: dicomscope-3.6.0/dicomscope
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dicomscope-3.6.0/dicomscope 2011-06-15 01:17:32.000000000 +0200
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec /usr/bin/java -jar /usr/share/dicomscope/DICOMscope.jar
Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,4 +1,7 @@
-The MANIFEST.MF provides does not work on case sensitive system. Fix it.
+Description: The MANIFEST.MF provides does not work on case sensitive system.
+ Fix it.
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dicomscope-3.6.0/MANIFEST.MF
===================================================================
Deleted: trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/iso2utf8.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,635 +0,0 @@
-Index: dicomscope-3.6.0/tkgui/DICOMscope.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/DICOMscope.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/DICOMscope.java 2011-06-15 01:17:03.000000000 +0200
-@@ -230,7 +230,7 @@
-
- Dimension d = getSize();
-
-- if (mc.highQualitySystem) // doppelte Größe als Minimum
-+ if (mc.highQualitySystem) // doppelte Größe als Minimum
- {
- if (d.width < 1500) d.width = 1500;
- if (d.height < 1500) d.height = 1500;
-Index: dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jBooleanByRef.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java 2011-06-15 01:17:03.000000000 +0200
-@@ -32,7 +32,7 @@
- /**
- * The class <em>jBooleanByRef</em> manages the "variable-by-reference".
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jBooleanByRef
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVIFhierarchyStatus.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVIFhierarchyStatus</em> represents the C++-enumeration
- * DVIFhierarchyStatus.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVIFhierarchyStatus
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurve.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java 2011-06-15 01:17:03.000000000 +0200
-@@ -34,7 +34,7 @@
- * A <em>jDVPSCurve</em> is the Java-sided class for the C++-Class
- * DVPSCurve.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSCurve
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurveType.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSCurveType</em> represents the C++-enumeration
- * DVPSCurveType.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSCurveType
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSDecimateCropBehaviour</em> represents the C++-enumeration
- * DVPSDecimateCropBehaviour.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSDecimateCropBehaviour
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDisplayTransform.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSDisplayTransform</em> represents the C++-enumeration
- * DVPSDisplayTransform.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSDisplayTransform
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSFilmOrientation.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSFilmOrientation</em> represents the C++-enumeration
- * DVPSFilmOrientation.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSFilmOrientation
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicObject.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * A <em>jDVPSGraphicObject</em> is the Java-sided class for the C++-Class
- * DVPSGraphicObject.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSGraphicObject
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicType.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSGraphicType</em> represents the C++-enumeration
- * DVPSGraphicType.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSGraphicType
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSObjectApplicability.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSObjectApplicability</em> represents the C++-enumeration
- * DVPSObjectApplicability.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSObjectApplicability
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPresentationSizeMode.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSPresentationSizeMode</em> represents the C++-enumeration
- * DVPSPresentationSizeMode.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSPresentationSizeMode
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSPrintPresentationLUTType</em> represents the C++-enumeration
- * jDVPSPrintPresentationLUTType.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSPrintPresentationLUTType
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSRotationType.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSRotationType</em> represents the C++-enumeration
- * DVPSRotationType.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSRotationType
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSShutterType.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSShutterType</em> represents the C++-enumeration
- * DVPSShutterType.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSShutterType
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextJustification.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSTextJustification</em> represents the C++-enumeration
- * DVPSTextJustification.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSTextJustification
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextObject.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java 2011-06-15 01:17:03.000000000 +0200
-@@ -34,7 +34,7 @@
- * A <em>jDVPSTextObject</em> is the Java-sided class for the C++-Class
- * DVPSTextObject.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSTextObject
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTrimMode.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSTrimMode</em> represents the C++-enumeration
- * DVPSTrimMode.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSTrimMode
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSannotationUnit.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPSannotationUnit</em> represents the C++-enumeration
- * DVPSannotationUnit.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPSannotationUnit
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPScharacterSet.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jE_Condition</em> represents the C++-enumeration
- * E_Condition.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPScharacterSet
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java 2011-06-15 01:17:03.000000000 +0200
-@@ -36,7 +36,7 @@
- * and what Java can't manage. So an extra class had to be constructed - this class.
- * Create an object of this class before passing it to that method!
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPrStateParam_GetImageReference
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java 2011-06-15 01:17:03.000000000 +0200
-@@ -37,7 +37,7 @@
- * Create an object of this class before passing it to that method!
- * IN and OUT specifies the type of param (input param or output param).
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPrStateParam_GetOverlayData
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java 2011-06-15 01:17:03.000000000 +0200
-@@ -36,7 +36,7 @@
- * and what Java can't manage. So an extra class had to be constructed - this class.
- * Create an object of this class before passing it to that method!
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPrStateParam_GetPixelData
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDVPrStateParam_GetScreenData</em> is responsible for parameters
- * passed to the method getScreenData().
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDVPrStateParam_GetScreenData
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jDoubleByRef.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jDoublebyRef</em> manages the "variable-by-reference".
- *
- * @version 1.0, 28.12.98
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jDoubleByRef
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jE_Condition.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java 2011-06-15 01:17:03.000000000 +0200
-@@ -42,7 +42,7 @@
- * return value of OFCondition::status() which might be OF_ok,
- * OF_error or OF_failure.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jE_Condition
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jIntByRef.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java 2011-06-15 01:17:03.000000000 +0200
-@@ -32,7 +32,7 @@
- /**
- * The class <em>jIntbyRef</em> manages the "variable-by-reference".
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jIntByRef
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jRGB.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jRGB.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jRGB.java 2011-06-15 01:17:03.000000000 +0200
-@@ -32,7 +32,7 @@
- /**
- * The class <em>jRGB</em> represents a RGB-color value.
- *
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jRGB
- {
-Index: dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/J2Ci/jStringByRef.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java 2011-06-15 01:17:03.000000000 +0200
-@@ -33,7 +33,7 @@
- * The class <em>jStringByRef</em> manages the "variable-by-reference".
- *
- * @version 1.0, 28.12.98
-- * @author Andreas Schröter
-+ * @author Andreas Schröter
- */
- public class jStringByRef
- {
-Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java 2011-06-15 01:17:03.000000000 +0200
-@@ -38,8 +38,8 @@
- * A string of characters with leading or trailing
- * spaces (20H) being non-significant.
- * <p>
--* Character Repertoire: Uppercase characters, “0”-”9”, the SPACE
--* character, and underscore “_”, of the Default Character Repertoire
-+* Character Repertoire: Uppercase characters, “0â€-â€9â€, the SPACE
-+* character, and underscore “_â€, of the Default Character Repertoire
- * <p>
- * Max size: 16
- *
-@@ -82,8 +82,8 @@
- /**
- * Inserts some content into the document.
- * <p>
-- * The content will be checked. All uppercase characters, “0”-”9”, the SPACE
-- * character, and underscore “_”, of the Default Character Repertoire will be accepted
-+ * The content will be checked. All uppercase characters, “0â€-â€9â€, the SPACE
-+ * character, and underscore “_â€, of the Default Character Repertoire will be accepted
- * lowercase characters will be converted into uppercase
- * <p>
- * Inserting content causes a write lock to be held while the actual changes are taking place,
-Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java 2011-06-15 01:17:03.000000000 +0200
-@@ -40,7 +40,7 @@
- * contain the month, and dd shall contain the
- * day. This conforms to the ANSI HISPP MSDSDate common data type.
- * <p>
--* Example:“19930822” would represent August 22,1993.
-+* Example:“19930822†would represent August 22,1993.
- * <p>
- * Notes: 1. For reasons of backward
- * compatibility with versions of this
-Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java 2011-06-15 01:17:03.000000000 +0200
-@@ -46,7 +46,7 @@
- * Strings may be padded with leading or trailing
- * spaces. Embedded spaces are not allowed.
- * <p>
--* “0”-”9”, “+”, “-”,“E”, “e”, “." of Default Character Repertoire
-+* “0â€-â€9â€, “+â€, “-â€,“Eâ€, “eâ€, “." of Default Character Repertoire
- * <p>
- * Max size: 16
- * @author Klaus Kleber
-Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java 2011-06-15 01:17:03.000000000 +0200
-@@ -41,7 +41,7 @@
- * trailing spaces. Embedded spaces are not allowed.
- * <p>
- * The integer, n, represented shall be in the range:
--* -2^31 <= n <= (2^31 - 1). “0”-”9”, “+”, “-" of
-+* -2^31 <= n <= (2^31 - 1). “0â€-â€9â€, “+â€, “-" of
- * Default Character Repertoire can be used
- * <b>
- * 12 bytes maximum
-@@ -63,8 +63,8 @@
- /**
- * Inserts some content into the document.
- * <p>
-- * The content will be checked. All uppercase characters, “0”-”9”, the SPACE
-- * character, and underscore “_”, of the Default Character Repertoire will be accepted
-+ * The content will be checked. All uppercase characters, “0â€-â€9â€, the SPACE
-+ * character, and underscore “_â€, of the Default Character Repertoire will be accepted
- * lowercase characters will be converted into uppercase
- * <p>
- * Inserting content causes a write lock to be held while the actual changes are taking place,
-Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java 2011-06-15 01:17:03.000000000 +0200
-@@ -35,7 +35,7 @@
- * Contains a document for DICOM Long String (SH) values.
- * A character string that may be padded with
- * leading and/or trailing spaces. The character
--* code 05CH (the BACKSLASH “\” in ISO-IR 6)
-+* code 05CH (the BACKSLASH “\†in ISO-IR 6)
- * shall not be present, as it is used as the
- * delimiter between values for multiple data
- * elements. The string shall not have Control
-Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java 2011-06-15 01:17:03.000000000 +0200
-@@ -41,27 +41,27 @@
- * "59"), ss contains seconds (range "00" -
- * "59"), and frac contains a fractional part of a
- * second as small as 1 millionth of a second
--* (range “000000” - “999999”). A 24 hour clock
-+* (range “000000†- “999999â€). A 24 hour clock
- * is assumed. Midnight can be represented by
--* only “0000“ since “2400“ would violate the hour
-+* only “0000“ since “2400“ would violate the hour
- * range. The string may be padded with trailing
- * spaces. Leading and embedded spaces are
- * not allowed. One or more of the components
- * mm, ss, or frac may be unspecified as long as
- * every component to the right of an unspecified
- * component is also unspecified. If frac is
--* unspecified the preceding “.” may not be
-+* unspecified the preceding “.†may not be
- * included. Frac shall be held to six decimal
- * places or less to ensure its format conforms to
- * the ANSI HISPP MSDS Time common data
- * type.
- * Examples:
--* 1. “070907.0705 ” represents a time of
-+* 1. “070907.0705 †represents a time of
- * 7 hours, 9 minutes and 7.0705 seconds.
- * <br>
--* 2. “1010” represents a time of 10 hours,and 10 minutes.
-+* 2. “1010†represents a time of 10 hours,and 10 minutes.
- * <br>
--* 3. “021 ” is an invalid value.
-+* 3. “021 †is an invalid value.
- * <p>
- * Notes: 1. For reasons of backward
- * compatibility with versions of this
-Index: dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/dicomPrint/PrintPanel.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java 2011-06-15 01:17:03.000000000 +0200
-@@ -361,7 +361,7 @@
- }
-
-
-- //Hier muß normalerweise Targetfestgelegt werden.
-+ //Hier muß normalerweise Targetfestgelegt werden.
- if (dvi.getCurrentPrinter() == null )
- {
-
-Index: dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/dicomscope/DICOMscope.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java 2011-06-15 01:17:03.000000000 +0200
-@@ -218,7 +218,7 @@
-
- Dimension d = getSize();
-
-- if (mc.highQualitySystem) // doppelte Größe als Minimum
-+ if (mc.highQualitySystem) // doppelte Größe als Minimum
- {
- if (d.width < 1500) d.width = 1500;
- if (d.height < 1500) d.height = 1500;
-Index: dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/processCommunication/ProcessTable.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java 2011-06-15 01:17:03.000000000 +0200
-@@ -67,7 +67,7 @@
-
-
- // init selection
-- setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswählbar
-+ setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswählbar
- getSelectionModel().addListSelectionListener(new SelectRowListener(textArea));
-
- // init Mouse Listener
-@@ -231,7 +231,7 @@
- TableColumnModel tcm = getTableHeader().getColumnModel(); // schon mal das Spaltenmodell holen
- int index = tcm.getColumnIndexAtX(e.getX()); // Index der angeklickten Spalte ermitteln
-
-- if(index >= 0) // wurde tatsächlich eine Spalte angeklickt...
-+ if(index >= 0) // wurde tatsächlich eine Spalte angeklickt...
- {
- int modelIndex = convertColumnIndexToModel(index); // ...hole Spaltenindex des Modells
-
-Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicLayer.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java 2011-06-15 01:17:03.000000000 +0200
-@@ -456,7 +456,7 @@
- PresentationStateLayerObject delLayerObject = ((PresentationStateLayerObject)listPresentationStateObject.elementAt(deleteIndex));
- System.out.println("deleteIndex: " + deleteIndex);
- System.out.println("delLayerObject.getIndex(): " + delLayerObject.getIndex());
-- System.out.println(" löschendes Object: " + delLayerObject.getInfo());
-+ System.out.println(" löschendes Object: " + delLayerObject.getInfo());
- //Delete C++
- delLayerObject.deleteAll();
-
-Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java 2011-06-15 01:17:03.000000000 +0200
-@@ -1371,7 +1371,7 @@
- */
- public void updatePresentationState() {
- deleteAll();
-- boolean temp = enablePresentationState; // enable... wird in build..() überschrieben
-+ boolean temp = enablePresentationState; // enable... wird in build..() überschrieben
- buildPresentationState();
- enablePresentationState = temp;
- setScreenSize(screenSize);
-Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateTextObject.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java 2011-06-15 01:17:03.000000000 +0200
-@@ -71,7 +71,7 @@
- int needRot = -1;
- int rot = 0;
- int just = 0;
-- //Gibt die Göße der Größten Zeile an
-+ //Gibt die Göße der Größten Zeile an
- private float maxLength;
-
- //Transformationen der BoundingBox
-@@ -80,10 +80,10 @@
- //Transformationen des Textes
- AffineTransform affText= new AffineTransform();
-
-- //Enthält die einzelen Zeilen
-+ //Enthält die einzelen Zeilen
- TextLayout[] layoutSegment;
-
-- //Enthalt die Offsets für jedes Zeile
-+ //Enthalt die Offsets für jedes Zeile
- Point2D.Float[] offsets;
-
- /**
-Index: dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java
-===================================================================
---- dicomscope-3.6.0.orig/tkgui/viewer/sr/VerificationDialog.java 2011-06-15 01:16:13.000000000 +0200
-+++ dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java 2011-06-15 01:17:03.000000000 +0200
-@@ -151,7 +151,7 @@
-
-
- //init model
-- tableData = new TableData( getUserData(),columnIdentifiers); // Konstruktion der zufälligen Tabellendaten
-+ tableData = new TableData( getUserData(),columnIdentifiers); // Konstruktion der zufälligen Tabellendaten
-
- // init table
- table = new JTable(tableData); // Konstruktion der sichtbaren Tabelle
-@@ -176,7 +176,7 @@
-
-
- // init selection
-- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswählbar
-+ table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswählbar
- table.addMouseListener(new VerifyMouseAdapter());
-
- // init Mouse Listener
-@@ -505,7 +505,7 @@
- TableColumnModel tcm = table.getTableHeader().getColumnModel(); // schon mal das Spaltenmodell holen
- int index = tcm.getColumnIndexAtX(e.getX()); // Index der angeklickten Spalte ermitteln
-
-- if(index >= 0) // wurde tatsächlich eine Spalte angeklickt...
-+ if(index >= 0) // wurde tatsächlich eine Spalte angeklickt...
- {
- int modelIndex = table.convertColumnIndexToModel(index); // ...hole Spaltenindex des Modells
-
Modified: trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,4 +1,8 @@
-This patch simply remove the call to the old API for logging until a better fix is to be found
+Description: This patch simply remove the call to the old API for logging
+ until a better fix is to be found
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+
Index: dicomscope-3.6.0/interface/libsrc/DVInterface.cpp
===================================================================
--- dicomscope-3.6.0.orig/interface/libsrc/DVInterface.cpp 2011-06-15 01:16:05.000000000 +0200
Modified: trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/maincontext.java.patch 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,4 +1,6 @@
-Use full path instead of relative path
+Description: Use full path instead of relative path
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
Index: dicomscope-3.6.0/tkgui/main/MainContext.java
===================================================================
Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/patches/series 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,10 +1,8 @@
-iso2utf8.patch
-cmakelists.txt.patch
dicomscope_defaultpackage.patch
DVPresentationState.patch
dicomscope.cfg.patch
maincontext.java.patch
-dicomscope.patch
DSRDocument.cpp.patch
dicom_2009.patch
log4cplus.patch
+cmakelists.txt.patch
Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules 2012-05-31 12:48:38 UTC (rev 11139)
+++ trunk/packages/dicomscope/trunk/debian/rules 2012-05-31 13:37:16 UTC (rev 11140)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
@@ -17,7 +18,7 @@
-DDCMTK_ofstd_INCLUDE_DIR:PATH=/usr/include/dcmtk/ofstd
%:
- dh $@ --buildsystem=cmake --parallel
+ dh $@ --buildsystem=cmake --parallel --with javahelper
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_FLAGS)
More information about the debian-med-commit
mailing list