[med-svn] r20620 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches
Sebastien Jodogne
jodogne-guest at moszumanska.debian.org
Thu Dec 3 10:58:02 UTC 2015
Author: jodogne-guest
Date: 2015-12-03 10:58:01 +0000 (Thu, 03 Dec 2015)
New Revision: 20620
Added:
trunk/packages/orthanc/trunk/debian/configuration/worklists.json
Removed:
trunk/packages/orthanc/trunk/debian/patches/find-dictionary
Modified:
trunk/packages/orthanc/trunk/debian/changelog
trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
trunk/packages/orthanc/trunk/debian/install
trunk/packages/orthanc/trunk/debian/patches/series
trunk/packages/orthanc/trunk/debian/rules
trunk/packages/orthanc/trunk/debian/source.lintian-overrides
Log:
Orthanc 0.9.5
Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/changelog 2015-12-03 10:58:01 UTC (rev 20620)
@@ -1,3 +1,9 @@
+orthanc (0.9.5+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Thu, 03 Dec 2015 10:38:27 +0100
+
orthanc (0.9.4+dfsg-2) unstable; urgency=medium
* Build-depend on libdcmtk-dev instead of libdcmtk2-dev. Closes: #804571
Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2015-12-03 10:58:01 UTC (rev 20620)
@@ -9,12 +9,12 @@
// Path to the directory that holds the heavyweight files
// (i.e. the raw DICOM instances)
- "StorageDirectory" : "/var/lib/orthanc/db-v5",
+ "StorageDirectory" : "/var/lib/orthanc/db-v6",
// Path to the directory that holds the SQLite index (if unset,
// the value of StorageDirectory is used). This index could be
// stored on a RAM-drive or a SSD device for performance reasons.
- "IndexDirectory" : "/var/lib/orthanc/db-v5",
+ "IndexDirectory" : "/var/lib/orthanc/db-v6",
// Enable the transparent compression of the DICOM instances
"StorageCompression" : false,
@@ -103,8 +103,12 @@
"Mpeg2TransferSyntaxAccepted" : true,
"RleTransferSyntaxAccepted" : true,
+ // Whether Orthanc accepts to act as C-Store SCP for unknown storage
+ // SOP classes (aka. "promiscuous mode")
+ "UnknownSopClassAccepted" : true,
+
/**
* Security-related options for the HTTP server
**/
@@ -147,8 +151,9 @@
* A fourth parameter is available to enable patches for a
* specific PACS manufacturer. The allowed values are currently
* "Generic" (default value), "StoreScp" (storescp tool from
- * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee" and
- * "SyngoVia". This parameter is case-sensitive.
+ * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee", "SyngoVia",
+ * "AgfaImpax" (Agfa IMPAX), "EFilm2" (eFilm version 2), and
+ * "Vitrea". This parameter is case-sensitive.
**/
// "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
},
@@ -191,17 +196,19 @@
**/
// Dictionary of symbolic names for the user-defined metadata. Each
- // entry must map a number between 1024 and 65535 to an unique
- // string.
+ // entry must map an unique string to an unique number between 1024
+ // and 65535.
"UserMetadata" : {
// "Sample" : 1024
},
// Dictionary of symbolic names for the user-defined types of
- // attached files. Each entry must map a number between 1024 and
- // 65535 to an unique string.
+ // attached files. Each entry must map an unique string to an unique
+ // number between 1024 and 65535. Optionally, a second argument can
+ // provided to specify a MIME content type for the attachment.
"UserContentType" : {
// "sample" : 1024
+ // "sample2" : [ 1025, "application/pdf" ]
},
// Number of seconds without receiving any instance before a
@@ -244,7 +251,8 @@
"KeepAlive" : false,
// If this option is set to "false", Orthanc will run in index-only
- // mode. The DICOM files will not be stored on the drive.
+ // mode. The DICOM files will not be stored on the drive. Note that
+ // this option might prevent the upgrade to newer versions of Orthanc.
"StoreDicom" : true,
// DICOM associations are kept open as long as new DICOM commands
@@ -258,8 +266,19 @@
// 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
+ // When handling a C-Find SCP request, setting this flag to "true"
+ // will enable case-sensitive match for PN value representation
+ // (such as PatientName). By default, the search is
+ // case-insensitive, which does not follow the DICOM standard.
+ "CaseSensitivePN" : false,
+
+ // Register a new tag in the dictionary of DICOM tags that are known
+ // to Orthanc. Each line must contain the tag (formatted as 2
+ // hexadecimal numbers), the value representation (2 upcase
+ // characters), a nickname for the tag, possibly the minimum
+ // multiplicity (> 0 with defaults to 1), and possibly the maximum
+ // multiplicity (0 means arbitrary multiplicity, defaults to 1).
+ "Dictionary" : {
+ // "0014,1020" : [ "DA", "ValidationExpiryDate", 1, 1 ]
+ }
}
Added: trunk/packages/orthanc/trunk/debian/configuration/worklists.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/worklists.json (rev 0)
+++ trunk/packages/orthanc/trunk/debian/configuration/worklists.json 2015-12-03 10:58:01 UTC (rev 20620)
@@ -0,0 +1,12 @@
+{
+ /**
+ * Configuration of the ModalityWorklists plugin, that can be used
+ * to serve DICOM modality worklists. More information about this
+ * plugin is available in the source distribution at:
+ * https://bitbucket.org/sjodogne/orthanc/src/default/Plugins/Samples/ModalityWorklists/README
+ **/
+ "Worklists" : {
+ "Enable": false,
+ "Database": "/var/lib/orthanc/worklists"
+ }
+}
Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2015-12-03 10:58:01 UTC (rev 20620)
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.2.
-.TH ORTHANC "1" "September 2015" "Orthanc 0.9.4" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
+.TH ORTHANC "1" "December 2015" "Orthanc 0.9.5" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
@@ -8,7 +8,9 @@
.SH DESCRIPTION
Orthanc, lightweight, RESTful DICOM server for healthcare and medical research.
.PP
-If no configuration file is given on the command line, a set of default
+The "CONFIGURATION" argument can be a single file or a directory. In the
+case of a directory, all the JSON files it contains will be merged.
+If no configuration path is given on the command line, a set of default
parameters is used. Please refer to the Orthanc homepage for the full
instructions about how to use Orthanc <http://www.orthanc\-server.com/>.
.SS "Command-line options:"
@@ -23,6 +25,9 @@
\fB\-\-config\fR=\fI\,[file]\/\fR
create a sample configuration file and exit
.TP
+\fB\-\-errors\fR
+print the supported error codes and exit
+.TP
\fB\-\-verbose\fR
be verbose in logs
.TP
Modified: trunk/packages/orthanc/trunk/debian/install
===================================================================
--- trunk/packages/orthanc/trunk/debian/install 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/install 2015-12-03 10:58:01 UTC (rev 20620)
@@ -1,2 +1,3 @@
debian/configuration/orthanc.json etc/orthanc
debian/configuration/serve-folders.json etc/orthanc
+debian/configuration/worklists.json etc/orthanc
Deleted: trunk/packages/orthanc/trunk/debian/patches/find-dictionary
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/find-dictionary 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/patches/find-dictionary 2015-12-03 10:58:01 UTC (rev 20620)
@@ -1,67 +0,0 @@
-Description: Fix when looking for the DICOM dictionary
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.9.4/Resources/CMake/DcmtkConfiguration.cmake
-===================================================================
---- Orthanc-0.9.4.orig/Resources/CMake/DcmtkConfiguration.cmake 2015-09-16 16:53:23.000000000 +0200
-+++ Orthanc-0.9.4/Resources/CMake/DcmtkConfiguration.cmake 2015-11-10 16:38:30.016776426 +0100
-@@ -3,9 +3,14 @@
- find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
- /usr/share/dcmtk
- /usr/share/libdcmtk2
-+ /usr/share/libdcmtk4
- /usr/local/share/dcmtk
- )
-
-+ if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND")
-+ message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system")
-+ endif()
-+
- message("Autodetected path to the DICOM dictionaries: ${DCMTK_DICTIONARY_DIR_AUTO}")
- add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR_AUTO}")
- else()
-@@ -15,6 +20,7 @@
-
- if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
- SET(DCMTK_VERSION_NUMBER 360)
-+ set(DCMTK_PACKAGE_VERSION "3.6.0")
- SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
- SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip")
- SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
-@@ -30,7 +36,7 @@
- IF (CMAKE_CROSSCOMPILING)
- SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
- ENDIF()
-- SET(DCMTK_SOURCE_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
-+ SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
- include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
- include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
-
-@@ -47,9 +53,8 @@
- set(HAVE_PROTOTYPE_GETSOCKNAME 1)
- endif()
-
-- set(DCMTK_PACKAGE_VERSION "3.6.0")
- set(DCMTK_PACKAGE_VERSION_SUFFIX "")
-- set(DCMTK_PACKAGE_VERSION_NUMBER 360)
-+ set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
-
- CONFIGURE_FILE(
- ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
-@@ -155,13 +160,13 @@
-
- #set_source_files_properties(${DCMTK_SOURCES}
- # PROPERTIES COMPILE_DEFINITIONS
-- # "PACKAGE_VERSION=\"3.6.0\";PACKAGE_VERSION_NUMBER=\"360\"")
-+ # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
-
- # This fixes crashes related to the destruction of the DCMTK OFLogger
- # http://support.dcmtk.org/docs-snapshot/file_macros.html
- add_definitions(
- -DLOG4CPLUS_DISABLE_FATAL=1
-- -DDCMTK_VERSION_NUMBER=360
-+ -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}
- )
-
- include_directories(
Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2015-12-03 10:58:01 UTC (rev 20620)
@@ -1 +1 @@
-find-dictionary
+
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/rules 2015-12-03 10:58:01 UTC (rev 20620)
@@ -77,13 +77,16 @@
# Move the Orthanc binaries to "/usr/sbin"
dh_install Build/Orthanc usr/sbin
- # Move the "ServeFolder" plugin at the proper place for shared libraries
+ # Move the basic plugins at the proper places for shared libraries
dh_install usr/share/orthanc/plugins/libServeFolders.so.$(UPSTREAM_VERSION) usr/lib/orthanc
+ dh_install usr/share/orthanc/plugins/libModalityWorklists.so.$(UPSTREAM_VERSION) usr/lib/orthanc
override_dh_link:
- # Create a link to the shared library of the plugin
+ # Create a link to the shared library of the plugins
dh_link usr/lib/orthanc/libServeFolders.so.$(UPSTREAM_VERSION) \
usr/share/orthanc/plugins/libServeFolders.so
+ dh_link usr/lib/orthanc/libModalityWorklists.so.$(UPSTREAM_VERSION) \
+ usr/share/orthanc/plugins/libModalityWorklists.so
override_dh_installchangelogs:
dh_installchangelogs -k NEWS
Modified: trunk/packages/orthanc/trunk/debian/source.lintian-overrides
===================================================================
--- trunk/packages/orthanc/trunk/debian/source.lintian-overrides 2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/source.lintian-overrides 2015-12-03 10:58:01 UTC (rev 20620)
@@ -3,6 +3,7 @@
# cf. https://lists.debian.org/debian-med/2015/09/msg00135.html
orthanc source: source-is-missing OrthancExplorer/libs/jquery.mobile.simpledialog2.js
orthanc source: source-is-missing OrthancExplorer/libs/tree.jquery.js
+orthanc source: source-is-missing OrthancExplorer/libs/jquery.blockui.js
orthanc source: source-is-missing debian/JS/DateJs/src/globalization/el-GR.js
orthanc source: source-is-missing debian/JS/DateJs/src/globalization/gu-IN.js
orthanc source: source-is-missing debian/JS/DateJs/src/globalization/hi-IN.js
More information about the debian-med-commit
mailing list