Author: jodogne-guest Date: 2013-04-17 12:46:32 +0000 (Wed, 17 Apr 2013) New Revision: 13334
Removed: trunk/packages/orthanc/trunk/debian/patches/cmake-new-platforms trunk/packages/orthanc/trunk/debian/patches/freebsd-hurd-fixes 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 Log: new upstream version (0.5.1) Modified: trunk/packages/orthanc/trunk/debian/changelog =================================================================== --- trunk/packages/orthanc/trunk/debian/changelog 2013-04-17 11:47:30 UTC (rev 13333) +++ trunk/packages/orthanc/trunk/debian/changelog 2013-04-17 12:46:32 UTC (rev 13334) @@ -1,3 +1,9 @@ +orthanc (0.5.1-1) unstable; urgency=low + + * New upstream version. (Closes: #698417) + + -- Sebastien Jodogne <[email protected]> Wed, 17 Apr 2013 14:23:03 +0200 + orthanc (0.5.0-2) unstable; urgency=low * Fixes for kFreeBSD and Hurd Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json =================================================================== --- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-04-17 11:47:30 UTC (rev 13333) +++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json 2013-04-17 12:46:32 UTC (rev 13334) @@ -7,9 +7,15 @@ // displayed in Orthanc Explorer and at the URI "/system". "Name" : "Orthanc", - // Path to the directory that holds the database + // 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", + // Enable the transparent compression of the DICOM instances "StorageCompression" : false, Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 =================================================================== --- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-04-17 11:47:30 UTC (rev 13333) +++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 2013-04-17 12:46:32 UTC (rev 13334) @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH ORTHANC "1" "January 2013" "Orthanc 0.5.0" "User Commands" +.TH ORTHANC "1" "April 2013" "Orthanc 0.5.1" "User Commands" .SH NAME Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research .SH SYNOPSIS @@ -42,7 +42,7 @@ .SH AUTHOR Written by Sebastien Jodogne <[email protected]> .SH COPYRIGHT -Copyright \(co 2012 Medical Physics Department, CHU of Liege (Belgium) +Copyright \(co 2012\-2013 Medical Physics Department, CHU of Liege (Belgium) Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception. .br This is free software: you are free to change and redistribute it. Deleted: trunk/packages/orthanc/trunk/debian/patches/cmake-new-platforms =================================================================== --- trunk/packages/orthanc/trunk/debian/patches/cmake-new-platforms 2013-04-17 11:47:30 UTC (rev 13333) +++ trunk/packages/orthanc/trunk/debian/patches/cmake-new-platforms 2013-04-17 12:46:32 UTC (rev 13334) @@ -1,69 +0,0 @@ -Index: Orthanc-0.5.0/Resources/CMake/DownloadPackage.cmake -=================================================================== ---- Orthanc-0.5.0.orig/Resources/CMake/DownloadPackage.cmake 2013-01-31 15:04:34.000000000 +0100 -+++ Orthanc-0.5.0/Resources/CMake/DownloadPackage.cmake 2013-01-31 16:59:37.842176683 +0100 -@@ -30,31 +30,7 @@ - #message(${TMP_EXTENSION}) - message("Uncompressing ${TMP_FILENAME}") - -- if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") -- if ("${TMP_EXTENSION}" STREQUAL "zip") -- execute_process( -- COMMAND sh -c "unzip -q ${TMP_PATH} ${UncompressArguments}" -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -- RESULT_VARIABLE Failure -- ) -- elseif (("${TMP_EXTENSION}" STREQUAL "gz") OR ("${TMP_EXTENSION}" STREQUAL "tgz")) -- #message("tar xvfz ${TMP_PATH} ${UncompressArguments}") -- execute_process( -- COMMAND sh -c "tar xfz ${TMP_PATH} ${UncompressArguments}" -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -- RESULT_VARIABLE Failure -- ) -- elseif ("${TMP_EXTENSION}" STREQUAL "bz2") -- execute_process( -- COMMAND sh -c "tar xfj ${TMP_PATH} ${UncompressArguments}" -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -- RESULT_VARIABLE Failure -- ) -- else() -- message(FATAL_ERROR "Unknown package format.") -- endif() -- -- elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") -+ if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") - # How to silently extract files using 7-zip - # http://superuser.com/questions/331148/7zip-command-line-extract-silently-quietly - -@@ -113,8 +89,30 @@ - else() - message(FATAL_ERROR "Support your platform here") - endif() -+ - else() -- message(FATAL_ERROR "Support your platform here") -+ if ("${TMP_EXTENSION}" STREQUAL "zip") -+ execute_process( -+ COMMAND sh -c "unzip -q ${TMP_PATH} ${UncompressArguments}" -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -+ RESULT_VARIABLE Failure -+ ) -+ elseif (("${TMP_EXTENSION}" STREQUAL "gz") OR ("${TMP_EXTENSION}" STREQUAL "tgz")) -+ #message("tar xvfz ${TMP_PATH} ${UncompressArguments}") -+ execute_process( -+ COMMAND sh -c "tar xfz ${TMP_PATH} ${UncompressArguments}" -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -+ RESULT_VARIABLE Failure -+ ) -+ elseif ("${TMP_EXTENSION}" STREQUAL "bz2") -+ execute_process( -+ COMMAND sh -c "tar xfj ${TMP_PATH} ${UncompressArguments}" -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -+ RESULT_VARIABLE Failure -+ ) -+ else() -+ message(FATAL_ERROR "Unknown package format.") -+ endif() - endif() - - if (Failure) Deleted: trunk/packages/orthanc/trunk/debian/patches/freebsd-hurd-fixes =================================================================== --- trunk/packages/orthanc/trunk/debian/patches/freebsd-hurd-fixes 2013-04-17 11:47:30 UTC (rev 13333) +++ trunk/packages/orthanc/trunk/debian/patches/freebsd-hurd-fixes 2013-04-17 12:46:32 UTC (rev 13334) @@ -1,56 +0,0 @@ -Index: Orthanc-0.5.0/Resources/Patches/mongoose-patch.diff -=================================================================== ---- Orthanc-0.5.0.orig/Resources/Patches/mongoose-patch.diff 2013-01-31 15:04:34.000000000 +0100 -+++ Orthanc-0.5.0/Resources/Patches/mongoose-patch.diff 2013-03-07 10:25:55.102730695 +0100 -@@ -1,5 +1,5 @@ ----- i/mongoose/mongoose.c 2012-03-11 23:41:35.000000000 +0100 --+++ mongoose.c 2012-09-17 17:32:01.000000000 +0200 -+--- /home/jodogne/Subversion/Orthanc/ThirdPartyDownloads/mongoose/mongoose.c 2012-03-11 23:41:35.000000000 +0100 -++++ mongoose.c 2013-03-07 10:07:00.566266153 +0100 - @@ -92,8 +92,9 @@ - #define strtoll(x, y, z) strtol(x, y, z) - #else -@@ -12,7 +12,22 @@ - #endif // _MSC_VER - - #define ERRNO GetLastError() --@@ -3844,10 +3845,8 @@ -+@@ -253,6 +254,14 @@ -+ #define MSG_NOSIGNAL 0 -+ #endif -+ -++#if __gnu_hurd__ == 1 -++/** -++ * There is no limit on the length on a path under GNU Hurd, so we set -++ * it to an arbitrary constant. -++ **/ -++#define PATH_MAX 4096 -++#endif -++ -+ typedef void * (*mg_thread_func_t)(void *); -+ -+ static const char *http_500_error = "Internal Server Error"; -+@@ -3844,10 +3853,8 @@ - } - - static void discard_current_request_from_buffer(struct mg_connection *conn) { -@@ -23,17 +38,16 @@ - buffered_len = conn->data_len - conn->request_len; - assert(buffered_len >= 0); - --@@ -4148,7 +4147,13 @@ -+@@ -4148,7 +4155,13 @@ - - // Wait until mg_fini() stops - while (ctx->stop_flag != 2) { --- (void) sleep(0); - +#if defined(__linux) - + usleep(100000); - +#elif defined(_WIN32) - + Sleep(100); - +#else --+#error Support your platform here -+ (void) sleep(0); - +#endif - } - free_context(ctx); Modified: trunk/packages/orthanc/trunk/debian/patches/series =================================================================== --- trunk/packages/orthanc/trunk/debian/patches/series 2013-04-17 11:47:30 UTC (rev 13333) +++ trunk/packages/orthanc/trunk/debian/patches/series 2013-04-17 12:46:32 UTC (rev 13334) @@ -1,2 +0,0 @@ -cmake-new-platforms -freebsd-hurd-fixes _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
