[med-svn] r19469 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches
Sebastien Jodogne
jodogne-guest at moszumanska.debian.org
Thu Jul 2 20:26:19 UTC 2015
Author: jodogne-guest
Date: 2015-07-02 20:26:18 +0000 (Thu, 02 Jul 2015)
New Revision: 19469
Added:
trunk/packages/orthanc/trunk/debian/configuration/serve-folders.json
Removed:
trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders
trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage
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/orthanc.init
trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
trunk/packages/orthanc/trunk/debian/patches/series
trunk/packages/orthanc/trunk/debian/postinst
trunk/packages/orthanc/trunk/debian/watch
Log:
Orthanc 0.9.1
Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/changelog 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1,5 +1,11 @@
-orthanc (0.9.0+dfsg-2) UNRELEASED; urgency=medium
+orthanc (0.9.1+dfsg-1) UNRELEASED; urgency=medium
+ * New upstream version
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Thu, 02 Jul 2015 17:06:06 +0200
+
+orthanc (0.9.0+dfsg-2) unstable; urgency=medium
+
* Fix upgrade from testing of orthanc-dev. Closes: #790514
* Fix upgrade from testing of orthanc-doc. Closes: #790517
Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2015-07-02 20:26:18 UTC (rev 19469)
@@ -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/"
],
@@ -124,8 +124,8 @@
* 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" and "Dcm4Chee". This
- * parameter is case-sensitive.
+ * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee" and
+ * "SyngoVia". This parameter is case-sensitive.
**/
// "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
},
@@ -233,49 +233,5 @@
// 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 of the ServeFolders plugin, that can be used to
- * serve additional folders through the embedded Web server of
- * Orthanc. This is especially useful to avoid problems related to
- * the same-origin policy when developing Web applications in
- * JavaScript on the top of the REST API of Orthanc.
- *
- * The commented example would serve the documentation of the plugin
- * SDK at the URL http://localhost:8042/doc/index.html
- **/
- "ServeFolders" : {
- // "/doc" : "/usr/share/doc/orthanc/OrthancPlugin"
- },
-
-
- /**
- * Configuration to use PostgreSQL instead of the default SQLite
- * back-end of Orthanc. You will have to install the
- * "orthanc-postgresql" package to take advantage of this feature.
- * 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
- }
+ "CaseSensitivePN" : false
}
Added: trunk/packages/orthanc/trunk/debian/configuration/serve-folders.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/serve-folders.json (rev 0)
+++ trunk/packages/orthanc/trunk/debian/configuration/serve-folders.json 2015-07-02 20:26:18 UTC (rev 19469)
@@ -0,0 +1,15 @@
+{
+ /**
+ * Configuration of the ServeFolders plugin, that can be used to
+ * serve additional folders through the embedded Web server of
+ * Orthanc. This is especially useful to avoid problems related to
+ * the same-origin policy when developing Web applications in
+ * JavaScript on the top of the REST API of Orthanc.
+ *
+ * The commented example would serve the documentation of the plugin
+ * SDK at the URL http://localhost:8042/doc/index.html
+ **/
+ "ServeFolders" : {
+ // "/doc" : "/usr/share/doc/orthanc/OrthancPlugin"
+ }
+}
Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
-.TH ORTHANC "1" "June 2015" "Orthanc 0.9.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.1.
+.TH ORTHANC "1" "July 2015" "Orthanc 0.9.1" "User Commands"
.SH NAME
Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
.SH SYNOPSIS
Modified: trunk/packages/orthanc/trunk/debian/install
===================================================================
--- trunk/packages/orthanc/trunk/debian/install 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/install 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1 +1,2 @@
debian/configuration/orthanc.json etc/orthanc
+debian/configuration/serve-folders.json etc/orthanc
Modified: trunk/packages/orthanc/trunk/debian/orthanc.init
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc.init 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/orthanc.init 2015-07-02 20:26:18 UTC (rev 19469)
@@ -25,7 +25,7 @@
# Constants
DAEMON=/usr/sbin/Orthanc
LOGDIR=/var/log/orthanc
-DAEMON_ARGS="--logdir=${LOGDIR} /etc/orthanc/orthanc.json"
+DAEMON_ARGS="--logdir=${LOGDIR} /etc/orthanc/"
PIDFILE=/run/orthanc.pid
SCRIPTNAME=/etc/init.d/orthanc
ORTHANC_USER=orthanc:orthanc
Deleted: trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/patches/cmake-serve-folders 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1,47 +0,0 @@
-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-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version 2015-07-02 20:26:18 UTC (rev 19469)
@@ -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.9.0/OrthancExplorer/explorer.html
+Index: Orthanc-0.9.1/OrthancExplorer/explorer.html
===================================================================
---- Orthanc-0.9.0.orig/OrthancExplorer/explorer.html
-+++ Orthanc-0.9.0/OrthancExplorer/explorer.html
+--- Orthanc-0.9.1.orig/OrthancExplorer/explorer.html
++++ Orthanc-0.9.1/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-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/patches/series 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1,3 +1 @@
-cmake-serve-folders
remove-jquery-version
-serve-folders-linkage
Deleted: trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/patches/serve-folders-linkage 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1,58 +0,0 @@
-Description: Add the "--as-needed" flag when linking 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/Resources/CMake/Compiler.cmake
-===================================================================
---- Orthanc-0.9.0.orig/Resources/CMake/Compiler.cmake
-+++ Orthanc-0.9.0/Resources/CMake/Compiler.cmake
-@@ -1,6 +1,12 @@
- # This file sets all the compiler-related flags
-
--if (${CMAKE_COMPILER_IS_GNUCXX})
-+if (CMAKE_CROSSCOMPILING)
-+ # Cross-compilation necessarily implies standalone and static build
-+ SET(STATIC_BUILD ON)
-+ SET(STANDALONE_BUILD ON)
-+endif()
-+
-+if (CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long -Wno-implicit-function-declaration")
- # --std=c99 makes libcurl not to compile
- # -pedantic gives a lot of warnings on OpenSSL
-@@ -11,7 +17,7 @@ if (${CMAKE_COMPILER_IS_GNUCXX})
- set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -I<CMAKE_CURRENT_SOURCE_DIR> <SOURCE> <OBJECT>")
- endif()
-
--elseif (${MSVC})
-+elseif (MSVC)
- # Use static runtime under Visual Studio
- # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
- # http://stackoverflow.com/a/6510446
-@@ -53,6 +59,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
-
- if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
- add_definitions(
- -D_LARGEFILE64_SOURCE=1
- -D_FILE_OFFSET_BITS=64
-@@ -67,7 +75,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Wi
- )
- link_libraries(rpcrt4 ws2_32)
-
-- if (${CMAKE_COMPILER_IS_GNUCXX})
-+ if (CMAKE_COMPILER_IS_GNUCXX)
- # This is a patch for MinGW64
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--allow-multiple-definition -static-libgcc -static-libstdc++")
-
-@@ -118,7 +126,7 @@ if (NOT HAVE_UUID_H)
- endif()
-
-
--if (${STATIC_BUILD})
-+if (STATIC_BUILD)
- add_definitions(-DORTHANC_STATIC=1)
- else()
- add_definitions(-DORTHANC_STATIC=0)
Modified: trunk/packages/orthanc/trunk/debian/postinst
===================================================================
--- trunk/packages/orthanc/trunk/debian/postinst 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/postinst 2015-07-02 20:26:18 UTC (rev 19469)
@@ -25,6 +25,7 @@
chmod 0775 /etc/orthanc
chmod 0664 /etc/orthanc/orthanc.json
+ chmod 0664 /etc/orthanc/serve-folders.json
chmod 0775 /var/lib/orthanc
# Start the Orthanc service after installation
Modified: trunk/packages/orthanc/trunk/debian/watch
===================================================================
--- trunk/packages/orthanc/trunk/debian/watch 2015-07-02 20:22:41 UTC (rev 19468)
+++ trunk/packages/orthanc/trunk/debian/watch 2015-07-02 20:26:18 UTC (rev 19469)
@@ -1,3 +1,3 @@
version=3
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
-https://github.com/jodogne/Orthanc/releases .*/download/[\d.]+/Orthanc-(\d\S*)\.tar\.gz
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g" \
+http://www.orthanc-server.com/browse.php?path=/orthanc downloads/get\.php\?path=/orthanc/Orthanc-(\d\S*)\.tar\.gz
More information about the debian-med-commit
mailing list