[med-svn] r14172 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches
Sebastien Jodogne
jodogne-guest at alioth.debian.org
Wed Jul 17 10:44:07 UTC 2013
Author: jodogne-guest
Date: 2013-07-17 10:44:06 +0000 (Wed, 17 Jul 2013)
New Revision: 14172
Added:
trunk/packages/orthanc/trunk/debian/patches/dcmtk-path
trunk/packages/orthanc/trunk/debian/patches/jsoncpp
Removed:
trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution
trunk/packages/orthanc/trunk/debian/patches/lua-cmake
Modified:
trunk/packages/orthanc/trunk/debian/changelog
trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
trunk/packages/orthanc/trunk/debian/copyright
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.0
Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/changelog 2013-07-17 10:44:06 UTC (rev 14172)
@@ -1,3 +1,9 @@
+orthanc (0.6.0-1) unstable; urgency=low
+
+ * New upstream version: 0.6.0. Closes: #716958 712038
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Wed, 17 Jul 2013 10:55:49 +0200
+
orthanc (0.5.2-1) unstable; urgency=low
[ Sebastien Jodogne ]
Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-07-17 10:44:06 UTC (rev 14172)
@@ -98,7 +98,14 @@
// "sample" : [ "STORESCP", "localhost", 2000 ]
},
- // The list of the known Orthanc peers (currently unused)
+ // 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/" ]
+ }
}
Modified: trunk/packages/orthanc/trunk/debian/copyright
===================================================================
--- trunk/packages/orthanc/trunk/debian/copyright 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/copyright 2013-07-17 10:44:06 UTC (rev 14172)
@@ -19,10 +19,14 @@
Copyright: 2012 CHU of Liege (Belgium) and Sebastien Jodogne <s.jodogne at gmail.com>, and 2012 The Chromium Authors
License: BSD
-Files: OrthancCppClient/*
+Files: Core/HttpClient.h Core/HttpClient.cpp
Copyright: 2012 CHU of Liege (Belgium) and Sebastien Jodogne <s.jodogne at gmail.com>
License: MIT
+Files: OrthancServer/FromDcmtkBridge.cpp
+Copyright: 2012 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, 2006-2011 Mathieu Malaterre, and 1993-2005 CREATIS
+License: GPL
+
Files: OrthancExplorer/libs/date.js
Copyright: 2008 Geoffrey McGill
License: MIT
Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-07-17 10:44:06 UTC (rev 14172)
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12.
-.TH ORTHANC "1" "May 2013" "Orthanc 0.5.2" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
+.TH ORTHANC "1" "July 2013" "Orthanc 0.6.0" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
Deleted: trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution 2013-07-17 10:44:06 UTC (rev 14172)
@@ -1,74 +0,0 @@
-Index: Orthanc-0.5.2/OrthancServer/OrthancInitialization.cpp
-===================================================================
---- Orthanc-0.5.2.orig/OrthancServer/OrthancInitialization.cpp 2013-05-07 13:54:58.000000000 +0200
-+++ Orthanc-0.5.2/OrthancServer/OrthancInitialization.cpp 2013-05-08 15:32:29.588225296 +0200
-@@ -280,10 +280,38 @@
- }
-
-
-+
-+ std::string InterpretRelativePath(const std::string& baseDirectory,
-+ const std::string& relativePath)
-+ {
-+ boost::filesystem::path base(baseDirectory);
-+ boost::filesystem::path relative(relativePath);
-+
-+ /**
-+ The following lines should be equivalent to this one:
-+
-+ return (base / relative).string();
-+
-+ However, for some unknown reason, some versions of Boost do not
-+ make the proper path resolution when "baseDirectory" is an
-+ absolute path. So, a hack is used below.
-+ **/
-+
-+ if (relative.is_absolute())
-+ {
-+ return relative.string();
-+ }
-+ else
-+ {
-+ return (base / relative).string();
-+ }
-+ }
-+
-+
- std::string InterpretStringParameterAsPath(const std::string& parameter)
- {
- boost::mutex::scoped_lock lock(globalMutex_);
-- return (defaultDirectory_ / parameter).string();
-+ return InterpretRelativePath(defaultDirectory_.string(), parameter);
- }
-
-
-Index: Orthanc-0.5.2/OrthancServer/OrthancInitialization.h
-===================================================================
---- Orthanc-0.5.2.orig/OrthancServer/OrthancInitialization.h 2013-05-07 13:54:58.000000000 +0200
-+++ Orthanc-0.5.2/OrthancServer/OrthancInitialization.h 2013-05-08 15:30:56.605394409 +0200
-@@ -62,6 +62,9 @@
-
- void SetupRegisteredUsers(MongooseServer& httpServer);
-
-+ std::string InterpretRelativePath(const std::string& baseDirectory,
-+ const std::string& relativePath);
-+
- std::string InterpretStringParameterAsPath(const std::string& parameter);
-
- void GetGlobalListOfStringsParameter(std::list<std::string>& target,
-Index: Orthanc-0.5.2/UnitTests/main.cpp
-===================================================================
---- Orthanc-0.5.2.orig/UnitTests/main.cpp 2013-05-08 15:27:47.591770425 +0200
-+++ Orthanc-0.5.2/UnitTests/main.cpp 2013-05-08 15:28:21.895338746 +0200
-@@ -334,6 +334,11 @@
- ASSERT_EQ("(2000,00A4) Other", s);
- }
-
-+TEST(OrthancInitialization, AbsoluteDirectory)
-+{
-+ ASSERT_EQ("/tmp/hello", InterpretRelativePath("/tmp", "hello"));
-+ ASSERT_EQ("/tmp", InterpretRelativePath("/tmp", "/tmp"));
-+}
-
- int main(int argc, char **argv)
- {
Added: trunk/packages/orthanc/trunk/debian/patches/dcmtk-path
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/dcmtk-path (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/dcmtk-path 2013-07-17 10:44:06 UTC (rev 14172)
@@ -0,0 +1,18 @@
+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)
Added: trunk/packages/orthanc/trunk/debian/patches/jsoncpp
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/jsoncpp (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/jsoncpp 2013-07-17 10:44:06 UTC (rev 14172)
@@ -0,0 +1,61 @@
+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,
Deleted: trunk/packages/orthanc/trunk/debian/patches/lua-cmake
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/lua-cmake 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/patches/lua-cmake 2013-07-17 10:44:06 UTC (rev 14172)
@@ -1,24 +0,0 @@
-Index: Orthanc-0.5.2/Resources/CMake/LuaConfiguration.cmake
-===================================================================
---- Orthanc-0.5.2.orig/Resources/CMake/LuaConfiguration.cmake 2013-05-07 13:54:58.000000000 +0200
-+++ Orthanc-0.5.2/Resources/CMake/LuaConfiguration.cmake 2013-05-08 15:18:47.010566483 +0200
-@@ -56,15 +56,12 @@
- source_group(ThirdParty\\Lua REGULAR_EXPRESSION ${LUA_SOURCES_DIR}/.*)
-
- else()
-- CHECK_INCLUDE_FILE_CXX(lua.h HAVE_LUA_H)
-- if (NOT HAVE_LUA_H)
-- message(FATAL_ERROR "Please install the liblua-dev package")
-- endif()
-+ include(FindLua51)
-
-- CHECK_LIBRARY_EXISTS(lua "lua_pcall" HAVE_LUA_LIB)
-- if (NOT HAVE_LUA_LIB)
-+ if (NOT LUA51_FOUND)
- message(FATAL_ERROR "Please install the liblua-dev package")
- endif()
-
-- link_libraries(lua)
-+ include_directories(${LUA_INCLUDE_DIR})
-+ link_libraries(${LUA_LIBRARIES})
- endif()
Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2013-07-17 10:44:06 UTC (rev 14172)
@@ -1,2 +1,2 @@
-absolute-path-resolution
-lua-cmake
+dcmtk-path
+jsoncpp
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2013-07-16 17:08:00 UTC (rev 14171)
+++ trunk/packages/orthanc/trunk/debian/rules 2013-07-17 10:44:06 UTC (rev 14172)
@@ -10,8 +10,7 @@
-DUSE_DYNAMIC_LUA:BOOL=ON \
-DUSE_DYNAMIC_MONGOOSE:BOOL=OFF \
-DDEBIAN_USE_GTEST_SOURCE_PACKAGE:BOOL=ON \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DDCMTK_LIBRARIES="wrap;oflog"
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
override_dh_auto_configure:
# Put 3rd party packages where the cmake build system expects them
More information about the debian-med-commit
mailing list