[med-svn] r13511 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches
Sebastien Jodogne
jodogne-guest at alioth.debian.org
Wed May 8 13:43:38 UTC 2013
Author: jodogne-guest
Date: 2013-05-08 13:43:38 +0000 (Wed, 08 May 2013)
New Revision: 13511
Added:
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/control
trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
trunk/packages/orthanc/trunk/debian/patches/series
trunk/packages/orthanc/trunk/debian/rules
Log:
orthanc 0.5.2
Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog 2013-05-08 13:09:59 UTC (rev 13510)
+++ trunk/packages/orthanc/trunk/debian/changelog 2013-05-08 13:43:38 UTC (rev 13511)
@@ -1,3 +1,9 @@
+orthanc (0.5.2-1) unstable; urgency=low
+
+ * New upstream version: 0.5.2
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Wed, 08 May 2013 14:27:23 +0200
+
orthanc (0.5.1-1) unstable; urgency=low
[ Sebastien Jodogne ]
Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-05-08 13:09:59 UTC (rev 13510)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-05-08 13:43:38 UTC (rev 13511)
@@ -27,8 +27,14 @@
// 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" : [
+ ],
+
/**
* Configuration of the HTTP server
**/
@@ -54,7 +60,7 @@
/**
- * Security-related options
+ * Security-related options for the HTTP server
**/
// Whether remote hosts can connect to the HTTP server
@@ -63,7 +69,7 @@
// Whether or not SSL is enabled
"SslEnabled" : false,
- // Path to the SSL certificate
+ // Path to the SSL certificate (meaningful only if SSL is enabled)
"SslCertificate" : "certificate.pem",
// Whether or not the password protection is enabled
Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control 2013-05-08 13:09:59 UTC (rev 13510)
+++ trunk/packages/orthanc/trunk/debian/control 2013-05-08 13:43:38 UTC (rev 13511)
@@ -14,6 +14,7 @@
libgoogle-glog-dev,
libgtest-dev (>= 1.6.0),
libjsoncpp-dev,
+ liblua5.1-0-dev (>= 5.1.0),
libpng-dev,
libsqlite3-dev,
libssl-dev,
Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-05-08 13:09:59 UTC (rev 13510)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-05-08 13:43:38 UTC (rev 13511)
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12.
-.TH ORTHANC "1" "April 2013" "Orthanc 0.5.1" "User Commands"
+.TH ORTHANC "1" "May 2013" "Orthanc 0.5.2" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
Added: trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/absolute-path-resolution 2013-05-08 13:43:38 UTC (rev 13511)
@@ -0,0 +1,74 @@
+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/lua-cmake
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/lua-cmake (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/lua-cmake 2013-05-08 13:43:38 UTC (rev 13511)
@@ -0,0 +1,24 @@
+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-05-08 13:09:59 UTC (rev 13510)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2013-05-08 13:43:38 UTC (rev 13511)
@@ -0,0 +1,2 @@
+absolute-path-resolution
+lua-cmake
Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules 2013-05-08 13:09:59 UTC (rev 13510)
+++ trunk/packages/orthanc/trunk/debian/rules 2013-05-08 13:43:38 UTC (rev 13511)
@@ -7,6 +7,8 @@
-DSTATIC_BUILD:BOOL=OFF \
-DSTANDALONE_BUILD:BOOL=ON \
-DUSE_DYNAMIC_JSONCPP:BOOL=ON \
+ -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"
More information about the debian-med-commit
mailing list