[med-svn] r14813 - in trunk/packages/orthanc/trunk/debian: . patches
Sebastien Jodogne
jodogne-guest at alioth.debian.org
Thu Oct 10 15:36:33 UTC 2013
Author: jodogne-guest
Date: 2013-10-10 15:36:32 +0000 (Thu, 10 Oct 2013)
New Revision: 14813
Added:
trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs
trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install
trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian
trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs
trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install
trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian
trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install
trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery
trunk/packages/orthanc/trunk/debian/patches/soname
Modified:
trunk/packages/orthanc/trunk/debian/control
trunk/packages/orthanc/trunk/debian/patches/series
trunk/packages/orthanc/trunk/debian/rules
Log:
doc, dev, lib packages
Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control 2013-10-08 15:51:48 UTC (rev 14812)
+++ trunk/packages/orthanc/trunk/debian/control 2013-10-10 15:36:32 UTC (rev 14813)
@@ -44,3 +44,36 @@
.
Orthanc lets its users focus on the content of the DICOM files,
hiding the complexity of the DICOM format and of the DICOM protocol.
+
+Package: liborthancclient0.6
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Orthanc Client runtime library
+ Orthanc Client is a library to access the content of a remote
+ instance of Orthanc. Orthanc is a lightweight, RESTful DICOM server
+ for healthcare and medical research.
+ .
+ This package includes the client library.
+
+Package: liborthancclient-dev
+Architecture: any
+Section: libdevel
+Depends: liborthancclient0.6 (= ${binary:Version}), ${misc:Depends}
+Description: Orthanc Client development files
+ Orthanc Client is a library to access the content of a remote
+ instance of Orthanc. Orthanc is a lightweight, RESTful DICOM server
+ for healthcare and medical research.
+ .
+ This package includes the header files for C++ code.
+
+Package: liborthancclient-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Orthanc Client documentation
+ Orthanc Client is a library to access the content of a remote
+ instance of Orthanc. Orthanc is a lightweight, RESTful DICOM server
+ for healthcare and medical research.
+ .
+ This package includes the documentation and the sample codes.
Added: trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1 @@
+usr/include/orthanc
Added: trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,2 @@
+usr/include/orthanc/OrthancCppClient.h
+usr/lib/libOrthancClient.so
Added: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,18 @@
+The documentation of the Orthanc Client for C++ can be opened using
+the following command:
+
+$ xdg-open file:///usr/share/doc/orthanc/OrthancClient/index.html
+
+The basic sample can be compiled with the following command:
+
+$ mkdir /tmp/OrthancClientSample
+$ cd /tmp/OrthancClientSample
+$ cmake /usr/share/doc/orthanc/OrthancClientSamples/Basic
+$ make
+$ ./Test
+
+Before running this basic sample, make sure that Orthanc is up and
+running on the default HTTP port. This can be checked by opening the
+Orthanc Web interface:
+
+$ xdg-open http://localhost:8042/app/explorer.html
Added: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1 @@
+usr/share/doc/orthanc
Added: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,2 @@
+usr/share/doc/orthanc/OrthancClient/*
+usr/share/doc/orthanc/OrthancClientSamples/*
Added: trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,2 @@
+This is the "Orthanc Client" library to access the content of a remote
+instance of Orthanc from third-party code.
Added: trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1 @@
+usr/lib/libOrthancClient.so.*
Added: trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,17 @@
+Description: Remove lintian warning embedded-javascript-library due to Doxygen
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-0.6.2/Resources/OrthancClient.doxygen
+===================================================================
+--- Orthanc-0.6.2.orig/Resources/OrthancClient.doxygen 2013-10-04 16:33:53.000000000 +0200
++++ Orthanc-0.6.2/Resources/OrthancClient.doxygen 2013-10-07 14:39:36.403680209 +0200
+@@ -1141,7 +1141,7 @@
+ # typically be disabled. For large projects the javascript based search engine
+ # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+-SEARCHENGINE = YES
++SEARCHENGINE = NO
+
+ # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+ # implemented using a PHP enabled web server instead of at the web client
Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series 2013-10-08 15:51:48 UTC (rev 14812)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,2 @@
+doxygen-jquery
+soname
Added: trunk/packages/orthanc/trunk/debian/patches/soname
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/soname (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/soname 2013-10-10 15:36:32 UTC (rev 14813)
@@ -0,0 +1,59 @@
+Description: Patch to include the proper SONAME in the Orthanc Client library
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+Origin: upstream
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-0.6.2/CMakeLists.txt
+===================================================================
+--- Orthanc-0.6.2.orig/CMakeLists.txt 2013-10-04 16:33:53.000000000 +0200
++++ Orthanc-0.6.2/CMakeLists.txt 2013-10-07 12:43:30.879856165 +0200
+@@ -3,9 +3,7 @@
+ project(Orthanc)
+
+ # Version of the build, should always be "mainline" except in release branches
+-add_definitions(
+- -DORTHANC_VERSION="0.6.2"
+- )
++set(ORTHANC_VERSION "0.6.2")
+
+
+ #####################################################################
+@@ -120,6 +118,10 @@
+ ## Build the core of Orthanc
+ #####################################################################
+
++add_definitions(
++ -DORTHANC_VERSION="${ORTHANC_VERSION}"
++ )
++
+ list(LENGTH OPENSSL_SOURCES OPENSSL_SOURCES_LENGTH)
+ if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
+ add_library(OpenSSL STATIC ${OPENSSL_SOURCES})
+@@ -337,6 +339,18 @@
+ message(FATAL_ERROR "Support your platform here")
+ endif()
+
++
++ # Set the version of the shared library for releases
++ string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" ORTHANC_IS_RELEASE ${ORTHANC_VERSION})
++ if (ORTHANC_IS_RELEASE)
++ string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\1.\\2" ORTHANC_RELEASE ${ORTHANC_VERSION})
++ message("This is a release build, setting the version of the library to ${ORTHANC_RELEASE}")
++ set_target_properties(OrthancClient PROPERTIES VERSION ${ORTHANC_RELEASE} SOVERSION ${ORTHANC_RELEASE})
++ else()
++ message("This is not a release build")
++ endif()
++
++
+ install(
+ TARGETS OrthancClient
+ RUNTIME DESTINATION lib # Destination for Windows
+@@ -350,6 +364,8 @@
+ endif()
+
+
++
++
+ #####################################################################
+ ## Generate the documentation if Doxygen is present
+ #####################################################################
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2013-10-08 15:51:48 UTC (rev 14812)
+++ trunk/packages/orthanc/trunk/debian/rules 2013-10-10 15:36:32 UTC (rev 14813)
@@ -1,9 +1,13 @@
#!/usr/bin/make -f
+export DESTDIR := $(CURDIR)/debian/tmp
+export CLIENT_SAMPLES_DIR := $(DESTDIR)/usr/share/doc/orthanc/OrthancClientSamples
+
%:
dh $@ --parallel --builddirectory=Build
CMAKE_EXTRA_FLAGS += \
+ -DCMAKE_SKIP_RPATH=ON \
-DSTATIC_BUILD:BOOL=OFF \
-DSTANDALONE_BUILD:BOOL=ON \
-DUSE_DYNAMIC_JSONCPP:BOOL=ON \
@@ -14,7 +18,7 @@
-DCMAKE_BUILD_TYPE="" # The build type must be left empty, see #711515
override_dh_auto_configure:
- # Put 3rd party packages where the cmake build system expects them
+ # Put 3rd party packages where the cmake build system expects them
mkdir -p ThirdPartyDownloads
( cd ThirdPartyDownloads; cp ../debian/ThirdPartyDownloads/* . )
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
@@ -27,6 +31,13 @@
dh_clean
override_dh_auto_install:
+ # Move the samples of the Orthanc Client
+ mkdir -p $(CLIENT_SAMPLES_DIR)
+ cp -r Resources/Samples/OrthancClient/* $(CLIENT_SAMPLES_DIR)
+
+ dh_auto_install
+
+ # Move the Orthanc binaries to "/usr/sbin"
dh_install Build/Orthanc usr/sbin
override_dh_installchangelogs:
More information about the debian-med-commit
mailing list