Author: jodogne-guest Date: 2015-12-04 16:42:50 +0000 (Fri, 04 Dec 2015) New Revision: 20631
Added: trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides Removed: trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery Modified: trunk/packages/orthanc-webviewer/trunk/debian/README.Debian trunk/packages/orthanc-webviewer/trunk/debian/changelog trunk/packages/orthanc-webviewer/trunk/debian/control trunk/packages/orthanc-webviewer/trunk/debian/copyright trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake trunk/packages/orthanc-webviewer/trunk/debian/patches/series trunk/packages/orthanc-webviewer/trunk/debian/postrm Log: Orthanc WebViewer 2.0 Modified: trunk/packages/orthanc-webviewer/trunk/debian/README.Debian =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/README.Debian 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/README.Debian 2015-12-04 16:42:50 UTC (rev 20631) @@ -13,3 +13,17 @@ Browse to your series of interest. You will see a yellow button entitled "Orthanc Web Viewer". Clicking on it will open the Web viewer on the series. + + +Update notes +------------ + +If after installing this plugin, the Web viewer does not properly +display some series of images, this is most probably due to the fact +that the cache of the Web viewer needs to be rebuilt after an +update. Here are the commands to do so, provided the cache is located +at the default location: + +# sudo /etc/init.d/orthanc stop +# sudo rm -rf /var/lib/orthanc/db-v6/WebViewerCache/ +# sudo /etc/init.d/orthanc start Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/changelog 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/changelog 2015-12-04 16:42:50 UTC (rev 20631) @@ -1,3 +1,9 @@ +orthanc-webviewer (2.0-1) UNRELEASED; urgency=medium + + * New upstream version. + + -- Sebastien Jodogne <s.jodo...@gmail.com> Fri, 04 Dec 2015 17:13:12 +0100 + orthanc-webviewer (1.2-1) unstable; urgency=medium * New upstream version. Modified: trunk/packages/orthanc-webviewer/trunk/debian/control =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/control 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/control 2015-12-04 16:42:50 UTC (rev 20631) @@ -16,7 +16,7 @@ libjsoncpp-dev, libpng-dev, libsqlite3-dev, - orthanc-dev (>= 0.9.1), + orthanc-dev (>= 0.9.5), unzip, uuid-dev, yui-compressor, @@ -27,7 +27,7 @@ Package: orthanc-webviewer Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.1) +Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.5) Description: Web viewer of medical images for Orthanc Orthanc Web Viewer is a plugin to Orthanc, a lightweight, RESTful Vendor Neutral Archive for medical imaging. It extends Orthanc with an integrated Modified: trunk/packages/orthanc-webviewer/trunk/debian/copyright =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-12-04 16:42:50 UTC (rev 20631) @@ -15,10 +15,6 @@ Copyright: 2004-2008 Rene Nyffenegger License: zlib -Files: Orthanc/Resources/ThirdParty/minizip/* -Copyright: 1998-2010 Gilles Vollant, and 2009-2010 Mathias Svensson -License: zlib - Files: Orthanc/Resources/ThirdParty/VisualStudio/* Copyright: 2006-2008 Alexander Chemeris License: BSD-3-clause Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2015-12-04 16:42:50 UTC (rev 20631) @@ -2,20 +2,20 @@ Author: Sebastien Jodogne <s.jodo...@gmail.com> --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: OrthancWebViewer-1.2/CMakeLists.txt +Index: OrthancWebViewer-2.0/CMakeLists.txt =================================================================== ---- OrthancWebViewer-1.2.orig/CMakeLists.txt -+++ OrthancWebViewer-1.2/CMakeLists.txt -@@ -59,7 +59,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso +--- OrthancWebViewer-2.0.orig/CMakeLists.txt ++++ OrthancWebViewer-2.0/CMakeLists.txt +@@ -54,7 +54,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso + include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/SQLiteConfiguration.cmake) include(${CMAKE_SOURCE_DIR}/Resources/CMake/GdcmConfiguration.cmake) - include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibJpegConfiguration.cmake) -include(${CMAKE_SOURCE_DIR}/Resources/CMake/JavaScriptLibraries.cmake) +set(JAVASCRIPT_LIBS_DIR ${CMAKE_CURRENT_BINARY_DIR}/javascript-libs/) # Check that the Orthanc SDK headers are available or download them -@@ -190,15 +190,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM) +@@ -174,15 +174,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM) add_dependencies(OrthancWebViewer GDCM) endif() @@ -25,11 +25,12 @@ add_definitions(-DORTHANC_WEBVIEWER_VERSION="${ORTHANC_WEBVIEWER_VERSION}") - set_target_properties(OrthancWebViewer PROPERTIES +-set_target_properties(OrthancWebViewer PROPERTIES - VERSION ${ORTHANC_WEBVIEWER_VERSION} - SOVERSION ${ORTHANC_WEBVIEWER_VERSION}) ++set_target_properties(OrthancWebViewer PROPERTIES + NO_SONAME ON -+ LINK_FLAGS "-lgdcmDSED -lgdcmMSFF -luuid -Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}" ++ LINK_FLAGS "-lgdcmMSFF -luuid -Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}" + ) install( Deleted: trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery 2015-12-04 16:42:50 UTC (rev 20631) @@ -1,28 +0,0 @@ -Description: Fix for the version of jQuery that is shipped with Debian -Author: Sebastien Jodogne <s.jodo...@gmail.com> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: OrthancWebViewer-1.2/WebApplication/viewer.js -=================================================================== ---- OrthancWebViewer-1.2.orig/WebApplication/viewer.js -+++ OrthancWebViewer-1.2/WebApplication/viewer.js -@@ -363,15 +363,10 @@ $(document).ready(function() { - success: function(volume) { - if (volume.SortedInstances.length != 0) { - instances = volume.SortedInstances; -- $('#topright').html([ -- $('<span>').text(volume.PatientID), -- $('<br>'), -- $('<span>').text(volume.PatientName), -- $('<br>'), -- $('<span>').text(volume.StudyDescription), -- $('<br>'), -- $('<span>').text(volume.SeriesDescription) -- ]); -+ $('#topright').html(volume.PatientID + '<br/>' + -+ volume.PatientName + '<br/>' + -+ volume.StudyDescription + '<br/>' + -+ volume.SeriesDescription + '<br/>'); - } - } - }); Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/series =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/patches/series 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/patches/series 2015-12-04 16:42:50 UTC (rev 20631) @@ -1,2 +1 @@ cmake -jquery Modified: trunk/packages/orthanc-webviewer/trunk/debian/postrm =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/postrm 2015-12-04 12:25:32 UTC (rev 20630) +++ trunk/packages/orthanc-webviewer/trunk/debian/postrm 2015-12-04 16:42:50 UTC (rev 20631) @@ -4,10 +4,6 @@ case $1 in purge|remove|upgrade) - # Remove the content of the cache - rm -rf /var/lib/orthanc/db-v5/WebViewerCache/ - rm -rf /var/lib/orthanc/db-v6/WebViewerCache/ - # Restart the Orthanc service # https://www.debian.org/doc/debian-policy/ch-opersys.html#s9.3.3.2 if [ -x /etc/init.d/orthanc ]; then Added: trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides =================================================================== --- trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides (rev 0) +++ trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides 2015-12-04 16:42:50 UTC (rev 20631) @@ -0,0 +1,5 @@ +# The following files are wrongly interpreted as minimified +# JavaScript by lintian, which is not the case. +# cf. https://lists.debian.org/debian-med/2015/09/msg00135.html +orthanc-webviewer source: source-is-missing debian/JS/jsPanel-2.3.3/mobile-detect.js +orthanc-webviewer source: source-is-missing debian/JS/pako-0.2.5/pako_inflate.js _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit