[med-svn] r2920 - trunk/packages/dicomscope/trunk/debian/patches

[malat-guest at alioth.debian.org]

Author: malat-guest
Date: 2009-01-07 17:39:45 +0000 (Wed, 07 Jan 2009)
New Revision: 2920

Modified:
   trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
   trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
   trunk/packages/dicomscope/trunk/debian/patches/series
Log:
Fix some compilation problem. Document changes

Modified: trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch	2009-01-07 17:27:31 UTC (rev 2919)
+++ trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch	2009-01-07 17:39:45 UTC (rev 2920)
@@ -1,4 +1,5 @@
-fix comp
+Apparently the original package was compiled on 32bits and thus long and Sint32 
+could be interchanged
 
 --- dsgui351/interface/libsrc/DVPresentationState.cpp	2009-01-07 17:53:32.279185000 +0100
 +++ dsgui360/interface/libsrc/DVPresentationState.cpp	2009-01-07 17:53:07.074405000 +0100

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2009-01-07 17:27:31 UTC (rev 2919)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2009-01-07 17:39:45 UTC (rev 2920)
@@ -84,7 +84,7 @@
 +
 +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 +ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
-+TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr xml2 dcmdsig dcmqrdb crypto)
++TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto)
 +  INSTALL(TARGETS jInterface
 +    RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime
 +    LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP}

Modified: trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	2009-01-07 17:27:31 UTC (rev 2919)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicomscope_defaultpackage.patch	2009-01-07 17:39:45 UTC (rev 2920)
@@ -1,40 +1,8 @@
-Starting with Java 1.4, sun-java does not support default package anymore. Instead
-call DICOMscope now: DICOMscope.DICOMscope
-In order to create a jar with a main entry point, provide a manifest.txt file
+The MANIFEST.MF provides does not work on case sensitive system. Fix it.
 
---- /tmp/dicomscope/dsgui351/tkgui/Manifest.txt	1970-01-01 01:00:00.000000000 +0100
-+++ dsgui351/tkgui/Manifest.txt	2008-12-23 16:30:12.943647000 +0100
-@@ -0,0 +1 @@
-+Main-Class: DICOMscope.DICOMscope
---- /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.DICOMscope;
- 
- import jToolkit.gui.*;
- import java.util.*;
---- /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.DICOMscope;
- import viewer.main.*;
- import jToolkit.gui.*;
- import main.*;
---- dicomscope-3.5.1.orig/tkgui/DICOMscope.java	2008-12-29 17:05:00.000000000 +0100
-+++ dicomscope-3.5.1/tkgui/DICOMscope.java	2008-12-30 10:41:54.000000000 +0100
-@@ -29,6 +29,7 @@
- */
- 
- 
-+package DICOMscope;
- import java.io.*;
- import java.awt.*;
- import java.awt.event.*;
+--- dsgui360.orig/MANIFEST.MF	2009-01-07 18:31:07.557478000 +0100
++++ dsgui360/MANIFEST.MF	2009-01-07 18:30:16.940809000 +0100
+@@ -1,2 +1,2 @@
+ Manifest-Version: 1.0
+-Main-Class: DICOMscope/DICOMscope
++Main-Class: dicomscope/DICOMscope

Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series	2009-01-07 17:27:31 UTC (rev 2919)
+++ trunk/packages/dicomscope/trunk/debian/patches/series	2009-01-07 17:39:45 UTC (rev 2920)
@@ -1,4 +1,4 @@
 dsgui_351_360_changes.patch
 cmakelists.txt.patch
-#dicomscope_defaultpackage.patch
+dicomscope_defaultpackage.patch
 DVPresentationState.patch