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

[malat-guest at alioth.debian.org]

Author: malat-guest
Date: 2008-12-23 13:50:45 +0000 (Tue, 23 Dec 2008)
New Revision: 2844

Added:
   trunk/packages/dicomscope/trunk/debian/dicomscope.install
Modified:
   trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch
   trunk/packages/dicomscope/trunk/debian/rules
Log:
missing install rules

Added: trunk/packages/dicomscope/trunk/debian/dicomscope.install
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.install	                        (rev 0)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.install	2008-12-23 13:50:45 UTC (rev 2844)
@@ -0,0 +1 @@
+usr/lib/libjInterface.so


Property changes on: trunk/packages/dicomscope/trunk/debian/dicomscope.install
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

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:45:27 UTC (rev 2843)
+++ trunk/packages/dicomscope/trunk/debian/patches/dcmtk_350_354_changes.patch	2008-12-23 13:50:45 UTC (rev 2844)
@@ -1,15 +1,25 @@
 diff -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 12:11:08.041265000 +0100
-@@ -0,0 +1,4 @@
++++ dsgui351/CMakeLists.txt	2008-12-23 14:49:06.838610000 +0100
+@@ -0,0 +1,14 @@
 +PROJECT(DICOMScope)
 +
++cmake_minimum_required(VERSION 2.6)
++
++IF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
++  SET(DICOMSCOPE_INSTALL_BIN_DIR "bin")
++ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR)
++
++IF(NOT DICOMSCOPE_INSTALL_LIB_DIR)
++  SET(DICOMSCOPE_INSTALL_LIB_DIR "lib")
++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
 --- /tmp/dicomscope/dsgui351/interface/libsrc/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
-+++ dsgui351/interface/libsrc/CMakeLists.txt	2008-12-23 13:55:46.532824000 +0100
-@@ -0,0 +1,50 @@
++++ dsgui351/interface/libsrc/CMakeLists.txt	2008-12-23 14:47:16.168834000 +0100
+@@ -0,0 +1,57 @@
 +SET(dsgui_SRCS
 +DSRCodeValue.cpp
 +DSRCompositeValue.cpp
@@ -60,6 +70,13 @@
 +
 +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 +ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS})
++
++  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
++  )
++
 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
 --- /tmp/dicomscope/dsgui351/interface/libsrc/DSRCodeValue.cpp	2000-12-06 16:41:34.000000000 +0100

Modified: trunk/packages/dicomscope/trunk/debian/rules
===================================================================
--- trunk/packages/dicomscope/trunk/debian/rules	2008-12-23 13:45:27 UTC (rev 2843)
+++ trunk/packages/dicomscope/trunk/debian/rules	2008-12-23 13:50:45 UTC (rev 2844)
@@ -40,11 +40,11 @@
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
 		-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DDCMTK_config_INCLUDE_DIR:PATH=/usr/include/dcmtk/config
-		-DDCMTK_dcmdata_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmdata
-		-DDCMTK_dcmimgle_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmimgle
-		-DDCMTK_dcmpstat_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmpstat
-		-DDCMTK_dcmsr_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmsr
+		-DDCMTK_config_INCLUDE_DIR:PATH=/usr/include/dcmtk/config \
+		-DDCMTK_dcmdata_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmdata \
+		-DDCMTK_dcmimgle_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmimgle \
+		-DDCMTK_dcmpstat_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmpstat \
+		-DDCMTK_dcmsr_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmsr \
 		-DDCMTK_ofstd_INCLUDE_DIR:PATH=/usr/include/dcmtk/ofstd
 
 	touch configure-stamp