[med-svn] r14721 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches
Sebastien Jodogne
jodogne-guest at alioth.debian.org
Mon Sep 16 13:39:57 UTC 2013
Author: jodogne-guest
Date: 2013-09-16 13:39:57 +0000 (Mon, 16 Sep 2013)
New Revision: 14721
Removed:
trunk/packages/orthanc/trunk/debian/patches/dcmtk-path
trunk/packages/orthanc/trunk/debian/patches/jsoncpp
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/patches/series
trunk/packages/orthanc/trunk/debian/rules
Log:
orthanc 0.6.1
Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/changelog 2013-09-16 13:39:57 UTC (rev 14721)
@@ -1,3 +1,9 @@
+orthanc (0.6.1-1) unstable; urgency=low
+
+ * New upstream version: 0.6.1
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Mon, 16 Sep 2013 15:13:44 +0200
+
orthanc (0.6.0-1) unstable; urgency=low
[ Sebastien Jodogne ]
Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-09-16 13:39:57 UTC (rev 14721)
@@ -1,111 +1,136 @@
{
- /**
- * General configuration of Orthanc
- **/
+ /**
+ * General configuration of Orthanc
+ **/
- // The logical name of this instance of Orthanc. This one is
- // displayed in Orthanc Explorer and at the URI "/system".
- "Name" : "Orthanc",
+ // The logical name of this instance of Orthanc. This one is
+ // displayed in Orthanc Explorer and at the URI "/system".
+ "Name" : "Orthanc",
- // Path to the directory that holds the heavyweight files
- // (i.e. the raw DICOM instances)
- "StorageDirectory" : "/var/lib/orthanc/db-v3",
+ // Path to the directory that holds the heavyweight files
+ // (i.e. the raw DICOM instances)
+ "StorageDirectory" : "/var/lib/orthanc/db-v3",
- // 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-v3",
+ // 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-v3",
- // Enable the transparent compression of the DICOM instances
- "StorageCompression" : false,
+ // Enable the transparent compression of the DICOM instances
+ "StorageCompression" : false,
- // Maximum size of the storage in MB (a value of "0" indicates no
- // limit on the storage size)
- "MaximumStorageSize" : 0,
+ // Maximum size of the storage in MB (a value of "0" indicates no
+ // limit on the storage size)
+ "MaximumStorageSize" : 0,
- // Maximum number of patients that can be stored at a given time
- // in the storage (a value of "0" indicates no limit on the number
- // of patients)
- "MaximumPatientCount" : 0,
+ // Maximum number of patients that can be stored at a given time
+ // in the storage (a value of "0" indicates no limit on the number
+ // of patients)
+ "MaximumPatientCount" : 0,
- // List of paths to the custom Lua scripts to load into this
- // instance of Orthanc
- "LuaScripts" : [
- ],
+ // List of paths to the custom Lua scripts to load into this
+ // instance of Orthanc
+ "LuaScripts" : [
+ ],
- /**
- * Configuration of the HTTP server
- **/
+ /**
+ * Configuration of the HTTP server
+ **/
- // HTTP port for the REST services and for the GUI
- "HttpPort" : 8042,
+ // HTTP port for the REST services and for the GUI
+ "HttpPort" : 8042,
- /**
- * Configuration of the DICOM server
- **/
+ /**
+ * Configuration of the DICOM server
+ **/
- // The DICOM Application Entity Title
- "DicomAet" : "ORTHANC",
+ // The DICOM Application Entity Title
+ "DicomAet" : "ORTHANC",
- // Check whether the called AET corresponds during a DICOM request
- "DicomCheckCalledAet" : false,
+ // Check whether the called AET corresponds during a DICOM request
+ "DicomCheckCalledAet" : false,
- // The DICOM port
- "DicomPort" : 4242,
+ // The DICOM port
+ "DicomPort" : 4242,
- /**
- * Security-related options for the HTTP server
- **/
+ /**
+ * Security-related options for the HTTP server
+ **/
- // Whether remote hosts can connect to the HTTP server
- "RemoteAccessAllowed" : false,
+ // Whether remote hosts can connect to the HTTP server
+ "RemoteAccessAllowed" : false,
- // Whether or not SSL is enabled
- "SslEnabled" : false,
+ // Whether or not SSL is enabled
+ "SslEnabled" : false,
- // Path to the SSL certificate (meaningful only if SSL is enabled)
- "SslCertificate" : "certificate.pem",
+ // Path to the SSL certificate (meaningful only if SSL is enabled)
+ "SslCertificate" : "certificate.pem",
- // Whether or not the password protection is enabled
- "AuthenticationEnabled" : false,
+ // Whether or not the password protection is enabled
+ "AuthenticationEnabled" : false,
- // The list of the registered users. Because Orthanc uses HTTP
- // Basic Authentication, the passwords are stored as plain text.
- "RegisteredUsers" : {
- "alice" : "alicePassword"
- },
+ // The list of the registered users. Because Orthanc uses HTTP
+ // Basic Authentication, the passwords are stored as plain text.
+ "RegisteredUsers" : {
+ // "alice" : "alicePassword"
+ },
+ /**
+ * Network topology
+ **/
+
+ // The list of the known DICOM modalities
+ "DicomModalities" : {
/**
- * Network topology
+ * Uncommenting the following line would enable Orthanc to
+ * connect to an instance of the "storescp" open-source DICOM
+ * store (shipped in the DCMTK distribution) started by the
+ * command line "storescp 2000".
**/
+ // "sample" : [ "STORESCP", "localhost", 2000 ]
- // The list of the known DICOM modalities
- "DicomModalities" : {
- /**
- * Uncommenting the following line would enable Orthanc to
- * connect to an instance of the "storescp" open-source DICOM
- * store (shipped in the DCMTK distribution) started by the
- * command line "storescp 2000".
- **/
- // "sample" : [ "STORESCP", "localhost", 2000 ]
- },
+ /**
+ * A fourth parameter is available to enable patches for a
+ * specific PACS manufacturer. The allowed values are currently
+ * "Generic" (default value) and "ClearCanvas". This parameter is
+ * case-sensitive.
+ **/
+ // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
+ },
- // The list of the known Orthanc peers
- "OrthancPeers" : {
- /**
- * Each line gives the base URL of an Orthanc peer, possibly
- * followed by the username/password pair (if the password
- * protection is enabled on the peer).
- **/
- // "peer" : [ "http://localhost:8043/", "alice", "alicePassword" ]
- // "peer2" : [ "http://localhost:8044/" ]
- }
+ // The list of the known Orthanc peers
+ "OrthancPeers" : {
+ /**
+ * Each line gives the base URL of an Orthanc peer, possibly
+ * followed by the username/password pair (if the password
+ * protection is enabled on the peer).
+ **/
+ // "peer" : [ "http://localhost:8043/", "alice", "alicePassword" ]
+ // "peer2" : [ "http://localhost:8044/" ]
+ },
+
+
+
+ /**
+ * Advanced options
+ **/
+
+ // Dictionary of symbolic names for the user-defined metadata. Each
+ // entry must map a number between 1024 and 65535 to an unique
+ // string.
+ "UserMetadata" : {
+ // "Sample" : 1024
+ },
+
+ // Number of seconds without receiving any instance before a
+ // patient, a study or a series is considered as stable.
+ "StableAge" : 60
}
Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-09-16 13:39:57 UTC (rev 14721)
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH ORTHANC "1" "July 2013" "Orthanc 0.6.0" "User Commands"
+.TH ORTHANC "1" "September 2013" "Orthanc 0.6.1" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
Deleted: trunk/packages/orthanc/trunk/debian/patches/dcmtk-path
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/dcmtk-path 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/patches/dcmtk-path 2013-09-16 13:39:57 UTC (rev 14721)
@@ -1,18 +0,0 @@
-Description: Fix path to the DCMTK dictionaries
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.6.0/OrthancServer/DicomProtocol/DicomServer.cpp
-===================================================================
---- Orthanc-0.6.0.orig/OrthancServer/DicomProtocol/DicomServer.cpp 2013-07-16 15:13:36.000000000 +0200
-+++ Orthanc-0.6.0/OrthancServer/DicomProtocol/DicomServer.cpp 2013-07-17 12:25:44.005680564 +0200
-@@ -111,7 +111,8 @@
- LoadEmbeddedDictionary(d, EmbeddedResources::DICTIONARY_PRIVATE);
-
- #elif defined(__linux)
-- std::string path = "/usr/share/dcmtk";
-+ //std::string path = "/usr/share/dcmtk";
-+ std::string path = "/usr/share/libdcmtk2";
-
- const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE);
- if (env != NULL)
Deleted: trunk/packages/orthanc/trunk/debian/patches/jsoncpp
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/jsoncpp 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/patches/jsoncpp 2013-09-16 13:39:57 UTC (rev 14721)
@@ -1,61 +0,0 @@
-Description: Fixes for 64bit compilations with jsoncpp-0.6.0
-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.0/OrthancCppClient/OrthancConnection.cpp
-===================================================================
---- Orthanc-0.6.0.orig/OrthancCppClient/OrthancConnection.cpp 2013-07-16 15:13:36.000000000 +0200
-+++ Orthanc-0.6.0/OrthancCppClient/OrthancConnection.cpp 2013-07-17 11:57:11.765723817 +0200
-@@ -48,7 +48,8 @@
-
- Orthanc::IDynamicObject* OrthancConnection::GetFillerItem(size_t index)
- {
-- return new Patient(*this, content_[index].asString());
-+ Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
-+ return new Patient(*this, content_[tmp].asString());
- }
-
- Patient& OrthancConnection::GetPatient(unsigned int index)
-Index: Orthanc-0.6.0/OrthancCppClient/Patient.cpp
-===================================================================
---- Orthanc-0.6.0.orig/OrthancCppClient/Patient.cpp 2013-07-16 15:13:36.000000000 +0200
-+++ Orthanc-0.6.0/OrthancCppClient/Patient.cpp 2013-07-17 11:57:11.765723817 +0200
-@@ -50,7 +50,8 @@
-
- Orthanc::IDynamicObject* Patient::GetFillerItem(size_t index)
- {
-- return new Study(connection_, patient_["Studies"][index].asString());
-+ Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
-+ return new Study(connection_, patient_["Studies"][tmp].asString());
- }
-
- Patient::Patient(const OrthancConnection& connection,
-Index: Orthanc-0.6.0/OrthancCppClient/Series.cpp
-===================================================================
---- Orthanc-0.6.0.orig/OrthancCppClient/Series.cpp 2013-07-16 15:13:36.000000000 +0200
-+++ Orthanc-0.6.0/OrthancCppClient/Series.cpp 2013-07-17 11:57:11.765723817 +0200
-@@ -215,7 +215,8 @@
-
- Orthanc::IDynamicObject* Series::GetFillerItem(size_t index)
- {
-- return new Instance(connection_, series_["Instances"][index].asString());
-+ Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
-+ return new Instance(connection_, series_["Instances"][tmp].asString());
- }
-
- Series::Series(const OrthancConnection& connection,
-Index: Orthanc-0.6.0/OrthancCppClient/Study.cpp
-===================================================================
---- Orthanc-0.6.0.orig/OrthancCppClient/Study.cpp 2013-07-16 15:13:36.000000000 +0200
-+++ Orthanc-0.6.0/OrthancCppClient/Study.cpp 2013-07-17 11:57:11.765723817 +0200
-@@ -50,7 +50,8 @@
-
- Orthanc::IDynamicObject* Study::GetFillerItem(size_t index)
- {
-- return new Series(connection_, study_["Series"][index].asString());
-+ Json::Value::ArrayIndex tmp = static_cast<Json::Value::ArrayIndex>(index);
-+ return new Series(connection_, study_["Series"][tmp].asString());
- }
-
- Study::Study(const OrthancConnection& connection,
Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2013-09-16 13:39:57 UTC (rev 14721)
@@ -1,2 +0,0 @@
-dcmtk-path
-jsoncpp
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2013-09-16 08:59:11 UTC (rev 14720)
+++ trunk/packages/orthanc/trunk/debian/rules 2013-09-16 13:39:57 UTC (rev 14721)
@@ -11,7 +11,8 @@
-DUSE_DYNAMIC_LUA:BOOL=ON \
-DUSE_DYNAMIC_MONGOOSE:BOOL=OFF \
-DDEBIAN_USE_GTEST_SOURCE_PACKAGE:BOOL=ON \
- -DCMAKE_BUILD_TYPE=""
+ -DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk2 \
+ -DCMAKE_BUILD_TYPE=Release
override_dh_auto_configure:
# Put 3rd party packages where the cmake build system expects them
More information about the debian-med-commit
mailing list