Author: malat-guest
Date: 2008-12-23 15:33:38 +0000 (Tue, 23 Dec 2008)
New Revision: 2845
Modified:
trunk/packages/dicomscope/trunk/debian/dicomscope.install
trunk/packages/dicomscope/trunk/debian/get-orig-source
trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
Log:
need to dos2unix'ify the orig source otherwise I could not get patch to work
with dos CR... (patch file had mixed cr)
Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.install
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.install 2008-12-23
13:50:45 UTC (rev 2844)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.install 2008-12-23
15:33:38 UTC (rev 2845)
@@ -1 +1,2 @@
usr/lib/libjInterface.so
+usr/lib/DICOMscope.jar
Modified: trunk/packages/dicomscope/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/dicomscope/trunk/debian/get-orig-source 2008-12-23
13:50:45 UTC (rev 2844)
+++ trunk/packages/dicomscope/trunk/debian/get-orig-source 2008-12-23
15:33:38 UTC (rev 2845)
@@ -24,6 +24,7 @@
DISTDIR=${NAME}-${VERSION}
unzip "$UPSTREAMZIP"
mv "$UPSTREAMDIR" "$DISTDIR"
+find "$DISTDIR" -name *.java -exec dos2unix {} \;
GZIP=-9 tar -czf "$NAME"_"$VERSION".orig.tar.gz "$DISTDIR"
Modified:
trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
2008-12-23 13:50:45 UTC (rev 2844)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
2008-12-23 15:33:38 UTC (rev 2845)
@@ -1,11 +1,16 @@
-diff -x bin -N -u -r /tmp/dicomscope/dsgui351/CMakeLists.txt
dsgui351/CMakeLists.txt
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/CMakeLists.txt dsgui351/CMakeLists.txt
--- /tmp/dicomscope/dsgui351/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
-+++ dsgui351/CMakeLists.txt 2008-12-23 14:49:06.838610000 +0100
-@@ -0,0 +1,14 @@
-+PROJECT(DICOMScope)
++++ dsgui351/CMakeLists.txt 2008-12-23 16:30:12.943647000 +0100
+@@ -0,0 +1,21 @@
++PROJECT(DICOMSCOPE)
+
+cmake_minimum_required(VERSION 2.6)
+
++#-----------------------------------------------------------------------------
++SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single
output directory for building all executables.")
++SET (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single
output directory for building all libraries.")
++MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
++
+IF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
+ SET(DICOMSCOPE_INSTALL_BIN_DIR "bin")
+ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
@@ -15,11 +20,13 @@
+ENDIF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
+
+INCLUDE_DIRECTORIES(interface/include)
++
+SUBDIRS(interface/libsrc)
-diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt
dsgui351/interface/libsrc/CMakeLists.txt
++SUBDIRS(tkgui)
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt
dsgui351/interface/libsrc/CMakeLists.txt
--- /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
-+++ dsgui351/interface/libsrc/CMakeLists.txt 2008-12-23 14:47:16.168834000
+0100
-@@ -0,0 +1,57 @@
++++ dsgui351/interface/libsrc/CMakeLists.txt 2008-12-23 16:10:17.385621000
+0100
+@@ -0,0 +1,55 @@
+SET(dsgui_SRCS
+DSRCodeValue.cpp
+DSRCompositeValue.cpp
@@ -37,8 +44,6 @@
+DVPSStoredPrint.cpp
+DVPSTextObject.cpp
+)
-+
-+FIND_PACKAGE(Java REQUIRED) # javac, jar
+FIND_PACKAGE(JNI REQUIRED)
+INCLUDE_DIRECTORIES(
+ #${JNI_INCLUDE_PATH} # cmake bug #
@@ -77,8 +82,7 @@
+ ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development
+ )
+
-Binary files /tmp/dicomscope/dsgui351/interface/libsrc/.CMakeLists.txt.swp and
dsgui351/interface/libsrc/.CMakeLists.txt.swp differ
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp
dsgui351/interface/libsrc/DSRCodeValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp
dsgui351/interface/libsrc/DSRCodeValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp 2000-12-06
16:41:34.000000000 +0100
+++ dsgui351/interface/libsrc/DSRCodeValue.cpp 2008-12-23 12:46:01.513221000
+0100
@@ -116,7 +116,7 @@
@@ -99,8 +103,7 @@
}
-Binary files /tmp/dicomscope/dsgui351/interface/libsrc/.DSRCodeValue.cpp.swp
and dsgui351/interface/libsrc/.DSRCodeValue.cpp.swp differ
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp
dsgui351/interface/libsrc/DSRCompositeValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp
dsgui351/interface/libsrc/DSRCompositeValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCompositeValue.cpp
2001-02-16 16:59:56.000000000 +0100
+++ dsgui351/interface/libsrc/DSRCompositeValue.cpp 2008-12-23
12:46:19.114065000 +0100
@@ -147,7 +147,7 @@
@@ -112,7 +115,7 @@
}
-diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp
dsgui351/interface/libsrc/DSRDocument.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp
dsgui351/interface/libsrc/DSRDocument.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocument.cpp 2001-05-22
12:35:00.000000000 +0200
+++ dsgui351/interface/libsrc/DSRDocument.cpp 2008-12-23 14:00:57.891356000
+0100
@@ -43,7 +43,9 @@
@@ -396,7 +399,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp
dsgui351/interface/libsrc/DSRDocumentTree.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp
dsgui351/interface/libsrc/DSRDocumentTree.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRDocumentTree.cpp
2001-01-25 15:54:42.000000000 +0100
+++ dsgui351/interface/libsrc/DSRDocumentTree.cpp 2008-12-23
14:01:26.476717000 +0100
@@ -391,7 +391,7 @@
@@ -426,7 +429,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp
dsgui351/interface/libsrc/DSRImageValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp
dsgui351/interface/libsrc/DSRImageValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRImageValue.cpp
2001-02-16 16:58:52.000000000 +0100
+++ dsgui351/interface/libsrc/DSRImageValue.cpp 2008-12-23
14:01:59.829134000 +0100
@@ -147,7 +147,7 @@
@@ -465,7 +468,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp
dsgui351/interface/libsrc/DSRNumericValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp
dsgui351/interface/libsrc/DSRNumericValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRNumericValue.cpp
2000-11-23 17:57:28.000000000 +0100
+++ dsgui351/interface/libsrc/DSRNumericValue.cpp 2008-12-23
14:02:14.230292000 +0100
@@ -165,7 +165,7 @@
@@ -486,7 +489,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp
dsgui351/interface/libsrc/DSRSCoordValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp
dsgui351/interface/libsrc/DSRSCoordValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRSCoordValue.cpp
2000-10-23 17:22:04.000000000 +0200
+++ dsgui351/interface/libsrc/DSRSCoordValue.cpp 2008-12-23
14:02:50.550467000 +0100
@@ -88,7 +88,7 @@
@@ -516,7 +519,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp
dsgui351/interface/libsrc/DSRTCoordValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp
dsgui351/interface/libsrc/DSRTCoordValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRTCoordValue.cpp
2000-10-27 10:42:52.000000000 +0200
+++ dsgui351/interface/libsrc/DSRTCoordValue.cpp 2008-12-23
14:03:02.022825000 +0100
@@ -88,7 +88,7 @@
@@ -528,7 +531,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp
dsgui351/interface/libsrc/DSRWaveformValue.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp
dsgui351/interface/libsrc/DSRWaveformValue.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DSRWaveformValue.cpp
2001-02-16 17:00:24.000000000 +0100
+++ dsgui351/interface/libsrc/DSRWaveformValue.cpp 2008-12-23
14:03:26.182329000 +0100
@@ -147,7 +147,7 @@
@@ -558,7 +561,7 @@
}
-diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp
dsgui351/interface/libsrc/DVInterface.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp
dsgui351/interface/libsrc/DVInterface.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DVInterface.cpp 2001-01-29
18:26:32.000000000 +0100
+++ dsgui351/interface/libsrc/DVInterface.cpp 2008-12-23 14:09:32.873638000
+0100
@@ -121,7 +121,7 @@
@@ -1263,8 +1266,7 @@
}
-Binary files /tmp/dicomscope/dsgui351/interface/libsrc/.DVInterface.cpp.swp
and dsgui351/interface/libsrc/.DVInterface.cpp.swp differ
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp
dsgui351/interface/libsrc/DVPresentationState.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp
dsgui351/interface/libsrc/DVPresentationState.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPresentationState.cpp
2000-11-23 17:45:22.000000000 +0100
+++ dsgui351/interface/libsrc/DVPresentationState.cpp 2008-12-23
14:17:45.488320000 +0100
@@ -179,7 +179,7 @@
@@ -2135,7 +2137,7 @@
}
-diff -x bin -N -u -r /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp
dsgui351/interface/libsrc/DVPSCurve.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp
dsgui351/interface/libsrc/DVPSCurve.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSCurve.cpp 1999-09-21
18:07:30.000000000 +0200
+++ dsgui351/interface/libsrc/DVPSCurve.cpp 2008-12-23 14:18:01.796119000
+0100
@@ -148,7 +148,7 @@
@@ -2156,7 +2158,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp
dsgui351/interface/libsrc/DVPSGraphicObject.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp
dsgui351/interface/libsrc/DVPSGraphicObject.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSGraphicObject.cpp
1999-09-21 18:07:30.000000000 +0200
+++ dsgui351/interface/libsrc/DVPSGraphicObject.cpp 2008-12-23
14:18:22.022391000 +0100
@@ -131,7 +131,7 @@
@@ -2204,7 +2206,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp
dsgui351/interface/libsrc/DVPSStoredPrint.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp
dsgui351/interface/libsrc/DVPSStoredPrint.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSStoredPrint.cpp
2000-07-18 13:04:18.000000000 +0200
+++ dsgui351/interface/libsrc/DVPSStoredPrint.cpp 2008-12-23
14:19:20.804343000 +0100
@@ -82,7 +82,7 @@
@@ -2459,7 +2461,7 @@
}
-diff -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp
dsgui351/interface/libsrc/DVPSTextObject.cpp
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp
dsgui351/interface/libsrc/DVPSTextObject.cpp
--- /tmp/dicomscope/dsgui351/interface/libsrc/DVPSTextObject.cpp
1999-09-21 18:07:30.000000000 +0200
+++ dsgui351/interface/libsrc/DVPSTextObject.cpp 2008-12-23
14:19:32.635340000 +0100
@@ -127,7 +127,7 @@
@@ -2489,3 +2491,72 @@
}
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/tkgui/about/AboutBox.java
dsgui351/tkgui/about/AboutBox.java
+--- /tmp/dicomscope/dsgui351/tkgui/about/AboutBox.java 2001-06-06
12:32:30.000000000 +0200
++++ dsgui351/tkgui/about/AboutBox.java 2008-12-23 15:50:13.812215000 +0100
+@@ -38,7 +38,7 @@
+ import javax.swing.text.*;
+ import java.net.*;
+
+-import DICOMscope;
++import DICOMscope.*;
+
+ import jToolkit.gui.*;
+ import java.util.*;
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/tkgui/browser/StudyMan.java
dsgui351/tkgui/browser/StudyMan.java
+--- /tmp/dicomscope/dsgui351/tkgui/browser/StudyMan.java 2001-06-06
12:32:30.000000000 +0200
++++ dsgui351/tkgui/browser/StudyMan.java 2008-12-23 15:13:51.617836000
+0100
+@@ -40,7 +40,7 @@
+ import javax.swing.tree.*;
+
+ import J2Ci.*;
+-import DICOMscope;
++import DICOMscope.*;
+ import viewer.main.*;
+ import jToolkit.gui.*;
+ import main.*;
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/tkgui/CMakeLists.txt dsgui351/tkgui/CMakeLists.txt
+--- /tmp/dicomscope/dsgui351/tkgui/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
++++ dsgui351/tkgui/CMakeLists.txt 2008-12-23 16:26:42.432837000 +0100
+@@ -0,0 +1,33 @@
++# Java
++FIND_PACKAGE(Java REQUIRED) # javac, jar
++
++file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java")
++#message(${javafiles})
++
++FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope)
++
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope.class
++ COMMAND ${JAVA_COMPILE} ARGS ${javafiles} -d
${CMAKE_CURRENT_BINARY_DIR}/DICOMscope
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++ DEPENDS ${javafiles}
++ COMMENT "javac *.java"
++)
++
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
${CMAKE_CURRENT_BINARY_DIR}/DICOMscope
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope.class
++ COMMENT "jar cvf -> DICOMscope.jar"
++)
++
++ADD_CUSTOM_TARGET(dummy ALL
++ DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ COMMENT "building DICOMscope.jar"
++)
++
++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
++ DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime
++ )
++
+diff --strip-trailing-cr -x bin -N -u -r
/tmp/dicomscope/dsgui351/tkgui/DICOMscope.java dsgui351/tkgui/DICOMscope.java
+--- /tmp/dicomscope/dsgui351/tkgui/DICOMscope.java 2001-06-06
12:32:30.000000000 +0200
++++ dsgui351/tkgui/DICOMscope.java 2008-12-23 16:15:36.587279000 +0100
+@@ -1,3 +1,4 @@
++package DICOMscope;
+ /*
+ *
+ * Copyright (C) 1999, Institute for MicroTherapy
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
