[med-svn] r6641 - in trunk/packages/dicomscope/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-26 14:44:09 +0000 (Tue, 26 Apr 2011)
New Revision: 6641

Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
Log:
Fix comp when using gcj implementation.

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog	2011-04-26 14:43:05 UTC (rev 6640)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2011-04-26 14:44:09 UTC (rev 6641)
@@ -1,3 +1,9 @@
+dicomscope (3.6.0-5) unstable; urgency=low
+
+  * Fix compilation with gcj/java
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 26 Apr 2011 16:43:13 +0200
+
 dicomscope (3.6.0-4) unstable; urgency=low
 
   * Upload to unstable. Closes: #623143

Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2011-04-26 14:43:05 UTC (rev 6640)
+++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch	2011-04-26 14:44:09 UTC (rev 6641)
@@ -120,7 +120,7 @@
 +
 +ADD_CUSTOM_COMMAND(
 +  OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
-+  COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF ./
++  COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF ${DICOMSCOPE_SOURCE_DIR}/DICOMscope
 +  # manifest thingy
 +  #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar
 +  WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope