[med-svn] r19303 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches
Sebastien Jodogne
jodogne-guest at moszumanska.debian.org
Wed Jun 3 15:56:05 UTC 2015
Author: jodogne-guest
Date: 2015-06-03 15:56:04 +0000 (Wed, 03 Jun 2015)
New Revision: 19303
Added:
trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders
Removed:
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.doc-base
trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install
trunk/packages/orthanc/trunk/debian/liborthancclient0.8.README.Debian
trunk/packages/orthanc/trunk/debian/liborthancclient0.8.install
Modified:
trunk/packages/orthanc/trunk/debian/changelog
trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
trunk/packages/orthanc/trunk/debian/control
trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides
trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
trunk/packages/orthanc/trunk/debian/patches/series
trunk/packages/orthanc/trunk/debian/postrm
trunk/packages/orthanc/trunk/debian/rules
Log:
Orthanc 0.9.0
Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/changelog 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,8 +1,12 @@
-orthanc (0.8.6+dfsg-3) UNRELEASED; urgency=medium
+orthanc (0.9.0+dfsg-1) UNRELEASED; urgency=medium
+ * New upstream version
+ * Fix debian/copyright
+ * Add the ServeFolders plugin
+ * Removal of the liborthancclient* packages
* Improvements to the documentation
- -- Jodogne <jodogne at unstable> Mon, 09 Mar 2015 10:53:34 +0100
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Wed, 03 Jun 2015 14:47:20 +0200
orthanc (0.8.6+dfsg-2) experimental; urgency=medium
Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2015-06-03 15:56:04 UTC (rev 19303)
@@ -39,7 +39,7 @@
// folders, in which case they will be scanned non-recursively to
// find shared libraries.
"Plugins" : [
- "/usr/share/orthanc/plugins/"
+ "/usr/share/orthanc/plugins/"
],
@@ -68,8 +68,8 @@
// The default encoding that is assumed for DICOM files without
// "SpecificCharacterSet" DICOM tag. The allowed values are "Ascii",
// "Utf8", "Latin1", "Latin2", "Latin3", "Latin4", "Latin5",
- // "Cyrillic", "Arabic", "Greek", "Hebrew", "Thai", "Japanese",
- // and "Chinese".
+ // "Cyrillic", "Windows1251", "Arabic", "Greek", "Hebrew", "Thai",
+ // "Japanese", and "Chinese".
"DefaultEncoding" : "Latin1",
// The transfer syntaxes that are accepted by Orthanc C-Store SCP
@@ -225,7 +225,17 @@
// to 0, the connection is closed immediately.
"DicomAssociationCloseDelay" : 5,
-
+ // Maximum number of query/retrieve DICOM requests that are
+ // maintained by Orthanc. The least recently used requests get
+ // deleted as new requests are issued.
+ "QueryRetrieveSize" : 10,
+
+ // When handling a C-Find SCP request, setting this flag to "false"
+ // will enable case-insensitive match for PN value representation
+ // (such as PatientName). By default, the search is case-insensitive.
+ "CaseSensitivePN" : false,
+
+
/**
* Configuration to use PostgreSQL instead of the default SQLite
* back-end of Orthanc. You will have to install the
@@ -233,27 +243,24 @@
* Have a look at "/usr/share/doc/orthanc-postgresql/README.Debian"
* for a tutorial.
**/
-
"PostgreSQL" : {
-
// Enable the use of PostgreSQL to store the Orthanc index?
"EnableIndex" : false,
-
+
// Enable the use of PostgreSQL to store the DICOM files?
"EnableStorage" : false,
-
+
// Option 1: Specify explicit authentication parameters
"Host" : "localhost",
"Port" : 5432,
"Database" : "orthanc_db",
"Username" : "orthanc_user",
"Password" : "my_password",
-
+
// Option 2: Authenticate using PostgreSQL connection URI
// "ConnectionUri" : "postgresql://orthanc_user:my_password@localhost:5432/orthanc_db",
-
+
// Optional: Disable the locking of the PostgreSQL database
"Lock" : false
-
}
}
Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/control 2015-06-03 15:56:04 UTC (rev 19303)
@@ -82,39 +82,3 @@
.
This package includes the header files to develop C/C++ plugins
for Orthanc.
-
-Package: liborthancclient0.8
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: orthanc (= ${binary:Version})
-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.8 (= ${binary:Version}), ${misc:Depends}
-Description: Orthanc Client development files
- Orthanc Client is a library to access the content of a remote
- instance of Orthanc. This package also contains the plugin SDK.
- 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. This package also contains the plugin SDK.
- Orthanc is a lightweight, RESTful DICOM server for healthcare and
- medical research.
- .
- This package includes the documentation and the sample codes.
Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.5.
-.TH ORTHANC "1" "February 2015" "Orthanc 0.8.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
+.TH ORTHANC "1" "June 2015" "Orthanc 0.9.0" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-dev.dirs 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1 +0,0 @@
-usr/include/orthanc
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,2 +0,0 @@
-usr/include/orthanc/OrthancCppClient.h
-usr/lib/libOrthancClient.so
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.README.Debian 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,21 +0,0 @@
-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
-
-Sample plugins are available in the following folder:
-/usr/share/doc/orthanc/OrthancClientSamples
-
-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
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.dirs 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1 +0,0 @@
-usr/share/doc/orthanc
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.doc-base
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.doc-base 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.doc-base 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,25 +0,0 @@
-Document: liborthancclient-doc
-Title: Documentation of the client library of Orthanc
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
-Abstract: RESTful DICOM server for healthcare and medical research
- Orthanc aims at providing a simple, yet powerful standalone DICOM
- server. Orthanc can turn any computer running Windows or Linux into a
- DICOM store (in other words, a mini-PACS system). Its architecture is
- lightweight, meaning that no complex database administration is
- required, nor the installation of third-party dependencies.
- .
- What makes Orthanc unique is the fact that it provides a RESTful
- API. Thanks to this major feature, it is possible to drive Orthanc
- from any computer language. The DICOM tags of the stored medical
- images can be downloaded in the JSON file format. Furthermore,
- standard PNG images can be generated on-the-fly from the DICOM
- instances by Orthanc.
- .
- Orthanc lets its users focus on the content of the DICOM files,
- hiding the complexity of the DICOM format and of the DICOM protocol.
-Section: Science/Medicine
-
-Format: HTML
-Index: /usr/share/doc/orthanc/OrthancClient/index.html
-Files: /usr/share/doc/orthanc/OrthancClient/*
-
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,2 +0,0 @@
-usr/share/doc/orthanc/OrthancClient/*
-usr/share/doc/orthanc/OrthancClientSamples/*
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient0.8.README.Debian
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.8.README.Debian 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.8.README.Debian 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,2 +0,0 @@
-This is the "Orthanc Client" library to access the content of a remote
-instance of Orthanc from third-party code.
Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient0.8.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.8.install 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.8.install 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1 +0,0 @@
-usr/lib/libOrthancClient.so.*
Modified: trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides 2015-06-03 15:56:04 UTC (rev 19303)
@@ -4,6 +4,3 @@
# The following line overrides misspelling in "OrthancExplorer/libs/jquery.blockui.js"
spelling-error-in-binary usr/sbin/Orthanc supress suppress
-
-# By default, no Orthanc plugin is installed by the orthanc package
-package-contains-empty-directory usr/share/orthanc/plugins/
Added: trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders 2015-06-03 15:56:04 UTC (rev 19303)
@@ -0,0 +1,47 @@
+Description: Installation of the ServeFolders plugin
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-0.9.0/CMakeLists.txt
+===================================================================
+--- Orthanc-0.9.0.orig/CMakeLists.txt
++++ Orthanc-0.9.0/CMakeLists.txt
+@@ -391,20 +391,31 @@ endif()
+ ## Build the "ServeFolders" plugin
+ #####################################################################
+
+-include(ExternalProject)
+-externalproject_add(ServeFolders
+- CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DSERVE_FOLDERS_VERSION:STRING=${ORTHANC_VERSION} -DALLOW_DOWNLOADS:BOOL=ON -DSTATIC_BUILD:BOOL=${STATIC_BUILD} -DUSE_SYSTEM_JSONCPP:BOOL=${USE_SYSTEM_JSONCPP} -DCMAKE_INSTALL_PREFIX=Install
+- SOURCE_DIR ${CMAKE_SOURCE_DIR}/Plugins/Samples/ServeFolders
++add_definitions(-DSERVE_FOLDERS_VERSION="${ORTHANC_VERSION}")
++
++include_directories(${CMAKE_SOURCE_DIR}/Plugins/Include)
++
++add_library(
++ ServeFolders SHARED
++ Plugins/Samples/ServeFolders/Plugin.cpp
++ ${THIRD_PARTY_SOURCES}
++ )
++
++set_target_properties(
++ ServeFolders PROPERTIES
++ VERSION ${ORTHANC_VERSION}
++ SOVERSION ${ORTHANC_VERSION}
+ )
+
+-ExternalProject_Get_Property(ServeFolders binary_dir)
+ install(
+- DIRECTORY ${binary_dir}/Install/share/orthanc/plugins
+- DESTINATION share/orthanc
++ TARGETS ServeFolders
++ RUNTIME DESTINATION lib # Destination for Windows
++ LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
+ )
+
+
+
++
+ #####################################################################
+ ## Generate the documentation if Doxygen is present
+ #####################################################################
Modified: trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version 2015-06-03 15:56:04 UTC (rev 19303)
@@ -2,10 +2,10 @@
Author: Sebastien Jodogne <s.jodogne at gmail.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.8.6/OrthancExplorer/explorer.html
+Index: Orthanc-0.9.0/OrthancExplorer/explorer.html
===================================================================
---- Orthanc-0.8.6.orig/OrthancExplorer/explorer.html
-+++ Orthanc-0.8.6/OrthancExplorer/explorer.html
+--- Orthanc-0.9.0.orig/OrthancExplorer/explorer.html
++++ Orthanc-0.9.0/OrthancExplorer/explorer.html
@@ -6,15 +6,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Orthanc Explorer</title>
Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2015-06-03 15:56:04 UTC (rev 19303)
@@ -1,2 +1,2 @@
+cmake-serve-folders
remove-jquery-version
-
Modified: trunk/packages/orthanc/trunk/debian/postrm
===================================================================
--- trunk/packages/orthanc/trunk/debian/postrm 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/postrm 2015-06-03 15:56:04 UTC (rev 19303)
@@ -13,12 +13,12 @@
# Remove the "orthanc" group and user
if getent passwd orthanc >/dev/null; then
- if [ -x /usr/sbin/deluser ]; then
+ if [ -x "$(command -v deluser)" ]; then
deluser --system orthanc
fi
fi
if getent group orthanc >/dev/null; then
- if [ -x /usr/sbin/delgroup ]; then
+ if [ -x "$(command -v delgroup)" ]; then
delgroup --system orthanc
fi
fi
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2015-06-03 09:14:14 UTC (rev 19302)
+++ trunk/packages/orthanc/trunk/debian/rules 2015-06-03 15:56:04 UTC (rev 19303)
@@ -2,7 +2,12 @@
export DESTDIR := $(CURDIR)/debian/tmp
export DOC_DIR := $(DESTDIR)/usr/share/doc/orthanc
+export PLUGINS_DIR := $(DESTDIR)/usr/share/orthanc/plugins
+export DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+export UPSTREAM_VERSION := $(shell echo "$(DEBIAN_VERSION)" | cut -d '+' -f 1)
+
+
%:
dh $@ --parallel --builddirectory=Build
@@ -55,20 +60,22 @@
cp -r Resources/Samples $(DOC_DIR)/Samples
cp -r Plugins/Samples $(DOC_DIR)/OrthancPluginSamples
- # Populate the content of the "liborthancclient-doc" package
- mv $(DOC_DIR)/Samples/OrthancClient/ $(DOC_DIR)/OrthancClientSamples
-
dh_auto_install
# Move the Orthanc binaries to "/usr/sbin"
dh_install Build/Orthanc usr/sbin
-override_dh_installchangelogs:
- dh_installchangelogs -k NEWS
+ # Move the "ServeFolder" plugin at the proper place for shared libraries
+ dh_install usr/share/orthanc/plugins/libServeFolders.so.$(UPSTREAM_VERSION) usr/lib/orthanc
+override_dh_link:
+ # Create a link to the shared library of the plugin
+ dh_link usr/lib/orthanc/libServeFolders.so.$(UPSTREAM_VERSION) \
+ usr/share/orthanc/plugins/libServeFolders.so
+
override_dh_compress:
# Do not compress the samples
- dh_compress -XOrthancClientSamples -XOrthancPluginSamples -XSamples
+ dh_compress -XOrthancPluginSamples -XSamples
get-orig-source:
uscan --verbose --force-download --repack --compression xz
More information about the debian-med-commit
mailing list