[med-svn] r18000 - in trunk/packages/orthanc/trunk/debian: . ThirdPartyDownloads configuration docs patches source

Sebastien Jodogne jodogne-guest at moszumanska.debian.org
Fri Sep 12 13:42:53 UTC 2014 

Author: jodogne-guest
Date: 2014-09-12 13:42:53 +0000 (Fri, 12 Sep 2014)
New Revision: 18000

Added:
   trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/mongoose-3.8.tgz
   trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk
Removed:
   trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/mongoose-3.1.tgz
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/copyright
   trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
   trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install
   trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install
   trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
   trunk/packages/orthanc/trunk/debian/patches/series
   trunk/packages/orthanc/trunk/debian/source/include-binaries
Log:
New upstream version of Orthanc

Deleted: trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/mongoose-3.1.tgz
===================================================================
(Binary files differ)

Added: trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/mongoose-3.8.tgz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/mongoose-3.8.tgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/changelog	2014-09-12 13:42:53 UTC (rev 18000)
@@ -1,3 +1,11 @@
+orthanc (0.8.3+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version: 0.8.3
+  * Upgrade Mongoose version: 3.1 to 3.8
+  * Packaging of the plugin SDK
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 12 Sep 2014 11:30:53 +0200
+
 orthanc (0.8.2+dfsg-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2014-09-12 13:42:53 UTC (rev 18000)
@@ -62,8 +62,15 @@
   // The DICOM port
   "DicomPort" : 4242,
 
+  // The default encoding that is assumed for DICOM files without
+  // "SpecificCharacterSet" DICOM tag. The allowed values are "Ascii",
+  // "Utf8", "Latin1", "Latin2", "Latin3", "Latin4", "Latin5",
+  // "Cyrillic", "Arabic", "Greek", "Hebrew", "Thai", "Japanese",
+  // and "Chinese".
+  "DefaultEncoding" : "Latin1",
 
 
+
   /**
    * Security-related options for the HTTP server
    **/
@@ -180,5 +187,19 @@
   // The maximum number of active jobs in the Orthanc scheduler. When
   // this limit is reached, the addition of new jobs is blocked until
   // some job finishes.
-  "LimitJobs" : 10
+  "LimitJobs" : 10,
+
+  // If this option is set to "false", Orthanc will not log the
+  // resources that are exported to other DICOM modalities of Orthanc
+  // peers in the URI "/exports". This is useful to prevent the index
+  // to grow indefinitely in auto-routing tasks.
+  "LogExportedResources" : true,
+
+  // Enable or disable HTTP Keep-Alive (experimental). Set this option
+  // to "true" only in the case of high HTTP loads.
+  "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.
+  "StoreDicom" : true
 }

Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/control	2014-09-12 13:42:53 UTC (rev 18000)
@@ -68,8 +68,9 @@
 Depends: liborthancclient0.8 (= ${binary:Version}), ${misc:Depends}
 Description: Orthanc Client development files
  Orthanc Client is a library to access the content of a remote
- instance of Orthanc. Orthanc is a lightweight, RESTful DICOM server
- for healthcare and medical research.
+ instance of Orthanc. This package also contains the plugin SDK.
+ Orthanc is a lightweight, RESTful DICOM server for healthcare and
+ medical research.
  .
  This package includes the header files for C++ code.
 
@@ -79,7 +80,8 @@
 Depends: ${misc:Depends}
 Description: Orthanc Client documentation
  Orthanc Client is a library to access the content of a remote
- instance of Orthanc. Orthanc is a lightweight, RESTful DICOM server
- for healthcare and medical research.
+ instance of Orthanc. This package also contains the plugin SDK.
+ Orthanc is a lightweight, RESTful DICOM server for healthcare and
+ medical research.
  .
  This package includes the documentation and the sample codes.

Modified: trunk/packages/orthanc/trunk/debian/copyright
===================================================================
--- trunk/packages/orthanc/trunk/debian/copyright	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/copyright	2014-09-12 13:42:53 UTC (rev 18000)
@@ -21,8 +21,8 @@
 Copyright: 2010-2013 Jomago - Alain Mazy, Benjamin Golinvaux, Sebastien Jodogne
 License: GPL-3
 
-Files: debian/ThirdPartyDownloads/mongoose-3.1.tgz
-Copyright: Copyright (c) 2004-2010 Sergey Lyubka
+Files: debian/ThirdPartyDownloads/mongoose-3.8.tgz
+Copyright: Copyright (c) 2004-2013 Sergey Lyubka
 License: MIT
 
 Files: Core/SQLite/*
@@ -37,7 +37,7 @@
 Copyright: 2012-2014 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, 2006-2011 Mathieu Malaterre, and 1993-2005 CREATIS
 License: GPL-3 with OpenSSL exception
 
-Files: OrthancServer/DicomProtocol/DicomUserConnection.cpp OrthancServer/Internals/CommandDispatcher.cpp OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/Internals/StoreScp.cpp
+Files: OrthancServer/DicomProtocol/DicomUserConnection.cpp OrthancServer/Internals/CommandDispatcher.cpp OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/Internals/StoreScp.cpp OrthancServer/DicomProtocol/DicomUserConnection.cpp
 Copyright: 2012-2014 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, and 1994-2011 OFFIS e.V.
 License: GPL-3 with OpenSSL exception
 

Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2014-09-12 13:42:53 UTC (rev 18000)
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
-.TH ORTHANC "1" "July 2014" "Orthanc 0.8.0" "User Commands"
+.TH ORTHANC "1" "September 2014" "Orthanc 0.8.3" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
 .SH SYNOPSIS

Modified: trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-dev.install	2014-09-12 13:42:53 UTC (rev 18000)
@@ -1,2 +1,3 @@
 usr/include/orthanc/OrthancCppClient.h
+usr/include/orthanc/OrthancCPlugin.h
 usr/lib/libOrthancClient.so

Modified: trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient-doc.install	2014-09-12 13:42:53 UTC (rev 18000)
@@ -1,2 +1,3 @@
 usr/share/doc/orthanc/OrthancClient/*
+usr/share/doc/orthanc/OrthancPlugin/*
 usr/share/doc/orthanc/OrthancClientSamples/*

Added: trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk	2014-09-12 13:42:53 UTC (rev 18000)
@@ -0,0 +1,53 @@
+Description: Install the plugin SDK with CMake
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-0.8.3/CMakeLists.txt
+===================================================================
+--- Orthanc-0.8.3.orig/CMakeLists.txt	2014-09-11 16:07:31.000000000 +0200
++++ Orthanc-0.8.3/CMakeLists.txt	2014-09-12 15:15:41.324023583 +0200
+@@ -3,7 +3,7 @@
+ project(Orthanc)
+ 
+ # Version of the build, should always be "mainline" except in release branches
+-set(ORTHANC_VERSION "0.8.3")
++set(ORTHANC_VERSION "mainline")
+ 
+ 
+ #####################################################################
+@@ -476,7 +476,9 @@
+     )
+ 
+   install(
+-    FILES ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h 
++    FILES
++    ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h 
++    ${ORTHANC_ROOT}/Plugins/OrthancCPlugin/OrthancCPlugin.h 
+     DESTINATION include/orthanc
+     )
+ endif()
+@@ -502,12 +504,21 @@
+ 
+   add_custom_target(doc
+     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen
+-    COMMAND
+-    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+     COMMENT "Generating internal documentation with Doxygen" VERBATIM
+     )
+ 
++  add_custom_command(TARGET Orthanc
++    POST_BUILD
++    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen
++    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++    COMMENT "Generating plugin documentation with Doxygen" VERBATIM
++    )
++
++  install(
++    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/OrthancPluginDocumentation/doc/
++    DESTINATION share/doc/orthanc/OrthancPlugin
++    )
++
+   if (BUILD_CLIENT_LIBRARY)
+     configure_file(
+       ${CMAKE_SOURCE_DIR}/Resources/OrthancClient.doxygen

Modified: trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version	2014-09-12 13:42:53 UTC (rev 18000)
@@ -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.8.0/OrthancExplorer/explorer.html
+Index: Orthanc-0.8.3/OrthancExplorer/explorer.html
 ===================================================================
---- Orthanc-0.8.0.orig/OrthancExplorer/explorer.html
-+++ Orthanc-0.8.0/OrthancExplorer/explorer.html
+--- Orthanc-0.8.3.orig/OrthancExplorer/explorer.html
++++ Orthanc-0.8.3/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	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/patches/series	2014-09-12 13:42:53 UTC (rev 18000)
@@ -1 +1,2 @@
 remove-jquery-version
+install-plugin-sdk

Modified: trunk/packages/orthanc/trunk/debian/source/include-binaries
===================================================================
--- trunk/packages/orthanc/trunk/debian/source/include-binaries	2014-09-12 13:29:15 UTC (rev 17999)
+++ trunk/packages/orthanc/trunk/debian/source/include-binaries	2014-09-12 13:42:53 UTC (rev 18000)
@@ -1,4 +1,4 @@
-debian/ThirdPartyDownloads/mongoose-3.1.tgz
+debian/ThirdPartyDownloads/mongoose-3.8.tgz
 debian/JS/jquery.mobile-1.1.0/images/icons-18-white.png
 debian/JS/jquery.mobile-1.1.0/images/icons-36-white.png
 debian/JS/jquery.mobile-1.1.0/images/icons-36-black.png

More information about the debian-med-commit mailing list