[med-svn] r19487 - in trunk/packages/orthanc-webviewer/trunk/debian: . configuration patches
Sebastien Jodogne
jodogne-guest at moszumanska.debian.org
Fri Jul 3 12:54:39 UTC 2015
Author: jodogne-guest
Date: 2015-07-03 12:54:39 +0000 (Fri, 03 Jul 2015)
New Revision: 19487
Added:
trunk/packages/orthanc-webviewer/trunk/debian/configuration/webviewer.json
trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
Removed:
trunk/packages/orthanc-webviewer/trunk/debian/configuration/orthanc-webviewer.json
trunk/packages/orthanc-webviewer/trunk/debian/patches/javascript-libs
trunk/packages/orthanc-webviewer/trunk/debian/patches/shlibs
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/install
trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery
trunk/packages/orthanc-webviewer/trunk/debian/patches/series
trunk/packages/orthanc-webviewer/trunk/debian/postinst
trunk/packages/orthanc-webviewer/trunk/debian/watch
Log:
OrthancWebViewer 1.1
Modified: trunk/packages/orthanc-webviewer/trunk/debian/README.Debian
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/README.Debian 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/README.Debian 2015-07-03 12:54:39 UTC (rev 19487)
@@ -2,7 +2,7 @@
Neutral Archive for medical imaging. It extends Orthanc with an integrated
Web viewer of DICOM images.
-Homepage: https://code.google.com/p/orthanc-webviewer/
+Homepage: http://www.orthanc-server.com/static.php?page=web-viewer
The plugin is accessible from Orthanc Explorer, the built-in Web
interface of Orthanc. To open Orthanc Explorer with Mozilla Firefox,
Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1,3 +1,10 @@
+orthanc-webviewer (1.1-1) UNRELEASED; urgency=medium
+
+ * New upstream version.
+ * Fix of debian/copyright.
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Fri, 03 Jul 2015 13:42:36 +0200
+
orthanc-webviewer (1.0-1) unstable; urgency=low
* Initial release. (Closes: #779325)
Deleted: trunk/packages/orthanc-webviewer/trunk/debian/configuration/orthanc-webviewer.json
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/configuration/orthanc-webviewer.json 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/configuration/orthanc-webviewer.json 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1,22 +0,0 @@
-{
- /**
- * The following options can be added to the
- * "/etc/orthanc/orthanc.json" configuration file to control the
- * configuration of the Orthanc Web Viewer.
- **/
-
- "WebViewer" : {
-
- // The location of the cache of the Web viewer. By default, the
- // cache is located inside the storage directory of Orthanc.
- "CachePath" : "/tmp/WebViewerCache",
-
- // The maximum size for the cached images, in megabytes. By
- // default, a cache of 100 MB is used.
- "CacheSize" : 10,
-
- // The number of threads that are used by the plugin to decode the
- // DICOM images.
- "Threads" : 4
- }
-}
Copied: trunk/packages/orthanc-webviewer/trunk/debian/configuration/webviewer.json (from rev 19484, trunk/packages/orthanc-webviewer/trunk/debian/configuration/orthanc-webviewer.json)
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/configuration/webviewer.json (rev 0)
+++ trunk/packages/orthanc-webviewer/trunk/debian/configuration/webviewer.json 2015-07-03 12:54:39 UTC (rev 19487)
@@ -0,0 +1,26 @@
+{
+ /**
+ * The following options control the configuration of the Orthanc
+ * Web Viewer plugin.
+ **/
+
+ "WebViewer" : {
+ /**
+ * The location of the cache of the Web viewer. By default, the
+ * cache is located inside the storage directory of Orthanc.
+ **/
+ // "CachePath" : "/tmp/WebViewerCache",
+
+ /**
+ * The maximum size for the cached images, in megabytes. By
+ * default, a cache of 100 MB is used.
+ **/
+ // "CacheSize" : 10,
+
+ /**
+ * The number of threads that are used by the plugin to decode
+ * the DICOM images.
+ **/
+ // "Threads" : 4
+ }
+}
Modified: trunk/packages/orthanc-webviewer/trunk/debian/control
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/control 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/control 2015-07-03 12:54:39 UTC (rev 19487)
@@ -18,16 +18,16 @@
libjsoncpp-dev,
libpng-dev,
libsqlite3-dev,
- orthanc-dev,
+ orthanc-dev (>= 0.9.1),
uuid-dev,
zlib1g-dev
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-webviewer/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-webviewer/trunk/
-Homepage: https://code.google.com/p/orthanc-webviewer/
+Homepage: http://www.orthanc-server.com/static.php?page=web-viewer
Package: orthanc-webviewer
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.8.6)
+Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.1)
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-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-07-03 12:54:39 UTC (rev 19487)
@@ -11,17 +11,47 @@
Copyright: 2012-2015 Sebastien Jodogne <s.jodogne at gmail.com>, University Hospital of Liege, Belgium
License: GPL-3 with OpenSSL exception
-Files: Resources/ThirdParty/base64/*
+Files: Orthanc/Resources/ThirdParty/base64/*
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
+
+Files: Orthanc/Resources/ThirdParty/VisualStudio/*
+Copyright: 2006-2008 Alexander Chemeris
+License: BSD-3-clause
+
Files: WebApplication/jpeg-decoder.js
Copyright: 2011 notmasteryet
-License: Apache
+License: Apache-2
+Files: debian/JS/cornerstone-0.7.1/*
+Copyright: 2014 Chris Hafey <chafey at gmail.com>
+License: MIT
+Files: debian/JS/jsPanel-2.3.3/*
+Copyright: 2014 Stefan Sträßer
+License: MIT
+Files: debian/JS/jsPanel-2.3.3/jquery.ui.touch-punch.js
+Copyright: 2011-2014 Dave Furfero
+License: MIT or GPL-2
+Files: debian/JS/js-url-1.8.6/*
+Copyright: 2011-2012 Websanova
+License: MIT
+
+Files: debian/JS/pako-0.2.5/*
+Copyright: 2014 Vitaly Puzrin
+License: MIT
+
+
License: AGPL-3
This program is free software: you can redistribute it and/or
modify it under the terms of the GNU Affero General Public License
@@ -38,6 +68,27 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+
License: GPL-3 with OpenSSL exception
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -91,7 +142,7 @@
distribution.
-License: Apache
+License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -103,3 +154,54 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License for the specific language governing
permissions and limitations under the License.
+
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ * The name of the autors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
Modified: trunk/packages/orthanc-webviewer/trunk/debian/install
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/install 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/install 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1 +1 @@
-debian/configuration/orthanc-webviewer.json etc/orthanc
+debian/configuration/webviewer.json etc/orthanc
Added: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake (rev 0)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2015-07-03 12:54:39 UTC (rev 19487)
@@ -0,0 +1,36 @@
+Description: Fix the linking of the shared library and the inclusion of the JavaScript libraries
+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
+===================================================================
+--- OrthancWebViewer-1.1.orig/CMakeLists.txt
++++ OrthancWebViewer-1.1/CMakeLists.txt
+@@ -59,7 +59,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso
+
+ 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
+@@ -173,15 +173,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
+ add_dependencies(OrthancWebViewer GDCM)
+ endif()
+
+-target_link_libraries(OrthancWebViewer ${GDCM_LIBRARIES})
+-
+ message("Setting the version of the library to ${ORTHANC_WEBVIEWER_VERSION}")
+
+ add_definitions(-DORTHANC_WEBVIEWER_VERSION="${ORTHANC_WEBVIEWER_VERSION}")
+
+ set_target_properties(OrthancWebViewer PROPERTIES
+- VERSION ${ORTHANC_WEBVIEWER_VERSION}
+- SOVERSION ${ORTHANC_WEBVIEWER_VERSION})
++ NO_SONAME ON
++ LINK_FLAGS "-lgdcmDSED -lgdcmMSFF -luuid -Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}"
++ )
+
+ install(
+ TARGETS OrthancWebViewer
Deleted: trunk/packages/orthanc-webviewer/trunk/debian/patches/javascript-libs
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/javascript-libs 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/javascript-libs 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1,18 +0,0 @@
-Description: Patch to manually provide the JavaScript libraries
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-1.0/CMakeLists.txt
-===================================================================
---- OrthancWebViewer-1.0.orig/CMakeLists.txt 2015-02-27 12:59:40.000000000 +0100
-+++ OrthancWebViewer-1.0/CMakeLists.txt 2015-03-02 10:55:22.463574790 +0100
-@@ -80,7 +80,8 @@
- include(${CMAKE_SOURCE_DIR}/Resources/CMake/ZlibConfiguration.cmake)
- include(${CMAKE_SOURCE_DIR}/Resources/CMake/SQLiteConfiguration.cmake)
-
--include(${CMAKE_SOURCE_DIR}/Resources/CMake/JavaScriptLibraries.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
Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/jquery 2015-07-03 12:54:39 UTC (rev 19487)
@@ -2,14 +2,15 @@
Author: Sebastien Jodogne <s.jodogne at gmail.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-1.0/WebApplication/viewer.js
+Index: OrthancWebViewer-1.1/WebApplication/viewer.js
===================================================================
---- OrthancWebViewer-1.0.orig/WebApplication/viewer.js
-+++ OrthancWebViewer-1.0/WebApplication/viewer.js
-@@ -363,15 +363,10 @@ $(document).ready(function() {
+--- OrthancWebViewer-1.1.orig/WebApplication/viewer.js
++++ OrthancWebViewer-1.1/WebApplication/viewer.js
+@@ -362,16 +362,11 @@ $(document).ready(function() {
+ async: false,
success: function(volume) {
if (volume.SortedInstances.length != 0) {
- instances = volume.SortedInstances;
+- instances = volume.SortedInstances;
- $('#topright').html([
- $('<span>').text(volume.PatientID),
- $('<br>'),
@@ -19,10 +20,11 @@
- $('<br>'),
- $('<span>').text(volume.SeriesDescription)
- ]);
-+ $('#topright').html(volume.PatientID + '<br/>' +
-+ volume.PatientName + '<br/>' +
-+ volume.StudyDescription + '<br/>' +
-+ volume.SeriesDescription + '<br/>');
++ instances = volume.SortedInstances;
++ $('#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-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/series 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1,3 +1,2 @@
-javascript-libs
+cmake
jquery
-shlibs
Deleted: trunk/packages/orthanc-webviewer/trunk/debian/patches/shlibs
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/shlibs 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/shlibs 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1,25 +0,0 @@
-Description: Fix the linking of the shared library
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-1.0/CMakeLists.txt
-===================================================================
---- OrthancWebViewer-1.0.orig/CMakeLists.txt
-+++ OrthancWebViewer-1.0/CMakeLists.txt
-@@ -180,12 +180,13 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
- add_dependencies(OrthancWebViewer GDCM)
- endif()
-
--target_link_libraries(OrthancWebViewer ${GDCM_LIBRARIES} ${OS_LIBRARIES})
-+#target_link_libraries(OrthancWebViewer ${GDCM_LIBRARIES} ${OS_LIBRARIES})
-
- message("Setting the version of the library to ${ORTHANC_WEBVIEWER_VERSION}")
- set_target_properties(OrthancWebViewer PROPERTIES
-- VERSION ${ORTHANC_WEBVIEWER_VERSION}
-- SOVERSION ${ORTHANC_WEBVIEWER_VERSION})
-+ NO_SONAME ON
-+ LINK_FLAGS "-lgdcmDSED -lgdcmMSFF -luuid -Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}"
-+ )
-
- install(
- TARGETS OrthancWebViewer
Modified: trunk/packages/orthanc-webviewer/trunk/debian/postinst
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/postinst 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/postinst 2015-07-03 12:54:39 UTC (rev 19487)
@@ -4,6 +4,10 @@
case $1 in
configure)
+ # Configure the permissions of the configuration file
+ chown -R orthanc:orthanc /etc/orthanc/webviewer.json
+ chmod 0664 /etc/orthanc/webviewer.json
+
# 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
Modified: trunk/packages/orthanc-webviewer/trunk/debian/watch
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/watch 2015-07-03 11:54:42 UTC (rev 19486)
+++ trunk/packages/orthanc-webviewer/trunk/debian/watch 2015-07-03 12:54:39 UTC (rev 19487)
@@ -1,2 +1,3 @@
version=3
-https://github.com/jodogne/Orthanc/releases .*/download/[^/]+/OrthancWebViewer-(\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=/plugin-webviewer downloads/get\.php\?path=/plugin-webviewer/OrthancWebViewer-(\d\S*)\.tar\.gz
More information about the debian-med-commit
mailing list