Author: malat Date: 2013-11-06 12:55:50 +0000 (Wed, 06 Nov 2013) New Revision: 15121
Modified: trunk/packages/dicomscope/trunk/debian/changelog trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch trunk/packages/dicomscope/trunk/debian/patches/series trunk/packages/dicomscope/trunk/debian/rules Log: Prepare new upload Modified: trunk/packages/dicomscope/trunk/debian/changelog =================================================================== --- trunk/packages/dicomscope/trunk/debian/changelog 2013-11-06 12:33:59 UTC (rev 15120) +++ trunk/packages/dicomscope/trunk/debian/changelog 2013-11-06 12:55:50 UTC (rev 15121) @@ -1,3 +1,12 @@ +dicomscope (3.6.0-11) UNRELEASED; urgency=low + + * Remove SONAME from java glue lib. Closes: #676622 + * Install jni/glue lib to multi-arch jni path + * Remove patch, not needed anymore: + - d/p/fixbug694846.patch + + -- Mathieu Malaterre <[email protected]> Wed, 06 Nov 2013 13:48:45 +0100 + dicomscope (3.6.0-10) unstable; urgency=low * Fix underlinked java module. Closes: #694846 Modified: trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch =================================================================== --- trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch 2013-11-06 12:33:59 UTC (rev 15120) +++ trunk/packages/dicomscope/trunk/debian/patches/cmakelists.txt.patch 2013-11-06 12:55:50 UTC (rev 15121) @@ -6,41 +6,39 @@ Index: dicomscope-3.6.0/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dicomscope-3.6.0/CMakeLists.txt 2012-05-31 13:33:28.826955164 +0000 -@@ -0,0 +1,27 @@ -+PROJECT(DICOMSCOPE) ++++ dicomscope-3.6.0/CMakeLists.txt 2013-11-06 13:46:30.000000000 +0100 +@@ -0,0 +1,25 @@ ++cmake_minimum_required(VERSION 2.8.2) ++project(DICOMSCOPE) + -+cmake_minimum_required(VERSION 2.8) ++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) + -+#----------------------------------------------------------------------------- -+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() + -+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() ++if(NOT DICOMSCOPE_INSTALL_SHARE_DIR) ++ set(DICOMSCOPE_INSTALL_SHARE_DIR "share/dicomscope") ++endif() ++if(NOT DICOMSCOPE_INSTALL_JAVA_DIR) ++ set(DICOMSCOPE_INSTALL_JAVA_DIR "share/java") ++endif() + -+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/java") -+ENDIF(NOT DICOMSCOPE_INSTALL_JAVA_DIR) ++include_directories(interface/include) + -+INCLUDE_DIRECTORIES(interface/include) -+ -+SUBDIRS(interface/libsrc) -+SUBDIRS(tkgui) ++add_subdirectory(interface/libsrc) ++add_subdirectory(tkgui) 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 2012-05-31 13:33:22.638955249 +0000 -@@ -0,0 +1,55 @@ -+SET(dsgui_SRCS ++++ dicomscope-3.6.0/interface/libsrc/CMakeLists.txt 2013-11-06 13:47:10.000000000 +0100 +@@ -0,0 +1,56 @@ ++set(dsgui_SRCS + DSRCodeValue.cpp + DSRCompositeValue.cpp + DSRDocument.cpp @@ -57,40 +55,41 @@ + DVPSStoredPrint.cpp + DVPSTextObject.cpp +) -+FIND_PACKAGE(JNI REQUIRED) -+INCLUDE_DIRECTORIES( ++find_package(JNI REQUIRED) ++include_directories( + ${JNI_INCLUDE_DIRS} +) + -+FIND_PACKAGE(DCMTK REQUIRED) ++find_package(DCMTK REQUIRED) +# /usr/include/dcmtk/dcmpstat/dviface.h -+FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h ++find_path( DCMTK_dcmpstat_INCLUDE_DIR dviface.h + ${DCMTK_DIR}/dcmpstat/include + ${DCMTK_DIR}/include/dcmpstat +) +# /usr/include/dcmtk/dcmjpeg/djdecode.h -+FIND_PATH( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h ++find_path( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h + ${DCMTK_DIR}/dcmjpeg/include + ${DCMTK_DIR}/include/dcmjpeg +) +# /usr/include/dcmtk/dcmsr/dsrdoc.h -+FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h ++find_path(DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h + ${DCMTK_DIR}/dcmsr/include + ${DCMTK_DIR}/include/dcmsr +) + -+INCLUDE_DIRECTORIES( ++include_directories( + ${DCMTK_INCLUDE_DIR} + ${DCMTK_dcmpstat_INCLUDE_DIR} + ${DCMTK_dcmsr_INCLUDE_DIR} ${DCMTK_dcmjpeg_INCLUDE_DIR} +) + -+ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H) ++add_definitions(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H) + -+ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS}) -+TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ++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 ++set_property(TARGET jInterface PROPERTY NO_SONAME 1) ++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 @@ -98,16 +97,16 @@ 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 2012-05-31 13:32:18.354956137 +0000 -@@ -0,0 +1,44 @@ ++++ dicomscope-3.6.0/tkgui/CMakeLists.txt 2013-11-06 13:48:25.000000000 +0100 +@@ -0,0 +1,45 @@ +# Java -+FIND_PACKAGE(Java REQUIRED) # javac, jar ++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") + -+ADD_CUSTOM_COMMAND( ++add_custom_command( + OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class + COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -115,7 +114,7 @@ + COMMENT "javac *.java" +) + -+ADD_CUSTOM_COMMAND( ++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 . + WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope @@ -123,24 +122,25 @@ + COMMENT "jar cvf -> DICOMscope.jar" +) + -+ADD_CUSTOM_TARGET(dummy ALL ++add_custom_target(dummy ALL + DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar + COMMENT "building DICOMscope.jar" +) + -+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 ${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 ++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 ++install(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar + DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime) Modified: trunk/packages/dicomscope/trunk/debian/patches/series =================================================================== --- trunk/packages/dicomscope/trunk/debian/patches/series 2013-11-06 12:33:59 UTC (rev 15120) +++ trunk/packages/dicomscope/trunk/debian/patches/series 2013-11-06 12:55:50 UTC (rev 15121) @@ -6,4 +6,3 @@ dicom_2009.patch log4cplus.patch cmakelists.txt.patch -fixbug694846.patch Modified: trunk/packages/dicomscope/trunk/debian/rules =================================================================== --- trunk/packages/dicomscope/trunk/debian/rules 2013-11-06 12:33:59 UTC (rev 15120) +++ trunk/packages/dicomscope/trunk/debian/rules 2013-11-06 12:55:50 UTC (rev 15121) @@ -1,27 +1,17 @@ #!/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 - +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export JAVA_HOME=/usr/lib/jvm/default-java -CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX="/usr" \ - -DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/jni \ - -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_dcmjpeg_INCLUDE_DIR:PATH=/usr/include/dcmtk/dcmjpeg \ - -DDCMTK_ofstd_INCLUDE_DIR:PATH=/usr/include/dcmtk/ofstd +CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE:STRING="" \ + -DDICOMSCOPE_INSTALL_LIB_DIR:STRING=lib/jni/$(DEB_HOST_MULTIARCH) \ %: dh $@ --buildsystem=cmake --parallel --with javahelper override_dh_auto_configure: - dh_auto_configure -- $(CMAKE_FLAGS) + dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) override_dh_install: # fix exe bit before install @@ -30,7 +20,6 @@ dh_install override_dh_clean: - dh_clean find DICOMscope -name *.class -delete override_dh_installman: _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
