[med-svn] r19816 - in trunk/packages/orthanc-webviewer/trunk/debian: . patches

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-08-03 08:01:02 +0000 (Mon, 03 Aug 2015)
New Revision: 19816

Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/changelog
   trunk/packages/orthanc-webviewer/trunk/debian/copyright
   trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
   trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery
Log:
Orthanc WebViewer 1.2

Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog	2015-08-03 07:47:37 UTC (rev 19815)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog	2015-08-03 08:01:02 UTC (rev 19816)
@@ -1,3 +1,9 @@
+orthanc-webviewer (1.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Mon, 03 Aug 2015 09:49:56 +0200
+
 orthanc-webviewer (1.1-1) unstable; urgency=medium
 
   * Initial release. (Closes: #779325)

Modified: trunk/packages/orthanc-webviewer/trunk/debian/copyright
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/copyright	2015-08-03 07:47:37 UTC (rev 19815)
+++ trunk/packages/orthanc-webviewer/trunk/debian/copyright	2015-08-03 08:01:02 UTC (rev 19816)
@@ -15,10 +15,6 @@
 Copyright: 2004-2008 Rene Nyffenegger
 License: zlib
 
-Files: Orthanc/Resources/ThirdParty/md5/*
-Copyright: 1999, 2002 Aladdin Enterprises
-License: zlib
-
 Files: Orthanc/Resources/ThirdParty/minizip/*
 Copyright: 1998-2010 Gilles Vollant, and 2009-2010 Mathias Svensson
 License: zlib

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake	2015-08-03 07:47:37 UTC (rev 19815)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake	2015-08-03 08:01:02 UTC (rev 19816)
@@ -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: OrthancWebViewer-1.1/CMakeLists.txt
+Index: OrthancWebViewer-1.2/CMakeLists.txt
 ===================================================================
---- OrthancWebViewer-1.1.orig/CMakeLists.txt
-+++ OrthancWebViewer-1.1/CMakeLists.txt
+--- OrthancWebViewer-1.2.orig/CMakeLists.txt
++++ OrthancWebViewer-1.2/CMakeLists.txt
 @@ -59,7 +59,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso
  
  include(${CMAKE_SOURCE_DIR}/Resources/CMake/GdcmConfiguration.cmake)
@@ -15,7 +15,7 @@
  
  
  # Check that the Orthanc SDK headers are available or download them
-@@ -173,15 +173,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
+@@ -190,15 +190,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
    add_dependencies(OrthancWebViewer GDCM)
  endif()
  

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery	2015-08-03 07:47:37 UTC (rev 19815)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery	2015-08-03 08:01:02 UTC (rev 19816)
@@ -2,15 +2,14 @@
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-1.1/WebApplication/viewer.js
+Index: OrthancWebViewer-1.2/WebApplication/viewer.js
 ===================================================================
---- OrthancWebViewer-1.1.orig/WebApplication/viewer.js
-+++ OrthancWebViewer-1.1/WebApplication/viewer.js
-@@ -362,16 +362,11 @@ $(document).ready(function() {
-     async: false,
+--- 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;
+         instances = volume.SortedInstances;
 -        $('#topright').html([
 -          $('<span>').text(volume.PatientID),
 -          $('<br>'),
@@ -20,8 +19,7 @@
 -          $('<br>'),
 -          $('<span>').text(volume.SeriesDescription)
 -        ]);
-+          instances = volume.SortedInstances;
-+	  $('#topright').html(volume.PatientID + '<br/>' +
++        $('#topright').html(volume.PatientID + '<br/>' +
 +                            volume.PatientName + '<br/>' +
 +                            volume.StudyDescription + '<br/>' +
 +                            volume.SeriesDescription + '<br/>');