from:"Sebastien Jodogne"

[med-svn] r19825 - trunk/packages/orthanc/trunk/debian

2015-08-03 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-03 13:56:35 + (Mon, 03 Aug 2015)
New Revision: 19825

Modified:
   trunk/packages/orthanc/trunk/debian/control
Log:
fix build

Modified: trunk/packages/orthanc/trunk/debian/control
===
--- trunk/packages/orthanc/trunk/debian/control 2015-08-03 10:38:16 UTC (rev 
19824)
+++ trunk/packages/orthanc/trunk/debian/control 2015-08-03 13:56:35 UTC (rev 
19825)
@@ -8,26 +8,26 @@
 Homepage: http://www.orthanc-server.com/
 Build-Depends: cmake (= 2.8),
debhelper (= 9),
+   doxygen,
initscripts (= 2.88dsf-13.3),
-   libboost-all-dev (= 1.54.0-5),
+   libboost-all-dev | libboost1.58-all-dev,
libcharls-dev,
libcurl4-openssl-dev | libcurl4-dev,
libdcmtk2-dev,
libgoogle-glog-dev (= 0.3.3),
libgtest-dev (= 1.6.0),
+   libjs-jquery (= 1.7.2),
libjsoncpp-dev,
liblua5.1-0-dev (= 5.1.0),
+   libpng-dev,
libpugixml-dev,
-   libpng-dev,
libsqlite3-dev,
libssl-dev,
libwrap0-dev,
+   unzip,
uuid-dev,
zlib1g-dev,
-  doxygen,
-   unzip,
-  libjs-jquery (= 1.7.2),
-  yui-compressor
+   yui-compressor
 Vcs-Browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/orthanc/trunk/
 


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19779 - trunk/packages/orthanc-imagej/trunk/debian

2015-07-30 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-07-30 08:25:50 + (Thu, 30 Jul 2015)
New Revision: 19779

Modified:
   trunk/packages/orthanc-imagej/trunk/debian/README.Debian
   trunk/packages/orthanc-imagej/trunk/debian/changelog
   trunk/packages/orthanc-imagej/trunk/debian/control
   trunk/packages/orthanc-imagej/trunk/debian/copyright
   trunk/packages/orthanc-imagej/trunk/debian/watch
Log:
Updated URLs to the project, the code repository and the downloads

Modified: trunk/packages/orthanc-imagej/trunk/debian/README.Debian
===
--- trunk/packages/orthanc-imagej/trunk/debian/README.Debian2015-07-30 
07:18:49 UTC (rev 19778)
+++ trunk/packages/orthanc-imagej/trunk/debian/README.Debian2015-07-30 
08:25:50 UTC (rev 19779)
@@ -1,7 +1,7 @@
 This is a plugin for ImageJ to browse and download the content of an
 Orthanc server.
 
-Homepage: https://code.google.com/p/orthanc-imagej/
+Homepage: http://www.orthanc-server.com/static.php?page=imagej
 
 The plugin is accessible from the File - Import - Orthanc menu
 entry in ImageJ.

Modified: trunk/packages/orthanc-imagej/trunk/debian/changelog
===
--- trunk/packages/orthanc-imagej/trunk/debian/changelog2015-07-30 
07:18:49 UTC (rev 19778)
+++ trunk/packages/orthanc-imagej/trunk/debian/changelog2015-07-30 
08:25:50 UTC (rev 19779)
@@ -1,3 +1,9 @@
+orthanc-imagej (1.0.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Updated URLs to the project, the code repository and the downloads
+
+ -- Sebastien Jodogne s.jodo...@gmail.com  Thu, 30 Jul 2015 10:19:28 +0200
+
 orthanc-imagej (1.0.0+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #772561)

Modified: trunk/packages/orthanc-imagej/trunk/debian/control
===
--- trunk/packages/orthanc-imagej/trunk/debian/control  2015-07-30 07:18:49 UTC 
(rev 19778)
+++ trunk/packages/orthanc-imagej/trunk/debian/control  2015-07-30 08:25:50 UTC 
(rev 19779)
@@ -12,7 +12,7 @@
libjson-simple-java
 Vcs-Browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-imagej/trunk/
 Vcs-Svn: 
svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-imagej/trunk/
-Homepage: https://code.google.com/p/orthanc-imagej/
+Homepage: http://www.orthanc-server.com/static.php?page=imagej
 
 Package: orthanc-imagej
 Architecture: all

Modified: trunk/packages/orthanc-imagej/trunk/debian/copyright
===
--- trunk/packages/orthanc-imagej/trunk/debian/copyright2015-07-30 
07:18:49 UTC (rev 19778)
+++ trunk/packages/orthanc-imagej/trunk/debian/copyright2015-07-30 
08:25:50 UTC (rev 19779)
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OrthancImageJ
 Upstream-Contact: Sebastien Jodogne s.jodo...@gmail.com
-Source: https://code.google.com/p/orthanc-imagej/
+Source: https://bitbucket.org/sjodogne/orthanc-imagej/
 Files-Excluded: org/*
 
 Files: *

Modified: trunk/packages/orthanc-imagej/trunk/debian/watch
===
--- trunk/packages/orthanc-imagej/trunk/debian/watch2015-07-30 07:18:49 UTC 
(rev 19778)
+++ trunk/packages/orthanc-imagej/trunk/debian/watch2015-07-30 08:25:50 UTC 
(rev 19779)
@@ -1,3 +1,3 @@
 version=3
-opts=repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g \
-https://github.com/jodogne/Orthanc/releases 
.*/download/[^/]+/OrthancImageJ-(\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=/imagej 
downloads/get\.php\?path=/imagej/OrthancImageJ-(\d\S*)\.tar\.gz


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19781 - trunk/packages/orthanc-postgresql/trunk/debian

2015-07-30 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-07-30 08:29:17 + (Thu, 30 Jul 2015)
New Revision: 19781

Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
   trunk/packages/orthanc-postgresql/trunk/debian/copyright
Log:
Updated URLs to the code repository and to the project

Modified: trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
===
--- trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
2015-07-30 08:27:35 UTC (rev 19780)
+++ trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
2015-07-30 08:29:17 UTC (rev 19781)
@@ -7,7 +7,7 @@
 back-end. They bring scalability to Orthanc, making it
 enterprise-ready.
 
-Homepage: https://code.google.com/p/orthanc-postgresql/
+Homepage: http://www.orthanc-server.com/static.php?page=postgresql
 
 
 Configuration

Modified: trunk/packages/orthanc-postgresql/trunk/debian/copyright
===
--- trunk/packages/orthanc-postgresql/trunk/debian/copyright2015-07-30 
08:27:35 UTC (rev 19780)
+++ trunk/packages/orthanc-postgresql/trunk/debian/copyright2015-07-30 
08:29:17 UTC (rev 19781)
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OrthancPostgreSQL
 Upstream-Contact: Sebastien Jodogne s.jodo...@gmail.com
-Source: https://code.google.com/p/orthanc-postgresql/
+Source: https://bitbucket.org/sjodogne/orthanc-postgresql
 
 Files: *
 Copyright: 2012-2015 Sebastien Jodogne s.jodo...@gmail.com, University 
Hospital of Liege, Belgium


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19780 - trunk/packages/orthanc-webviewer/trunk/debian

2015-07-30 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-07-30 08:27:35 + (Thu, 30 Jul 2015)
New Revision: 19780

Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/copyright
Log:
Updated URLs to the code repository

Modified: trunk/packages/orthanc-webviewer/trunk/debian/copyright
===
--- trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-07-30 
08:25:50 UTC (rev 19779)
+++ trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-07-30 
08:27:35 UTC (rev 19780)
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OrthancWebViewer
 Upstream-Contact: Sebastien Jodogne s.jodo...@gmail.com
-Source: https://code.google.com/p/orthanc-webviewer/
+Source: https://bitbucket.org/sjodogne/orthanc-webviewer/
 
 Files: *
 Copyright: 2012-2015 Sebastien Jodogne s.jodo...@gmail.com, University 
Hospital of Liege, Belgium


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19782 - trunk/packages/orthanc/trunk/debian

2015-07-30 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-07-30 08:33:58 + (Thu, 30 Jul 2015)
New Revision: 19782

Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/copyright
Log:
Updated URL to the code repository

Modified: trunk/packages/orthanc/trunk/debian/changelog
===
--- trunk/packages/orthanc/trunk/debian/changelog   2015-07-30 08:29:17 UTC 
(rev 19781)
+++ trunk/packages/orthanc/trunk/debian/changelog   2015-07-30 08:33:58 UTC 
(rev 19782)
@@ -1,3 +1,9 @@
+orthanc (0.9.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Updated URL to the code repository
+
+ -- Sebastien Jodogne s.jodo...@gmail.com  Thu, 30 Jul 2015 10:31:52 +0200
+
 orthanc (0.9.1+dfsg-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/orthanc/trunk/debian/copyright
===
--- trunk/packages/orthanc/trunk/debian/copyright   2015-07-30 08:29:17 UTC 
(rev 19781)
+++ trunk/packages/orthanc/trunk/debian/copyright   2015-07-30 08:33:58 UTC 
(rev 19782)
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Orthanc
 Upstream-Contact: Sebastien Jodogne s.jodo...@gmail.com
-Source: https://code.google.com/p/orthanc/
+Source: https://bitbucket.org/sjodogne/orthanc/
 Files-Excluded:
OrthancExplorer/libs/date.js
OrthancExplorer/libs/images/ajax-loader.*


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19783 - trunk/packages/orthanc-postgresql/trunk/debian

2015-07-30 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-07-30 11:27:10 + (Thu, 30 Jul 2015)
New Revision: 19783

Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/copyright
Log:
preparation for next release

Modified: trunk/packages/orthanc-postgresql/trunk/debian/copyright
===
--- trunk/packages/orthanc-postgresql/trunk/debian/copyright2015-07-30 
08:33:58 UTC (rev 19782)
+++ trunk/packages/orthanc-postgresql/trunk/debian/copyright2015-07-30 
11:27:10 UTC (rev 19783)
@@ -7,8 +7,12 @@
 Copyright: 2012-2015 Sebastien Jodogne s.jodo...@gmail.com, University 
Hospital of Liege, Belgium
 License: AGPL-3
 
+Files: Orthanc/*
+Copyright: 2012-2015 Sebastien Jodogne s.jodo...@gmail.com, University 
Hospital of Liege, Belgium
+License: GPL-3 with OpenSSL exception
 
 
+
 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
@@ -23,3 +27,35 @@
  You should have received a copy of the GNU Affero General Public License
  along with this package; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+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
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+ .
+ In addition, as a special exception, the copyright holders of this
+ program give permission to link the code of its release with the
+ OpenSSL project's OpenSSL library (or with modified versions of it
+ that use the same license as the OpenSSL library), and distribute
+ the linked executables. You must obey the GNU General Public License
+ in all respects for all of the code used other than OpenSSL. If you
+ modify file(s) with this exception, you may extend this exception to
+ your version of the file(s), but you are not obligated to do so. If
+ you do not wish to do so, delete this exception statement from your
+ version. If you delete this exception statement from all source files
+ in the program, then also delete it here.
+ .
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19855 - trunk/packages/gdcm/trunk/debian/patches

2015-08-06 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-06 10:23:35 + (Thu, 06 Aug 2015)
New Revision: 19855

Modified:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
fix in patch

Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
08:56:22 UTC (rev 19854)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
10:23:35 UTC (rev 19855)
@@ -11,12 +11,12 @@
COMMAND ${gccxml_EXECUTABLE}
ARGS
 --fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
---fxml-start=_cable_
-+--castxml-start=_cable_
- ${gccxml_include_args} -DCABLE_CONFIGURATION
+ -fxml-start=_cable_
+-${gccxml_include_args} -DCABLE_CONFIGURATION
 ---gccxml-compiler ${gccxml_compiler}
++#${gccxml_include_args} -DCABLE_CONFIGURATION
  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
-+  -Wno-deprecated
++-Wno-deprecated
 +-fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
DEPENDS
  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19856 - trunk/packages/gdcm/trunk/debian/patches

2015-08-06 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-06 10:27:12 + (Thu, 06 Aug 2015)
New Revision: 19856

Modified:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
fix in patch

Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
10:23:35 UTC (rev 19855)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
10:27:12 UTC (rev 19856)
@@ -6,15 +6,15 @@
 ===
 --- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
 +++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-@@ -411,11 +411,11 @@ if(GDCM_WRAP_CSHARP)
+@@ -411,11 +411,12 @@ if(GDCM_WRAP_CSHARP)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
COMMAND ${gccxml_EXECUTABLE}
ARGS
 --fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
  -fxml-start=_cable_
--${gccxml_include_args} -DCABLE_CONFIGURATION
+ ${gccxml_include_args} -DCABLE_CONFIGURATION
 ---gccxml-compiler ${gccxml_compiler}
-+#${gccxml_include_args} -DCABLE_CONFIGURATION
++#--gccxml-compiler ${gccxml_compiler}
  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
 +-Wno-deprecated
 +-fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19868 - trunk/packages/gdcm/trunk/debian

2015-08-07 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-07 08:17:42 + (Fri, 07 Aug 2015)
New Revision: 19868

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/control
   trunk/packages/gdcm/trunk/debian/control.in
Log:
switch to my private gmail address

Modified: trunk/packages/gdcm/trunk/debian/changelog
===
--- trunk/packages/gdcm/trunk/debian/changelog  2015-08-07 07:37:31 UTC (rev 
19867)
+++ trunk/packages/gdcm/trunk/debian/changelog  2015-08-07 08:17:42 UTC (rev 
19868)
@@ -2,13 +2,13 @@
 
   [ Andreas Tille ]
   * Standard-Version: 3.9.6
-  * Add Sébastien Jodogne s.jodo...@chu.ulg.ac.be as Uploader
+  * Add Sébastien Jodogne s.jodo...@gmail.com as Uploader
 
   [ Sébastien Jodogne ]
   * Build-Depends: castxml instead of gccxml
 Closes: #777868, #791508
 
- -- Sébastien Jodogne s.jodo...@chu.ulg.ac.be  Fri, 07 Aug 2015 08:56:02 
+0200
+ -- Sébastien Jodogne s.jodo...@gmail.com  Fri, 07 Aug 2015 08:56:02 +0200
 
 gdcm (2.4.4-3) unstable; urgency=medium
 

Modified: trunk/packages/gdcm/trunk/debian/control
===
--- trunk/packages/gdcm/trunk/debian/control2015-08-07 07:37:31 UTC (rev 
19867)
+++ trunk/packages/gdcm/trunk/debian/control2015-08-07 08:17:42 UTC (rev 
19868)
@@ -4,7 +4,7 @@
 Maintainer: Debian Med Packaging Team 
debian-med-packag...@lists.alioth.debian.org
 Uploaders: Andreas Tille ti...@debian.org,
  Steve M. Robbins s...@debian.org,
- Sébastien Jodogne s.jodo...@chu.ulg.ac.be
+ Sébastien Jodogne s.jodo...@gmail.com
 Build-Depends: debhelper (= 9), python-all-dev, libvtk-java, pvrg-jpeg,
  uuid-dev, libz-dev, libexpat-dev, doxygen,
  swig (= 2.0.7), cmake (= 2.8.9), libvtk5-dev, libcharls-dev, javahelper,

Modified: trunk/packages/gdcm/trunk/debian/control.in
===
--- trunk/packages/gdcm/trunk/debian/control.in 2015-08-07 07:37:31 UTC (rev 
19867)
+++ trunk/packages/gdcm/trunk/debian/control.in 2015-08-07 08:17:42 UTC (rev 
19868)
@@ -4,7 +4,7 @@
 Maintainer: Debian Med Packaging Team 
debian-med-packag...@lists.alioth.debian.org
 Uploaders: Andreas Tille ti...@debian.org,
  Steve M. Robbins s...@debian.org,
- Sébastien Jodogne s.jodo...@chu.ulg.ac.be
+ Sébastien Jodogne s.jodo...@gmail.com
 Build-Depends: debhelper (= 9), python-all-dev, libvtk-java, pvrg-jpeg,
  uuid-dev, libz-dev, libexpat-dev, doxygen,
  swig (= 2.0.7), cmake (= 2.8.9), libvtk5-dev, libcharls-dev, javahelper,


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19866 - trunk/packages/gdcm/trunk/debian/patches

2015-08-07 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-07 07:35:27 + (Fri, 07 Aug 2015)
New Revision: 19866

Modified:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
fix in the arguments to castxml

Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-07 
06:30:41 UTC (rev 19865)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-07 
07:35:27 UTC (rev 19866)
@@ -1,10 +1,12 @@
-Description: Replace gccxml with its castxml wrapper
-Author: Sebastien Jodogne s.jodo...@gmail.com
+Description: Replace gccxml with castxml
+Author: Sebastien Jodogne s.jodo...@gmail.com, Steve Robbins 
st...@sumost.ca
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
+===
 --- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
 +++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-@@ -317,24 +317,16 @@
+@@ -317,24 +317,16 @@ if(GDCM_WRAP_CSHARP)
message(FATAL_ERROR error: mummy not found. 
mummy_EXECUTABLE='${mummy_EXECUTABLE}')
  endif()
  
@@ -36,7 +38,7 @@
  endforeach()
  configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/MummySettings.xml.in
-@@ -409,17 +401,28 @@
+@@ -409,17 +401,28 @@ if(GDCM_WRAP_CSHARP)
  
  add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
@@ -49,7 +51,7 @@
 ---gccxml-compiler ${gccxml_compiler}
 +  --castxml-gccxml
 +-o ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+--castxml-start=_cable_
++--castxml-start _cable_
 +${castxml_include_args} -DCABLE_CONFIGURATION
  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
 +  # Remove the Converter and Destructor XML tags that are


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

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

2015-08-07 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-07 18:10:20 + (Fri, 07 Aug 2015)
New Revision: 19877

Removed:
   trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/glog-0.3.2.tar.gz
   trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/copyright
   trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
   trunk/packages/orthanc/trunk/debian/patches/series
   trunk/packages/orthanc/trunk/debian/rules
   trunk/packages/orthanc/trunk/debian/source/include-binaries
Log:
Orthanc 0.9.3

Deleted: 
trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/glog-0.3.2.tar.gz
===
(Binary files differ)

Modified: trunk/packages/orthanc/trunk/debian/changelog
===
--- trunk/packages/orthanc/trunk/debian/changelog   2015-08-07 15:41:46 UTC 
(rev 19876)
+++ trunk/packages/orthanc/trunk/debian/changelog   2015-08-07 18:10:20 UTC 
(rev 19877)
@@ -1,9 +1,11 @@
-orthanc (0.9.2+dfsg-1) UNRELEASED; urgency=medium
+orthanc (0.9.3+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Sebastien Jodogne ]
   * New upstream version
   * Updated URL to the code repository
+  * Removal dependency over google-glog
 
- -- Sebastien Jodogne s.jodo...@gmail.com  Mon, 03 Aug 2015 08:58:38 +0200
+ -- Sebastien Jodogne s.jodo...@gmail.com  Fri, 07 Aug 2015 19:34:30 +0200
 
 orthanc (0.9.1+dfsg-1) unstable; urgency=medium
 

Modified: trunk/packages/orthanc/trunk/debian/copyright
===
--- trunk/packages/orthanc/trunk/debian/copyright   2015-08-07 15:41:46 UTC 
(rev 19876)
+++ trunk/packages/orthanc/trunk/debian/copyright   2015-08-07 18:10:20 UTC 
(rev 19877)
@@ -4,10 +4,11 @@
 Source: https://bitbucket.org/sjodogne/orthanc/
 Files-Excluded:
OrthancExplorer/libs/date.js
-   OrthancExplorer/libs/images/ajax-loader.*
+   OrthancExplorer/libs/images/ajax-loader*
OrthancExplorer/libs/images/icons-*
-   OrthancExplorer/libs/jquery-1.7.2*
-   OrthancExplorer/libs/jquery.mobile*1.1.0* 
+   OrthancExplorer/libs/jquery.min.js
+   OrthancExplorer/libs/jquery.mobile.min.css
+   OrthancExplorer/libs/jquery.mobile.min.js
 
 Files: *
 Copyright: 2012-2015 CHU of Liege (Belgium), and Sebastien Jodogne 
s.jodo...@gmail.com

Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1  2015-08-07 15:41:46 UTC 
(rev 19876)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1  2015-08-07 18:10:20 UTC 
(rev 19877)
@@ -1,5 +1,5 @@
 .\ DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.1.
-.TH ORTHANC 1 August 2015 Orthanc 0.9.2 User Commands
+.TH ORTHANC 1 August 2015 Orthanc 0.9.3 User Commands
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical 
research
 .SH SYNOPSIS

Deleted: trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
===
--- trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version   
2015-08-07 15:41:46 UTC (rev 19876)
+++ trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version   
2015-08-07 18:10:20 UTC (rev 19877)
@@ -1,27 +0,0 @@
-Description: Remove the jQuery and jQuery Mobile versions from Orthanc Explorer
-Author: Sebastien Jodogne s.jodo...@gmail.com

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.9.2/OrthancExplorer/explorer.html
-===
 Orthanc-0.9.2.orig/OrthancExplorer/explorer.html
-+++ Orthanc-0.9.2/OrthancExplorer/explorer.html
-@@ -6,15 +6,15 @@
- meta name=viewport content=width=device-width, initial-scale=1
- titleOrthanc Explorer/title
- 
--link rel=stylesheet href=libs/jquery.mobile-1.1.0.min.css /
-+link rel=stylesheet href=libs/jquery.mobile.min.css /
- link rel=stylesheet href=libs/jqtree.css /
- link rel=stylesheet href=libs/jquery.mobile.simpledialog.min.css /
- link rel=stylesheet href=libs/jquery-file-upload/css/style.css /
- link rel=stylesheet 
href=libs/jquery-file-upload/css/jquery.fileupload-ui.css /
- link rel=stylesheet href=libs/slimbox2/slimbox2.css /
- 
--script src=libs/jquery-1.7.2.min.js/script
--script src=libs/jquery.mobile-1.1.0.min.js/script
-+script src=libs/jquery.min.js/script
-+script src=libs/jquery.mobile.min.js/script
- script src=libs/jqm.page.params.js/script
- script src=libs/tree.jquery.js/script
- script src=libs/date.js/script

Modified: trunk/packages/orthanc/trunk/debian/patches/series
===
--- trunk/packages/orthanc/trunk/debian/patches/series  2015-08-07 15:41:46

[med-svn] r19878 - trunk/packages/orthanc/trunk/debian

2015-08-07 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-07 18:46:51 + (Fri, 07 Aug 2015)
New Revision: 19878

Modified:
   trunk/packages/orthanc/trunk/debian/control
Log:
minor improvement

Modified: trunk/packages/orthanc/trunk/debian/control
===
--- trunk/packages/orthanc/trunk/debian/control 2015-08-07 18:10:20 UTC (rev 
19877)
+++ trunk/packages/orthanc/trunk/debian/control 2015-08-07 18:46:51 UTC (rev 
19878)
@@ -10,7 +10,7 @@
debhelper (= 9),
doxygen,
initscripts (= 2.88dsf-13.3),
-   libboost-all-dev | libboost1.58-all-dev,
+   libboost-all-dev,
libcharls-dev,
libcurl4-openssl-dev | libcurl4-dev,
libdcmtk2-dev,


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19887 - trunk/packages/orthanc-webviewer/trunk/debian

2015-08-08 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-08 07:59:25 + (Sat, 08 Aug 2015)
New Revision: 19887

Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/control
Log:
minor improvement

Modified: trunk/packages/orthanc-webviewer/trunk/debian/control
===
--- trunk/packages/orthanc-webviewer/trunk/debian/control   2015-08-08 
07:00:13 UTC (rev 19886)
+++ trunk/packages/orthanc-webviewer/trunk/debian/control   2015-08-08 
07:59:25 UTC (rev 19887)
@@ -7,7 +7,7 @@
 Standards-Version: 3.9.6
 Build-Depends: cmake (= 2.8),
debhelper (= 9),
-   libboost-all-dev | libboost1.58-all-dev,
+   libboost-all-dev,
libgdcm2-dev,
libgtest-dev (= 1.6.0),
libjpeg-dev,


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19888 - in trunk/packages/orthanc-dicomweb/trunk/debian: . patches

2015-08-08 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-08 08:30:48 + (Sat, 08 Aug 2015)
New Revision: 19888

Modified:
   trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian
   trunk/packages/orthanc-dicomweb/trunk/debian/control
   trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake
Log:
Fix remaining issues

Modified: trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian
===
--- trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian  2015-08-08 
07:59:25 UTC (rev 19887)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian  2015-08-08 
08:30:48 UTC (rev 19888)
@@ -1,6 +1,7 @@
-Orthanc DICOMweb is a plugin to Orthanc, the lightweight, RESTful Vendor
-Neutral Archive for medical imaging. It extends the Orthanc core with
-support of the WADO and DICOMweb (QIDO-RS, STOW-RS, WADO-RS) standards.
+Orthanc DICOMweb is a plugin to Orthanc, the lightweight, RESTful
+Vendor Neutral Archive for medical imaging. It extends the Orthanc
+core with support of the WADO (now known as WADO-URI) and DICOMweb
+(QIDO-RS, STOW-RS, WADO-RS) standards.
 
 Homepage: http://www.orthanc-server.com/static.php?page=dicomweb
 

Modified: trunk/packages/orthanc-dicomweb/trunk/debian/control
===
--- trunk/packages/orthanc-dicomweb/trunk/debian/control2015-08-08 
07:59:25 UTC (rev 19887)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/control2015-08-08 
08:30:48 UTC (rev 19888)
@@ -7,7 +7,7 @@
 Standards-Version: 3.9.6
 Build-Depends: cmake (= 2.8),
debhelper (= 9),
-   libboost-all-dev | libboost1.58-all-dev,
+   libboost-all-dev,
libgdcm2-dev,
libgtest-dev (= 1.6.0),
libjpeg-dev,

Modified: trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake
===
--- trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake  2015-08-08 
07:59:25 UTC (rev 19887)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake  2015-08-08 
08:30:48 UTC (rev 19888)
@@ -6,8 +6,23 @@
 ===
 --- OrthancDicomWeb-0.1.orig/CMakeLists.txt
 +++ OrthancDicomWeb-0.1/CMakeLists.txt
-@@ -147,9 +147,9 @@ message(Setting the version of the libr
+@@ -48,7 +48,7 @@ include(CheckIncludeFileCXX)
+ include(CheckLibraryExists)
+ include(FindPythonInterp)
+ include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake)
+-include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
++#include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
  
+ include(${ORTHANC_ROOT}/Resources/CMake/BoostConfiguration.cmake)
+ include(${ORTHANC_ROOT}/Resources/CMake/GoogleTestConfiguration.cmake)
+@@ -141,15 +141,13 @@ add_library(OrthancDicomWeb SHARED ${COR
+   ${AUTOGENERATED_SOURCES}
+   )
+ 
+-target_link_libraries(OrthancDicomWeb ${GDCM_LIBRARIES})
+-
+ message(Setting the version of the library to ${ORTHANC_DICOM_WEB_VERSION})
+ 
  add_definitions(-DORTHANC_DICOM_WEB_VERSION=${ORTHANC_DICOM_WEB_VERSION})
  
 -set_target_properties(OrthancDicomWeb PROPERTIES 
@@ -15,7 +30,7 @@
 -  SOVERSION ${ORTHANC_DICOM_WEB_VERSION}
 +set_target_properties(OrthancDicomWeb PROPERTIES
 +  NO_SONAME ON
-+  LINK_FLAGS -lgdcmDSED -lgdcmMSFF -luuid 
-Wl,-soname,libOrthancDicomWeb.so.${ORTHANC_DICOM_WEB_VERSION}
++  LINK_FLAGS -lgdcmDICT -lgdcmDSED -lgdcmMSFF -lgdcmCommon -luuid 
-Wl,-soname,libOrthancDicomWeb.so.${ORTHANC_DICOM_WEB_VERSION}
)
  
  install(
@@ -32,3 +47,21 @@
  
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
  set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed)
+@@ -116,17 +116,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL FreeB
+ endif()
+ 
+ 
+-if (${CMAKE_SYSTEM_NAME} STREQUAL Windows)
+-  CHECK_INCLUDE_FILES(rpc.h HAVE_UUID_H)
+-else()
+-  CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
+-endif()
+-
+-if (NOT HAVE_UUID_H)
+-  message(FATAL_ERROR Please install the uuid-dev package)
+-endif()
+-
+-
+ if (STATIC_BUILD)
+   add_definitions(-DORTHANC_STATIC=1)
+ else()


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19889 - trunk/packages/orthanc-postgresql/trunk/debian

2015-08-08 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-08 08:45:29 + (Sat, 08 Aug 2015)
New Revision: 19889

Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/control
Log:
Fix remaining issues

Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===
--- trunk/packages/orthanc-postgresql/trunk/debian/control  2015-08-08 
08:30:48 UTC (rev 19888)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control  2015-08-08 
08:45:29 UTC (rev 19889)
@@ -7,7 +7,7 @@
 Standards-Version: 3.9.6
 Build-Depends: cmake (= 2.8),
debhelper (= 9),
-   libboost-all-dev | libboost1.58-all-dev,
+   libboost-all-dev,
libgtest-dev (= 1.6.0),
libjsoncpp-dev,
libpq-dev,


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19861 - trunk/packages/gdcm/trunk/debian/patches

2015-08-06 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-06 13:34:23 + (Thu, 06 Aug 2015)
New Revision: 19861

Modified:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
Dummy argument necessary for castxml to take -fxml-start into consideration

Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
13:33:18 UTC (rev 19860)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
13:34:23 UTC (rev 19861)
@@ -6,11 +6,12 @@
 ===
 --- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
 +++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-@@ -411,11 +411,12 @@ if(GDCM_WRAP_CSHARP)
+@@ -411,11 +411,13 @@ if(GDCM_WRAP_CSHARP)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
COMMAND ${gccxml_EXECUTABLE}
ARGS
 --fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++--  # Dummy argument necessary for castxml to take 
-fxml-start into consideration
  -fxml-start=_cable_
  ${gccxml_include_args} -DCABLE_CONFIGURATION
 ---gccxml-compiler ${gccxml_compiler}


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19864 - trunk/packages/gdcm/trunk/debian/patches

2015-08-06 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-06 14:20:07 + (Thu, 06 Aug 2015)
New Revision: 19864

Modified:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Log:
fix remaining problems with the migration from gccxml to castxml

Modified: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
14:11:09 UTC (rev 19863)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
14:20:07 UTC (rev 19864)
@@ -6,12 +6,12 @@
 ===
 --- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
 +++ gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
-@@ -411,11 +411,13 @@ if(GDCM_WRAP_CSHARP)
+@@ -411,15 +411,28 @@ if(GDCM_WRAP_CSHARP)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
COMMAND ${gccxml_EXECUTABLE}
ARGS
 --fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
-+--  # Dummy argument necessary for castxml to take 
-fxml-start into consideration
++--  # Dummy empty argument necessary for castxml to succeed
  -fxml-start=_cable_
  ${gccxml_include_args} -DCABLE_CONFIGURATION
 ---gccxml-compiler ${gccxml_compiler}
@@ -19,6 +19,21 @@
  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
 +-Wno-deprecated
 +-fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++# Remove the Converter and Destructor XML tags that are
++# generated by castxml with a format that is different
++# from that of gccxml, and thus that are not properly
++# understood by mummy. Removing these tags does not seem
++# to modify the output of mummy.
++COMMAND sed
++ARGS
++  -i
++  /^  \\(Converter\\|Destructor\\) /d
++  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
DEPENDS
  ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
  ${header}
+ ${gccxml_EXECUTABLE}
++VERBATIM
+ )
+ 
+ #


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r19854 - trunk/packages/gdcm/trunk/debian/patches

2015-08-06 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-08-06 08:56:22 + (Thu, 06 Aug 2015)
New Revision: 19854

Added:
   trunk/packages/gdcm/trunk/debian/patches/castxml.patch
Modified:
   trunk/packages/gdcm/trunk/debian/patches/series
Log:
Replace gccxml with its castxml wrapper

Added: trunk/packages/gdcm/trunk/debian/patches/castxml.patch
===
--- trunk/packages/gdcm/trunk/debian/patches/castxml.patch  
(rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/castxml.patch  2015-08-06 
08:56:22 UTC (rev 19854)
@@ -0,0 +1,23 @@
+Description: Replace gccxml with its castxml wrapper
+Author: Sebastien Jodogne s.jodo...@gmail.com
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
+===
+--- gdcm-2.4.4.orig/Utilities/VTK/CMakeLists.txt
 gdcm-2.4.4/Utilities/VTK/CMakeLists.txt
+@@ -411,11 +411,11 @@ if(GDCM_WRAP_CSHARP)
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
+   COMMAND ${gccxml_EXECUTABLE}
+   ARGS
+--fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
+--fxml-start=_cable_
++--castxml-start=_cable_
+ ${gccxml_include_args} -DCABLE_CONFIGURATION
+---gccxml-compiler ${gccxml_compiler}
+ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
++  -Wno-deprecated
++-fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
+   DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
+ ${header}

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===
--- trunk/packages/gdcm/trunk/debian/patches/series 2015-08-05 20:05:24 UTC 
(rev 19853)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2015-08-06 08:56:22 UTC 
(rev 19854)
@@ -2,3 +2,4 @@
 fixhurd.patch
 linkvtkdoc.patch
 multiarch.patch
+castxml.patch


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

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

2015-11-10 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-11-10 16:05:29 + (Tue, 10 Nov 2015)
New Revision: 20477

Added:
   trunk/packages/orthanc/trunk/debian/patches/find-dictionary
Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/control
   trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides
   trunk/packages/orthanc/trunk/debian/patches/series
   trunk/packages/orthanc/trunk/debian/rules
Log:
fix #804571

Modified: trunk/packages/orthanc/trunk/debian/changelog
===
--- trunk/packages/orthanc/trunk/debian/changelog   2015-11-10 14:20:15 UTC 
(rev 20476)
+++ trunk/packages/orthanc/trunk/debian/changelog   2015-11-10 16:05:29 UTC 
(rev 20477)
@@ -1,3 +1,9 @@
+orthanc (0.9.4+dfsg-2) UNRELEASED; urgency=medium
+
+  * Build-depend on libdcmtk-dev instead of libdcmtk2-dev. Closes: #804571
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Tue, 10 Nov 2015 16:23:28 +0100
+
 orthanc (0.9.4+dfsg-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/orthanc/trunk/debian/control
===
--- trunk/packages/orthanc/trunk/debian/control 2015-11-10 14:20:15 UTC (rev 
20476)
+++ trunk/packages/orthanc/trunk/debian/control 2015-11-10 16:05:29 UTC (rev 
20477)
@@ -13,7 +13,7 @@
libboost-all-dev,
libcharls-dev,
libcurl4-openssl-dev | libcurl4-dev,
-   libdcmtk2-dev,
+   libdcmtk-dev,
libgtest-dev (>= 1.6.0),
libjpeg-dev,
libjs-jquery (>= 1.7.2),

Modified: trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides
===
--- trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides   
2015-11-10 14:20:15 UTC (rev 20476)
+++ trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides   
2015-11-10 16:05:29 UTC (rev 20477)
@@ -9,4 +9,3 @@
 # "libServeFolders.so" shared library is placed inside
 # "/usr/lib/orthanc", that lintian seems not to scan
 postinst-has-useless-call-to-ldconfig
-postrm-has-useless-call-to-ldconfig

Added: trunk/packages/orthanc/trunk/debian/patches/find-dictionary
===
--- trunk/packages/orthanc/trunk/debian/patches/find-dictionary 
(rev 0)
+++ trunk/packages/orthanc/trunk/debian/patches/find-dictionary 2015-11-10 
16:05:29 UTC (rev 20477)
@@ -0,0 +1,67 @@
+Description: Fix when looking for the DICOM dictionary
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-0.9.4/Resources/CMake/DcmtkConfiguration.cmake
+===
+--- Orthanc-0.9.4.orig/Resources/CMake/DcmtkConfiguration.cmake
2015-09-16 16:53:23.0 +0200
 Orthanc-0.9.4/Resources/CMake/DcmtkConfiguration.cmake 2015-11-10 
16:38:30.016776426 +0100
+@@ -3,9 +3,14 @@
+   find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
+ /usr/share/dcmtk
+ /usr/share/libdcmtk2
++/usr/share/libdcmtk4
+ /usr/local/share/dcmtk
+ )
+ 
++ if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES 
"DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND")
++   message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system")
++ endif()
++
+   message("Autodetected path to the DICOM dictionaries: 
${DCMTK_DICTIONARY_DIR_AUTO}")
+   add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR_AUTO}")
+ else()
+@@ -15,6 +20,7 @@
+ 
+ if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
+   SET(DCMTK_VERSION_NUMBER 360)
++  set(DCMTK_PACKAGE_VERSION "3.6.0")
+   SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
+   SET(DCMTK_URL 
"http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip;)
+   SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
+@@ -30,7 +36,7 @@
+   IF (CMAKE_CROSSCOMPILING)
+ SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
+   ENDIF()
+-  SET(DCMTK_SOURCE_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
++  SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
+   include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
+   include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
+ 
+@@ -47,9 +53,8 @@
+ set(HAVE_PROTOTYPE_GETSOCKNAME 1)
+   endif()
+ 
+-  set(DCMTK_PACKAGE_VERSION "3.6.0")
+   set(DCMTK_PACKAGE_VERSION_SUFFIX "")
+-  set(DCMTK_PACKAGE_VERSION_NUMBER 360)
++  set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
+ 
+   CONFIGURE_FILE(
+ ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
+@@ -155,13 +160,13 @@
+ 
+   #set_source_files_properties(${DCMTK_SOURCES}
+   #  PROPERTIES COMPILE_DEFINITIONS
+-  #  "PACKAGE_VERSION=\"

[med-svn] r20202 - in trunk/packages/orthanc-postgresql/trunk/debian: . patches

2015-10-07 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-10-07 10:07:12 + (Wed, 07 Oct 2015)
New Revision: 20202

Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
   trunk/packages/orthanc-postgresql/trunk/debian/control
   trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs
   trunk/packages/orthanc-postgresql/trunk/debian/postrm
Log:
Orthanc PostgreSQL 1.3

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog2015-10-06 
20:02:48 UTC (rev 20201)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog2015-10-07 
10:07:12 UTC (rev 20202)
@@ -1,3 +1,9 @@
+orthanc-postgresql (1.3-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Wed, 07 Oct 2015 11:41:47 +0200
+
 orthanc-postgresql (1.2-1) unstable; urgency=medium
 
   [ Sebastien Jodogne ]

Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===
--- trunk/packages/orthanc-postgresql/trunk/debian/control  2015-10-06 
20:02:48 UTC (rev 20201)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control  2015-10-07 
10:07:12 UTC (rev 20202)
@@ -11,7 +11,7 @@
libgtest-dev (>= 1.6.0),
libjsoncpp-dev,
libpq-dev,
-   orthanc-dev (>= 0.9.1),
+   orthanc-dev (>= 0.9.4),
postgresql-server-dev-all,
unzip,
uuid-dev
@@ -21,7 +21,7 @@
 
 Package: orthanc-postgresql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.4)
 Suggests: postgresql
 Description: Plugins to use PostgreSQL as a database back-end to Orthanc
  Orthanc PostgreSQL is a set of two plugins to Orthanc, a lightweight,

Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs   
2015-10-06 20:02:48 UTC (rev 20201)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs   
2015-10-07 10:07:12 UTC (rev 20202)
@@ -2,11 +2,11 @@
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancPostgreSQL-1.2/CMakeLists.txt
+Index: OrthancPostgreSQL-1.3/CMakeLists.txt
 ===
 OrthancPostgreSQL-1.2.orig/CMakeLists.txt
-+++ OrthancPostgreSQL-1.2/CMakeLists.txt
-@@ -148,15 +148,12 @@ message("Setting the version of the libr
+--- OrthancPostgreSQL-1.3.orig/CMakeLists.txt
 OrthancPostgreSQL-1.3/CMakeLists.txt
+@@ -145,15 +145,12 @@ message("Setting the version of the libr
  
  add_definitions(-DORTHANC_POSTGRESQL_VERSION="${ORTHANC_POSTGRESQL_VERSION}")
  

Modified: trunk/packages/orthanc-postgresql/trunk/debian/postrm
===
--- trunk/packages/orthanc-postgresql/trunk/debian/postrm   2015-10-06 
20:02:48 UTC (rev 20201)
+++ trunk/packages/orthanc-postgresql/trunk/debian/postrm   2015-10-07 
10:07:12 UTC (rev 20202)
@@ -13,6 +13,8 @@
/etc/init.d/orthanc restart
fi
fi
+
+   ldconfig
;;
 
 failed-upgrade|abort-install|abort-upgrade|disappear)


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r20664 - in trunk/packages/orthanc-webviewer/trunk/debian: . JS JS/cornerstone-0.8.4

2015-12-07 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-07 15:27:48 + (Mon, 07 Dec 2015)
New Revision: 20664

Added:
   trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/
   trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/LICENSE
   trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/README.md
   
trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/cornerstone.css
   
trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/cornerstone.js
Removed:
   trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.7.1/
Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/changelog
   trunk/packages/orthanc-webviewer/trunk/debian/rules
Log:
Upgrade Cornerstone version: 0.7.1 to 0.8.4

Added: 
trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/LICENSE
===
--- trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/LICENSE  
(rev 0)
+++ trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/LICENSE  
2015-12-07 15:27:48 UTC (rev 20664)
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Chris Hafey (cha...@gmail.com)
+
+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.
\ No newline at end of file

Added: 
trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/README.md
===
--- 
trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/README.md
(rev 0)
+++ 
trunk/packages/orthanc-webviewer/trunk/debian/JS/cornerstone-0.8.4/README.md
2015-12-07 15:27:48 UTC (rev 20664)
@@ -0,0 +1,252 @@
+Cornerstone Core
+
+
+Cornerstone is an open source project with a goal to deliver a complete web 
based medical imaging platform.  This
+repository contains the Cornerstone Core component which is a lightweight 
JavaScript library for displaying
+medical images in modern web browsers that support the HTML5 canvas element.
+Cornerstone Core is not meant to be a complete application itself, but instead 
a component
+that can be used as part of larger more complex applications.  See the
+[CornerstoneDemo](http://chafey.github.io/cornerstoneDemo/) for an example of 
using the various Cornerstone
+libraries to build a simple study viewer.
+
+Cornerstone Core is agnostic to the actual container used to store image 
pixels as well as the transport mechanism
+used to get the image data.  In fact, Cornerstone Core itself has no ability 
to read/parse or load images and instead
+depends on one or more 
[ImageLoaders](https://github.com/chafey/cornerstone/wiki/ImageLoader) to 
function.
+The goal here is to avoid constraining developers to work within a single 
container and transport (e.g. DICOM) since
+images are stored in a variety of formats (including proprietary).  By 
providing flexibility with respect to the
+container and transport, the highest performance image display may be obtained 
as no conversion to an alternate
+container or transport is required.  It is hoped that developers feel 
empowered to load images from any type of image
+container using any kind of transport.  See the
+[CornerstoneWADOImageLoader](https://github.com/chafey/cornerstoneWADOImageLoader)
 project for an example
+of a DICOM WADO based Image Loader.
+
+Cornerstone Core is agnostic to the exact interaction paradigm being used.  It 
does not include any mouse, touch or
+keyboard bindings to manipulate the various image properties such as scale, 
translation or ww/wc.  The goal here
+is to avoid constraining developers using this library to fit into a given ui 
paradigm.  It is hoped that developers
+are empowered to create new paradigms possibly using new input mechanisms to 
interact with medical images (e.g.
+[Kinect](http://en.wikipedia.org/wiki/Kinect) or 
[Accelerometer](http://en.wikipedia.org/wiki/Accelerometer).
+Cornerstone does provide

[med-svn] r20621 - trunk/packages/orthanc-webviewer/trunk/debian

2015-12-03 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-03 11:02:43 + (Thu, 03 Dec 2015)
New Revision: 20621

Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/postrm
Log:
remove cache after removal

Modified: trunk/packages/orthanc-webviewer/trunk/debian/postrm
===
--- trunk/packages/orthanc-webviewer/trunk/debian/postrm2015-12-03 
10:58:01 UTC (rev 20620)
+++ trunk/packages/orthanc-webviewer/trunk/debian/postrm2015-12-03 
11:02:43 UTC (rev 20621)
@@ -4,6 +4,10 @@
 
 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


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

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

2015-12-03 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-03 10:58:01 + (Thu, 03 Dec 2015)
New Revision: 20620

Added:
   trunk/packages/orthanc/trunk/debian/configuration/worklists.json
Removed:
   trunk/packages/orthanc/trunk/debian/patches/find-dictionary
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/install
   trunk/packages/orthanc/trunk/debian/patches/series
   trunk/packages/orthanc/trunk/debian/rules
   trunk/packages/orthanc/trunk/debian/source.lintian-overrides
Log:
Orthanc 0.9.5

Modified: trunk/packages/orthanc/trunk/debian/changelog
===
--- trunk/packages/orthanc/trunk/debian/changelog   2015-12-03 10:10:46 UTC 
(rev 20619)
+++ trunk/packages/orthanc/trunk/debian/changelog   2015-12-03 10:58:01 UTC 
(rev 20620)
@@ -1,3 +1,9 @@
+orthanc (0.9.5+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 03 Dec 2015 10:38:27 +0100
+
 orthanc (0.9.4+dfsg-2) unstable; urgency=medium
 
   * Build-depend on libdcmtk-dev instead of libdcmtk2-dev. Closes: #804571

Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json  
2015-12-03 10:10:46 UTC (rev 20619)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json  
2015-12-03 10:58:01 UTC (rev 20620)
@@ -9,12 +9,12 @@
 
   // Path to the directory that holds the heavyweight files
   // (i.e. the raw DICOM instances)
-  "StorageDirectory" : "/var/lib/orthanc/db-v5",
+  "StorageDirectory" : "/var/lib/orthanc/db-v6",
 
   // 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-v5",
+  "IndexDirectory" : "/var/lib/orthanc/db-v6",
 
   // Enable the transparent compression of the DICOM instances
   "StorageCompression" : false,
@@ -103,8 +103,12 @@
   "Mpeg2TransferSyntaxAccepted": true,
   "RleTransferSyntaxAccepted"  : true,
 
+  // Whether Orthanc accepts to act as C-Store SCP for unknown storage
+  // SOP classes (aka. "promiscuous mode")
+  "UnknownSopClassAccepted": true,
 
 
+
   /**
* Security-related options for the HTTP server
**/
@@ -147,8 +151,9 @@
  * A fourth parameter is available to enable patches for a
  * specific PACS manufacturer. The allowed values are currently
  * "Generic" (default value), "StoreScp" (storescp tool from
- * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee" and
- * "SyngoVia". This parameter is case-sensitive.
+ * DCMTK), "ClearCanvas", "MedInria", "Dcm4Chee", "SyngoVia",
+ * "AgfaImpax" (Agfa IMPAX), "EFilm2" (eFilm version 2), and
+ * "Vitrea". This parameter is case-sensitive.
  **/
 // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },
@@ -191,17 +196,19 @@
**/
 
   // Dictionary of symbolic names for the user-defined metadata. Each
-  // entry must map a number between 1024 and 65535 to an unique
-  // string.
+  // entry must map an unique string to an unique number between 1024
+  // and 65535.
   "UserMetadata" : {
 // "Sample" : 1024
   },
 
   // Dictionary of symbolic names for the user-defined types of
-  // attached files. Each entry must map a number between 1024 and
-  // 65535 to an unique string.
+  // attached files. Each entry must map an unique string to an unique
+  // number between 1024 and 65535. Optionally, a second argument can
+  // provided to specify a MIME content type for the attachment.
   "UserContentType" : {
 // "sample" : 1024
+// "sample2" : [ 1025, "application/pdf" ]
   },
 
   // Number of seconds without receiving any instance before a
@@ -244,7 +251,8 @@
   "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.
+  // mode. The DICOM files will not be stored on the drive. Note that
+  // this option might prevent the upgrade to newer versions of Orthanc.
   "StoreDicom" : true,
 
   // DICOM associations are kept open as long as new DICOM commands
@@ -258,8 +266,19 @@
   // deleted as new requests are issued.
   "QueryRetrieveSize" : 10,

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

2015-12-04 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-04 16:42:50 + (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)
  
  inc

[med-svn] [orthanc] 01/05: Imported Upstream version 0.9.6+dfsg

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 8bc80999ae67209b8fc78b1f7da5e5adb15b519a
Author: jodogne-guest 
Date:   Fri Dec 11 08:56:33 2015 +0100

Imported Upstream version 0.9.6+dfsg
---
 .hg_archival.txt |  6 ++---
 CMakeLists.txt   |  2 +-
 Core/HttpServer/HttpOutput.cpp   |  2 +-
 NEWS | 11 +
 OrthancServer/FromDcmtkBridge.cpp| 21 +
 OrthancServer/Search/HierarchicalMatcher.cpp |  6 ++---
 OrthancServer/ServerToolbox.cpp  | 32 ++
 OrthancServer/SliceOrdering.cpp  | 13 ++-
 OrthancServer/main.cpp   | 34 +---
 Resources/Configuration.json |  2 +-
 10 files changed, 102 insertions(+), 27 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
index a3a599b..2cc1f3b 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,5 +1,5 @@
 repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe
-node: 2684ded7c7b3a0176af645476eb9ad56a36e48e4
-branch: Orthanc-0.9.5
+node: b4e8a031b0d86caf89e1a99fb7b86bb94d00c6a8
+branch: Orthanc-0.9.6
 latesttag: null
-latesttagdistance: 1598
+latesttagdistance: 1612
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2058ca..2737e27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "0.9.5")
+set(ORTHANC_VERSION "0.9.6")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff --git a/Core/HttpServer/HttpOutput.cpp b/Core/HttpServer/HttpOutput.cpp
index 80f1770..d28ae80 100644
--- a/Core/HttpServer/HttpOutput.cpp
+++ b/Core/HttpServer/HttpOutput.cpp
@@ -463,7 +463,7 @@ namespace Orthanc
   stream_.Send(false, item, length);
 }
 
-stream_.Send(false, "\r\n", 1);
+stream_.Send(false, "\r\n", 2);
   }
 
 
diff --git a/NEWS b/NEWS
index 01c7329..b762a16 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,17 @@ Pending changes in the mainline
 ===
 
 
+Version 0.9.6 (2015/12/08)
+==
+
+* Promiscuous mode (accept unknown SOP class UID) is now turned off by default
+* Fix serialization of DICOM buffers that might contain garbage trailing
+* Fix modality worklists server if some fields are null
+* More tolerant "/series/.../ordered-slices" with broken series
+* Improved logging information if upgrade fails
+* Fix formatting of multipart HTTP answers (bis)
+
+
 Version 0.9.5 (2015/12/02)
 ==
 
diff --git a/OrthancServer/FromDcmtkBridge.cpp 
b/OrthancServer/FromDcmtkBridge.cpp
index 019d59c..581fa7b 100644
--- a/OrthancServer/FromDcmtkBridge.cpp
+++ b/OrthancServer/FromDcmtkBridge.cpp
@@ -1040,9 +1040,12 @@ namespace Orthanc
 ff.removeInvalidGroups();
 
 // Create a memory buffer with the proper size
-uint32_t s = ff.calcElementLength(xfer, encodingType);
-buffer.resize(s);
-DcmOutputBufferStream ob([0], s);
+{
+  const uint32_t estimatedSize = ff.calcElementLength(xfer, encodingType); 
 // (*)
+  buffer.resize(estimatedSize);
+}
+
+DcmOutputBufferStream ob([0], buffer.size());
 
 // Fill the memory buffer with the meta-header and the dataset
 ff.transferInit();
@@ -1051,13 +1054,23 @@ namespace Orthanc
  /*opt_paddingType*/ EPD_withoutPadding);
 ff.transferEnd();
 
-// Handle errors
 if (c.good())
 {
+  // The DICOM file is successfully written, truncate the target
+  // buffer if its size was overestimated by (*)
+  ob.flush();
+
+  size_t effectiveSize = static_cast(ob.tell());
+  if (effectiveSize < buffer.size())
+  {
+buffer.resize(effectiveSize);
+  }
+
   return true;
 }
 else
 {
+  // Error
   buffer.clear();
   return false;
 }
diff --git a/OrthancServer/Search/HierarchicalMatcher.cpp 
b/OrthancServer/Search/HierarchicalMatcher.cpp
index 2b3a81e..115c9f0 100644
--- a/OrthancServer/Search/HierarchicalMatcher.cpp
+++ b/OrthancServer/Search/HierarchicalMatcher.cpp
@@ -123,12 +123,12 @@ namespace Orthanc
 std::auto_ptr value(FromDcmtkBridge::ConvertLeafElement
 (*element, DicomToJsonFlags_None, 
encoding));
 
-if (value->IsBinary() ||
-value->IsNull())
+if (value->IsBinary())
 {
   throw OrthancException(ErrorCode_BadRequest);
 }
-else if (value->GetContent().empty())
+else if (value->IsNull() ||
+ value->GetContent().empty())
 {
   // This is an universal matcher
   constraints_[tag] = NULL;
diff

[med-svn] [orthanc] 01/01: pristine-tar data for orthanc_1.0.0+dfsg.orig.tar.gz

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch pristine-tar
in repository orthanc.

commit 777573e3ac6621e7a3030c4cd455daf9bd380f57
Author: jodogne-guest 
Date:   Wed Dec 16 13:24:11 2015 +0100

pristine-tar data for orthanc_1.0.0+dfsg.orig.tar.gz
---
 orthanc_1.0.0+dfsg.orig.tar.gz.delta | Bin 0 -> 598797 bytes
 orthanc_1.0.0+dfsg.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/orthanc_1.0.0+dfsg.orig.tar.gz.delta 
b/orthanc_1.0.0+dfsg.orig.tar.gz.delta
new file mode 100644
index 000..86ff85d
Binary files /dev/null and b/orthanc_1.0.0+dfsg.orig.tar.gz.delta differ
diff --git a/orthanc_1.0.0+dfsg.orig.tar.gz.id 
b/orthanc_1.0.0+dfsg.orig.tar.gz.id
new file mode 100644
index 000..9410f03
--- /dev/null
+++ b/orthanc_1.0.0+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+bfb0d6101cd076634e83eb75eaff895628c102a0

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 02/04: Merge tag 'upstream/1.0.0+dfsg'

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 8234b319adbd561d4acfdbd204c3211a7735cbb3
Merge: afb605e c66c8cc
Author: jodogne-guest 
Date:   Wed Dec 16 13:24:12 2015 +0100

Merge tag 'upstream/1.0.0+dfsg'

Upstream version 1.0.0+dfsg

 .hg_archival.txt   |   6 +-
 CMakeLists.txt |   2 +-
 Core/HttpServer/HttpOutput.cpp |  70 +++--
 Core/HttpServer/HttpOutput.h   |  12 +-
 NEWS   |  11 +
 OrthancServer/DicomDirWriter.cpp   | 331 +
 .../DicomProtocol/RemoteModalityParameters.cpp |  13 +-
 OrthancServer/OrthancFindRequestHandler.cpp|  84 +-
 OrthancServer/OrthancFindRequestHandler.h  |   6 +
 OrthancServer/OrthancInitialization.cpp|  59 ++--
 OrthancServer/Search/HierarchicalMatcher.cpp   |  12 +-
 OrthancServer/Search/RangeConstraint.cpp   |  11 +-
 Plugins/Engine/OrthancPlugins.cpp  |  47 ++-
 Plugins/Engine/OrthancPlugins.h|   4 +
 Plugins/Include/orthanc/OrthancCPlugin.h   |  62 +++-
 Plugins/Samples/ModalityWorklists/Plugin.cpp   |   7 +-
 Resources/CMake/DcmtkConfiguration.cmake   |   6 +-
 .../Samples/Lua/IncomingFindRequestFilter.lua  |  14 +
 18 files changed, 498 insertions(+), 259 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/04: Imported Upstream version 1.0.0+dfsg

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit c66c8cc4566b3e33c9db99e08a4829805ade0455
Author: jodogne-guest 
Date:   Wed Dec 16 13:24:09 2015 +0100

Imported Upstream version 1.0.0+dfsg
---
 .hg_archival.txt   |   6 +-
 CMakeLists.txt |   2 +-
 Core/HttpServer/HttpOutput.cpp |  70 +++--
 Core/HttpServer/HttpOutput.h   |  12 +-
 NEWS   |  11 +
 OrthancServer/DicomDirWriter.cpp   | 331 +
 .../DicomProtocol/RemoteModalityParameters.cpp |  13 +-
 OrthancServer/OrthancFindRequestHandler.cpp|  84 +-
 OrthancServer/OrthancFindRequestHandler.h  |   6 +
 OrthancServer/OrthancInitialization.cpp|  59 ++--
 OrthancServer/Search/HierarchicalMatcher.cpp   |  12 +-
 OrthancServer/Search/RangeConstraint.cpp   |  11 +-
 Plugins/Engine/OrthancPlugins.cpp  |  47 ++-
 Plugins/Engine/OrthancPlugins.h|   4 +
 Plugins/Include/orthanc/OrthancCPlugin.h   |  62 +++-
 Plugins/Samples/ModalityWorklists/Plugin.cpp   |   7 +-
 Resources/CMake/DcmtkConfiguration.cmake   |   6 +-
 .../Samples/Lua/IncomingFindRequestFilter.lua  |  14 +
 18 files changed, 498 insertions(+), 259 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
index 2cc1f3b..6473729 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,5 +1,5 @@
 repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe
-node: b4e8a031b0d86caf89e1a99fb7b86bb94d00c6a8
-branch: Orthanc-0.9.6
+node: 74cf1f350b45473e847fed4116c1b428fa3d7352
+branch: Orthanc-1.0.0
 latesttag: null
-latesttagdistance: 1612
+latesttagdistance: 1626
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2737e27..7f6ae71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(Orthanc)
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "0.9.6")
+set(ORTHANC_VERSION "1.0.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
diff --git a/Core/HttpServer/HttpOutput.cpp b/Core/HttpServer/HttpOutput.cpp
index d28ae80..b749e90 100644
--- a/Core/HttpServer/HttpOutput.cpp
+++ b/Core/HttpServer/HttpOutput.cpp
@@ -449,12 +449,59 @@ namespace Orthanc
   }
 
 
-  void HttpOutput::StateMachine::SendMultipartItem(const void* item, size_t 
length)
+  void HttpOutput::StateMachine::SendMultipartItem(const void* item, 
+   size_t length,
+   const std::map& headers)
   {
+if (state_ != State_WritingMultipart)
+{
+  throw OrthancException(ErrorCode_BadSequenceOfCalls);
+}
+
 std::string header = "--" + multipartBoundary_ + "\r\n";
-header += "Content-Type: " + multipartContentType_ + "\r\n";
-header += "Content-Length: " + boost::lexical_cast(length) + 
"\r\n";
-header += "MIME-Version: 1.0\r\n\r\n";
+
+bool hasContentType = false;
+bool hasContentLength = false;
+bool hasMimeVersion = false;
+
+for (std::map::const_iterator
+   it = headers.begin(); it != headers.end(); ++it)
+{
+  header += it->first + ": " + it->second + "\r\n";
+
+  std::string tmp;
+  Toolbox::ToLowerCase(tmp, it->first);
+
+  if (tmp == "content-type")
+  {
+hasContentType = true;
+  }
+
+  if (tmp == "content-length")
+  {
+hasContentLength = true;
+  }
+
+  if (tmp == "mime-version")
+  {
+hasMimeVersion = true;
+  }
+}
+
+if (!hasContentType)
+{
+  header += "Content-Type: " + multipartContentType_ + "\r\n";
+}
+
+if (!hasContentLength)
+{
+  header += "Content-Length: " + boost::lexical_cast(length) 
+ "\r\n";
+}
+
+if (!hasMimeVersion)
+{
+  header += "MIME-Version: 1.0\r\n\r\n";
+}
 
 stream_.Send(false, header.c_str(), header.size());
 
@@ -463,7 +510,7 @@ namespace Orthanc
   stream_.Send(false, item, length);
 }
 
-stream_.Send(false, "\r\n", 2);
+stream_.Send(false, "\r\n", 2);
   }
 
 
@@ -489,19 +536,6 @@ namespace Orthanc
   }
 
 
-  void HttpOutput::SendMultipartItem(const std::string& item)
-  {
-if (item.size() > 0)
-{
-  stateMachine_.SendMultipartItem(item.c_str(), item.size());
-}
-else
-{
-  stateMachine_.SendMultipartItem(NULL, 0);
-}
-  }
-
-
   void HttpOutput::Answer(IHttpStreamAnswer& stream)
   {
 HttpCompression compression = stream.SetupHttpCompression(isGzipAllowed_, 
isDeflateAllowed_);
diff --git a/Core/HttpServer/HttpOutput.h b/Core/HttpServer/HttpOutput.h
index

[med-svn] [orthanc] 03/04: preparing for 1.0.0+dfsg-1

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 3a4bcbbd0287bc3abe35baf6c091ceec9b22f636
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Wed Dec 16 13:24:34 2015 +0100

preparing for 1.0.0+dfsg-1
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9240efd..b269e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.0.0+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Wed, 16 Dec 2015 13:24:18 +0100
+
 orthanc (0.9.6+dfsg-1) unstable; urgency=medium
 
   [ Andreas Tille ]

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch upstream updated (8bc8099 -> c66c8cc)

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch upstream
in repository orthanc.

  from  8bc8099   Imported Upstream version 0.9.6+dfsg
   new  c66c8cc   Imported Upstream version 1.0.0+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |   6 +-
 CMakeLists.txt |   2 +-
 Core/HttpServer/HttpOutput.cpp |  70 +++--
 Core/HttpServer/HttpOutput.h   |  12 +-
 NEWS   |  11 +
 OrthancServer/DicomDirWriter.cpp   | 331 +
 .../DicomProtocol/RemoteModalityParameters.cpp |  13 +-
 OrthancServer/OrthancFindRequestHandler.cpp|  84 +-
 OrthancServer/OrthancFindRequestHandler.h  |   6 +
 OrthancServer/OrthancInitialization.cpp|  59 ++--
 OrthancServer/Search/HierarchicalMatcher.cpp   |  12 +-
 OrthancServer/Search/RangeConstraint.cpp   |  11 +-
 Plugins/Engine/OrthancPlugins.cpp  |  47 ++-
 Plugins/Engine/OrthancPlugins.h|   4 +
 Plugins/Include/orthanc/OrthancCPlugin.h   |  62 +++-
 Plugins/Samples/ModalityWorklists/Plugin.cpp   |   7 +-
 Resources/CMake/DcmtkConfiguration.cmake   |   6 +-
 .../Samples/Lua/IncomingFindRequestFilter.lua  |  14 +
 18 files changed, 498 insertions(+), 259 deletions(-)
 create mode 100644 Resources/Samples/Lua/IncomingFindRequestFilter.lua

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (afb605e -> 0df1165)

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  afb605e   Upload to unstable
   new  c66c8cc   Imported Upstream version 1.0.0+dfsg
   new  8234b31   Merge tag 'upstream/1.0.0+dfsg'
   new  3a4bcbb   preparing for 1.0.0+dfsg-1
   new  0df1165   update configuration files

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |   6 +-
 CMakeLists.txt |   2 +-
 Core/HttpServer/HttpOutput.cpp |  70 +++--
 Core/HttpServer/HttpOutput.h   |  12 +-
 NEWS   |  11 +
 OrthancServer/DicomDirWriter.cpp   | 331 +
 .../DicomProtocol/RemoteModalityParameters.cpp |  13 +-
 OrthancServer/OrthancFindRequestHandler.cpp|  84 +-
 OrthancServer/OrthancFindRequestHandler.h  |   6 +
 OrthancServer/OrthancInitialization.cpp|  59 ++--
 OrthancServer/Search/HierarchicalMatcher.cpp   |  12 +-
 OrthancServer/Search/RangeConstraint.cpp   |  11 +-
 Plugins/Engine/OrthancPlugins.cpp  |  47 ++-
 Plugins/Engine/OrthancPlugins.h|   4 +
 Plugins/Include/orthanc/OrthancCPlugin.h   |  62 +++-
 Plugins/Samples/ModalityWorklists/Plugin.cpp   |   7 +-
 Resources/CMake/DcmtkConfiguration.cmake   |   6 +-
 .../Samples/Lua/IncomingFindRequestFilter.lua  |  14 +
 debian/changelog   |   6 +
 debian/docs/Orthanc.1  |   2 +-
 20 files changed, 505 insertions(+), 260 deletions(-)
 create mode 100644 Resources/Samples/Lua/IncomingFindRequestFilter.lua

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch pristine-tar updated (318ae84 -> 777573e)

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch pristine-tar
in repository orthanc.

  from  318ae84   pristine-tar data for orthanc_0.9.6+dfsg.orig.tar.gz
   new  777573e   pristine-tar data for orthanc_1.0.0+dfsg.orig.tar.gz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 orthanc_1.0.0+dfsg.orig.tar.gz.delta | Bin 0 -> 598797 bytes
 orthanc_1.0.0+dfsg.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 orthanc_1.0.0+dfsg.orig.tar.gz.delta
 create mode 100644 orthanc_1.0.0+dfsg.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 04/04: update configuration files

2015-12-16 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 0df11656681448524842237d27120e8248d55ad5
Author: jodogne-guest 
Date:   Wed Dec 16 13:31:29 2015 +0100

update configuration files
---
 debian/docs/Orthanc.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/docs/Orthanc.1 b/debian/docs/Orthanc.1
index afa3413..7ec8139 100644
--- a/debian/docs/Orthanc.1
+++ b/debian/docs/Orthanc.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ORTHANC "1" "December 2015" "Orthanc 0.9.6" "User Commands"
+.TH ORTHANC "1" "December 2015" "Orthanc 1.0.0" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical 
research
 .SH SYNOPSIS

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

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

2015-12-10 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-10 14:12:35 + (Thu, 10 Dec 2015)
New Revision: 20711

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

Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog 2015-12-10 
14:00:39 UTC (rev 20710)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog 2015-12-10 
14:12:35 UTC (rev 20711)
@@ -1,8 +1,9 @@
-orthanc-webviewer (2.0-2) UNRELEASED; urgency=medium
+orthanc-webviewer (2.1-1) UNRELEASED; urgency=medium
 
+  * New upstream version.
   * Upgrade Cornerstone version: 0.7.1 to 0.8.4
 
- -- Sebastien Jodogne <s.jodo...@gmail.com>  Mon, 07 Dec 2015 16:23:47 +0100
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 10 Dec 2015 15:01:19 +0100
 
 orthanc-webviewer (2.0-1) unstable; urgency=medium
 

Modified: trunk/packages/orthanc-webviewer/trunk/debian/copyright
===
--- trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-12-10 
14:00:39 UTC (rev 20710)
+++ trunk/packages/orthanc-webviewer/trunk/debian/copyright 2015-12-10 
14:12:35 UTC (rev 20711)
@@ -23,7 +23,7 @@
 Copyright: 2011 notmasteryet
 License: Apache-2
 
-Files: debian/JS/cornerstone-0.7.1/*
+Files: debian/JS/cornerstone-0.8.4/*
 Copyright: 2014 Chris Hafey <cha...@gmail.com>
 License: MIT
 

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
===
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2015-12-10 
14:00:39 UTC (rev 20710)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2015-12-10 
14:12:35 UTC (rev 20711)
@@ -2,10 +2,10 @@
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-2.0/CMakeLists.txt
+Index: OrthancWebViewer-2.1/CMakeLists.txt
 ===
 OrthancWebViewer-2.0.orig/CMakeLists.txt
-+++ OrthancWebViewer-2.0/CMakeLists.txt
+--- OrthancWebViewer-2.1.orig/CMakeLists.txt
 OrthancWebViewer-2.1/CMakeLists.txt
 @@ -54,7 +54,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso
  include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/SQLiteConfiguration.cmake)
  


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r20710 - in trunk/packages/orthanc-dicomweb/trunk/debian: . patches

2015-12-10 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-10 14:00:39 + (Thu, 10 Dec 2015)
New Revision: 20710

Modified:
   trunk/packages/orthanc-dicomweb/trunk/debian/changelog
   trunk/packages/orthanc-dicomweb/trunk/debian/control
   trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake
Log:
Orthanc DicomWeb 0.2

Modified: trunk/packages/orthanc-dicomweb/trunk/debian/changelog
===
--- trunk/packages/orthanc-dicomweb/trunk/debian/changelog  2015-12-10 
13:00:26 UTC (rev 20709)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/changelog  2015-12-10 
14:00:39 UTC (rev 20710)
@@ -1,3 +1,10 @@
+orthanc-dicomweb (0.2+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+  * Fix build with Orthanc >= 0.9.5. (Closes: #807394)
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 10 Dec 2015 14:34:10 +0100
+
 orthanc-dicomweb (0.1+dfsg-1) unstable; urgency=medium
 
   * Initial release. (Closes: #794392)

Modified: trunk/packages/orthanc-dicomweb/trunk/debian/control
===
--- trunk/packages/orthanc-dicomweb/trunk/debian/control2015-12-10 
13:00:26 UTC (rev 20709)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/control2015-12-10 
14:00:39 UTC (rev 20710)
@@ -15,7 +15,7 @@
libjsoncpp-dev,
libpng-dev,
libpugixml-dev,
-   orthanc-dev (>= 0.9.1),
+   orthanc-dev (>= 0.9.5),
uuid-dev,
zlib1g-dev
 Vcs-Browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-dicomweb/trunk/
@@ -24,7 +24,7 @@
 
 Package: orthanc-dicomweb
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.5)
 Description: Plugin to extend Orthanc with support of WADO and DICOMweb
  Orthanc DICOMweb is a plugin to Orthanc, the lightweight, RESTful Vendor
  Neutral Archive for medical imaging. It extends the Orthanc core with

Modified: trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake
===
--- trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake  2015-12-10 
13:00:26 UTC (rev 20709)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake  2015-12-10 
14:00:39 UTC (rev 20710)
@@ -2,11 +2,11 @@
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancDicomWeb-0.1/CMakeLists.txt
+Index: OrthancDicomWeb-0.2/CMakeLists.txt
 ===
 OrthancDicomWeb-0.1.orig/CMakeLists.txt
-+++ OrthancDicomWeb-0.1/CMakeLists.txt
-@@ -48,7 +48,7 @@ include(CheckIncludeFileCXX)
+--- OrthancDicomWeb-0.2.orig/CMakeLists.txt
 OrthancDicomWeb-0.2/CMakeLists.txt
+@@ -47,7 +47,7 @@ include(CheckIncludeFileCXX)
  include(CheckLibraryExists)
  include(FindPythonInterp)
  include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake)
@@ -15,7 +15,7 @@
  
  include(${ORTHANC_ROOT}/Resources/CMake/BoostConfiguration.cmake)
  include(${ORTHANC_ROOT}/Resources/CMake/GoogleTestConfiguration.cmake)
-@@ -141,15 +141,13 @@ add_library(OrthancDicomWeb SHARED ${COR
+@@ -130,15 +130,13 @@ add_library(OrthancDicomWeb SHARED ${COR
${AUTOGENERATED_SOURCES}
)
  
@@ -34,10 +34,10 @@
)
  
  install(
-Index: OrthancDicomWeb-0.1/Orthanc/Resources/CMake/Compiler.cmake
+Index: OrthancDicomWeb-0.2/Orthanc/Resources/CMake/Compiler.cmake
 ===
 OrthancDicomWeb-0.1.orig/Orthanc/Resources/CMake/Compiler.cmake
-+++ OrthancDicomWeb-0.1/Orthanc/Resources/CMake/Compiler.cmake
+--- OrthancDicomWeb-0.2.orig/Orthanc/Resources/CMake/Compiler.cmake
 OrthancDicomWeb-0.2/Orthanc/Resources/CMake/Compiler.cmake
 @@ -55,7 +55,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
# Remove the "-rdynamic" option
# http://www.mail-archive.com/cmake@cmake.org/msg08837.html
@@ -47,7 +47,7 @@
  
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-@@ -116,17 +116,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeB
+@@ -134,17 +134,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeB
  endif()
  
  


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r20719 - in trunk/packages/orthanc-postgresql/trunk/debian: . patches

2015-12-10 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2015-12-10 15:03:17 + (Thu, 10 Dec 2015)
New Revision: 20719

Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
   trunk/packages/orthanc-postgresql/trunk/debian/control
   trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs
Log:
Orthanc PostgreSQL 2.0

Modified: trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
===
--- trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
2015-12-10 14:37:09 UTC (rev 20718)
+++ trunk/packages/orthanc-postgresql/trunk/debian/README.Debian
2015-12-10 15:03:17 UTC (rev 20719)
@@ -10,6 +10,7 @@
 Homepage: http://www.orthanc-server.com/static.php?page=postgresql
 
 
+
 Configuration
 =
 
@@ -20,6 +21,35 @@
$> sudo systemctl restart orthanc.service
 
 
+
+Upgrade
+===
+
+The schema of the Orthanc database evolves across versions. If you use
+a PostgreSQL database that was created for an older version of the
+schema, Orthanc will fail to start and you will have to manually
+upgrade the database.
+
+You can read the status of the Orthanc service in the log:
+
+   $> cat /var/log/orthanc/Orthanc.log
+
+If, after upgrading the orthanc-postgresql package, Orthanc complains
+that the database schema must be upgraded, type the following commands
+(reconstructing the database may take some time):
+
+   $> sudo systemctl stop orthanc.service
+   $> sudo /usr/sbin/Orthanc /etc/orthanc --verbose --upgrade
+   $> sudo systemctl start orthanc.service
+
+
+NOTE: As an alternative to the automated upgrade (e.g. if you face
+problems or if you wish to keep the older version of the database),
+you can have a look at the instructions for replication in the Orthanc
+Book: https://orthanc.chu.ulg.ac.be/book/users/replication.html
+
+
+
 Step-by-step tutorial
 =
 
@@ -71,6 +101,7 @@
$> sudo less /var/log/postgresql/postgresl-VERSION-main.log
 
 
+
 Further notes
 =
 

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog2015-12-10 
14:37:09 UTC (rev 20718)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog2015-12-10 
15:03:17 UTC (rev 20719)
@@ -1,3 +1,9 @@
+orthanc-postgresql (2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 10 Dec 2015 15:13:49 +0100
+
 orthanc-postgresql (1.3-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===
--- trunk/packages/orthanc-postgresql/trunk/debian/control  2015-12-10 
14:37:09 UTC (rev 20718)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control  2015-12-10 
15:03:17 UTC (rev 20719)
@@ -11,7 +11,7 @@
libgtest-dev (>= 1.6.0),
libjsoncpp-dev,
libpq-dev,
-   orthanc-dev (>= 0.9.4),
+   orthanc-dev (>= 0.9.5),
postgresql-server-dev-all,
unzip,
uuid-dev
@@ -21,7 +21,7 @@
 
 Package: orthanc-postgresql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.4)
+Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.5)
 Suggests: postgresql
 Description: Plugins to use PostgreSQL as a database back-end to Orthanc
  Orthanc PostgreSQL is a set of two plugins to Orthanc, a lightweight,

Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs   
2015-12-10 14:37:09 UTC (rev 20718)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs   
2015-12-10 15:03:17 UTC (rev 20719)
@@ -2,11 +2,11 @@
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancPostgreSQL-1.3/CMakeLists.txt
+Index: OrthancPostgreSQL-2.0/CMakeLists.txt
 ===
 OrthancPostgreSQL-1.3.orig/CMakeLists.txt
-+++ OrthancPostgreSQL-1.3/CMakeLists.txt
-@@ -145,15 +145,12 @@ message("Setting the version of the libr
+--- OrthancPostgreSQL-2.0.orig/CMakeLists.txt
 OrthancPostgreSQL-2.0/CMakeLists.txt
+@@ -147,15 +147,12 @@ message("Setting the version of the libr
  
  add_definitions(-DORTHANC_POSTGRESQL_VERSION="${ORTHANC_POSTGRESQL_VERSION}")
  


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch upstream updated (f15f1af -> 8bc8099)

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch upstream
in repository orthanc.

  from  f15f1af   Imported Upstream version 0.9.5+dfsg
   new  8bc8099   Imported Upstream version 0.9.6+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt |  6 ++---
 CMakeLists.txt   |  2 +-
 Core/HttpServer/HttpOutput.cpp   |  2 +-
 NEWS | 11 +
 OrthancServer/FromDcmtkBridge.cpp| 21 +
 OrthancServer/Search/HierarchicalMatcher.cpp |  6 ++---
 OrthancServer/ServerToolbox.cpp  | 32 ++
 OrthancServer/SliceOrdering.cpp  | 13 ++-
 OrthancServer/main.cpp   | 34 +---
 Resources/Configuration.json |  2 +-
 10 files changed, 102 insertions(+), 27 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch pristine-tar updated (a6f78c5 -> 318ae84)

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch pristine-tar
in repository orthanc.

  from  a6f78c5   pristine-tar data for orthanc_0.9.5+dfsg.orig.tar.xz
   new  318ae84   pristine-tar data for orthanc_0.9.6+dfsg.orig.tar.gz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 orthanc_0.9.6+dfsg.orig.tar.gz.delta | Bin 0 -> 561220 bytes
 orthanc_0.9.6+dfsg.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 orthanc_0.9.6+dfsg.orig.tar.gz.delta
 create mode 100644 orthanc_0.9.6+dfsg.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 03/05: preparing for 0.9.6+dfsg-1

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 2373aae5249f09cec136c3b49c97ec0edaf751ce
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Fri Dec 11 08:59:50 2015 +0100

preparing for 0.9.6+dfsg-1
---
 debian/changelog | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 441b5b9..6f377d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-orthanc (0.9.5+dfsg-2) UNRELEASED; urgency=medium
+orthanc (0.9.6+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Moved packaging repository from SVN to Git
 
- -- Andreas Tille <ti...@debian.org>  Fri, 04 Dec 2015 13:18:44 +0100
+  [ Sebastien Jodogne ]
+  * New upstream version
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Fri, 11 Dec 2015 08:57:02 +0100
 
 orthanc (0.9.5+dfsg-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (41c757d -> 21b09cc)

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  41c757d   Moved packaging repository from SVN to Git
   new  8bc8099   Imported Upstream version 0.9.6+dfsg
   new  28abb18   Merge tag 'upstream/0.9.6+dfsg'
   new  2373aae   preparing for 0.9.6+dfsg-1
   new  9dc4ebe   looking for DICOM dictionary in /usr/share/libdcmtk5
   new  21b09cc   update configuration files

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt |  6 ++---
 CMakeLists.txt   |  2 +-
 Core/HttpServer/HttpOutput.cpp   |  2 +-
 NEWS | 11 +
 OrthancServer/FromDcmtkBridge.cpp| 21 +
 OrthancServer/Search/HierarchicalMatcher.cpp |  6 ++---
 OrthancServer/ServerToolbox.cpp  | 32 ++
 OrthancServer/SliceOrdering.cpp  | 13 ++-
 OrthancServer/main.cpp   | 34 +---
 Resources/Configuration.json |  2 +-
 debian/changelog |  8 +--
 debian/configuration/orthanc.json|  2 +-
 debian/docs/Orthanc.1|  2 +-
 debian/rules |  1 +
 14 files changed, 111 insertions(+), 31 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 02/05: Merge tag 'upstream/0.9.6+dfsg'

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 28abb1829ae5fdd417f30eb28341a1b97ef11acf
Merge: 41c757d 8bc8099
Author: jodogne-guest 
Date:   Fri Dec 11 08:56:36 2015 +0100

Merge tag 'upstream/0.9.6+dfsg'

Upstream version 0.9.6+dfsg

 .hg_archival.txt |  6 ++---
 CMakeLists.txt   |  2 +-
 Core/HttpServer/HttpOutput.cpp   |  2 +-
 NEWS | 11 +
 OrthancServer/FromDcmtkBridge.cpp| 21 +
 OrthancServer/Search/HierarchicalMatcher.cpp |  6 ++---
 OrthancServer/ServerToolbox.cpp  | 32 ++
 OrthancServer/SliceOrdering.cpp  | 13 ++-
 OrthancServer/main.cpp   | 34 +---
 Resources/Configuration.json |  2 +-
 10 files changed, 102 insertions(+), 27 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/01: pristine-tar data for orthanc_0.9.6+dfsg.orig.tar.gz

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch pristine-tar
in repository orthanc.

commit 318ae84e9a4b39feb193d85518c2025f27ab1f1a
Author: jodogne-guest 
Date:   Fri Dec 11 08:56:36 2015 +0100

pristine-tar data for orthanc_0.9.6+dfsg.orig.tar.gz
---
 orthanc_0.9.6+dfsg.orig.tar.gz.delta | Bin 0 -> 561220 bytes
 orthanc_0.9.6+dfsg.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/orthanc_0.9.6+dfsg.orig.tar.gz.delta 
b/orthanc_0.9.6+dfsg.orig.tar.gz.delta
new file mode 100644
index 000..c37c46e
Binary files /dev/null and b/orthanc_0.9.6+dfsg.orig.tar.gz.delta differ
diff --git a/orthanc_0.9.6+dfsg.orig.tar.gz.id 
b/orthanc_0.9.6+dfsg.orig.tar.gz.id
new file mode 100644
index 000..252ba40
--- /dev/null
+++ b/orthanc_0.9.6+dfsg.orig.tar.gz.id
@@ -0,0 +1 @@
+74c4658e7451f3fe978f23ecd9fe601eb2afaa00

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 04/05: looking for DICOM dictionary in /usr/share/libdcmtk5

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 9dc4ebecda3e4eed2d4cec06ef51b35839e40a4e
Author: jodogne-guest 
Date:   Fri Dec 11 09:06:36 2015 +0100

looking for DICOM dictionary in /usr/share/libdcmtk5
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 0bcf18c..e28de74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ CMAKE_EXTRA_FLAGS += \
-DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \
-DDCMTK_LIBRARIES:STRING=dcmjpls \
-DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=OFF \
+   -DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk5 \
-DCMAKE_BUILD_TYPE=""
 
 override_dh_auto_configure:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 05/05: update configuration files

2015-12-11 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 21b09ccf48c0c1c8ec3f189fe731a26efcacbc3d
Author: jodogne-guest 
Date:   Fri Dec 11 09:14:06 2015 +0100

update configuration files
---
 debian/configuration/orthanc.json | 2 +-
 debian/docs/Orthanc.1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/configuration/orthanc.json 
b/debian/configuration/orthanc.json
index ed3e428..356565a 100644
--- a/debian/configuration/orthanc.json
+++ b/debian/configuration/orthanc.json
@@ -105,7 +105,7 @@
 
   // Whether Orthanc accepts to act as C-Store SCP for unknown storage
   // SOP classes (aka. "promiscuous mode")
-  "UnknownSopClassAccepted": true,
+  "UnknownSopClassAccepted": false,
 
 
 
diff --git a/debian/docs/Orthanc.1 b/debian/docs/Orthanc.1
index a6576ec..afa3413 100644
--- a/debian/docs/Orthanc.1
+++ b/debian/docs/Orthanc.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ORTHANC "1" "December 2015" "Orthanc 0.9.5" "User Commands"
+.TH ORTHANC "1" "December 2015" "Orthanc 0.9.6" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical 
research
 .SH SYNOPSIS

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch pristine-tar updated (777573e -> 05c4f53)

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch pristine-tar
in repository orthanc.

  from  777573e   pristine-tar data for orthanc_1.0.0+dfsg.orig.tar.gz
   new  05c4f53   pristine-tar data for orthanc_1.1.0+dfsg.orig.tar.xz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 orthanc_1.1.0+dfsg.orig.tar.xz.delta | Bin 0 -> 17367 bytes
 orthanc_1.1.0+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 orthanc_1.1.0+dfsg.orig.tar.xz.delta
 create mode 100644 orthanc_1.1.0+dfsg.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (3f5de34 -> 77ae71d)

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  3f5de34   release 1.0.0+dfsg-4
   new  f7c5835   removal of old patches
   new  d00e231   Imported Upstream version 1.1.0+dfsg
   new  d39620d   Merge tag 'upstream/1.1.0+dfsg'
   new  d02b102   preparing for 1.1.0+dfsg-1
   new  99509b9   update configuration files
   new  77ae71d   Orthanc 1.1.0 dropped support for Google Log

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |6 +-
 CMakeLists.txt |  220 +++-
 Core/Cache/ICachePageProvider.h|2 +-
 Core/Cache/LeastRecentlyUsedIndex.h|2 +-
 Core/Cache/MemoryCache.cpp |2 +-
 Core/Cache/MemoryCache.h   |2 +-
 Core/Cache/SharedArchive.cpp   |2 +-
 Core/Cache/SharedArchive.h |2 +-
 Core/ChunkedBuffer.cpp |   15 +-
 Core/ChunkedBuffer.h   |4 +-
 Core/Compression/DeflateBaseCompressor.cpp |2 +-
 Core/Compression/DeflateBaseCompressor.h   |2 +-
 Core/Compression/GzipCompressor.cpp|2 +-
 Core/Compression/GzipCompressor.h  |2 +-
 Core/Compression/HierarchicalZipWriter.cpp |2 +-
 Core/Compression/HierarchicalZipWriter.h   |2 +-
 Core/Compression/IBufferCompressor.h   |2 +-
 Core/Compression/ZipWriter.cpp |2 +-
 Core/Compression/ZipWriter.h   |2 +-
 Core/Compression/ZlibCompressor.cpp|2 +-
 Core/Compression/ZlibCompressor.h  |2 +-
 Core/DicomFormat/DicomArray.cpp|2 +-
 Core/DicomFormat/DicomArray.h  |2 +-
 Core/DicomFormat/DicomElement.h|2 +-
 Core/DicomFormat/DicomImageInformation.cpp |   26 +-
 Core/DicomFormat/DicomImageInformation.h   |7 +-
 Core/DicomFormat/DicomInstanceHasher.cpp   |2 +-
 Core/DicomFormat/DicomInstanceHasher.h |2 +-
 Core/DicomFormat/DicomIntegerPixelAccessor.cpp |7 +-
 Core/DicomFormat/DicomIntegerPixelAccessor.h   |2 +-
 Core/DicomFormat/DicomMap.cpp  |  339 +-
 Core/DicomFormat/DicomMap.h|   18 +-
 Core/DicomFormat/DicomTag.cpp  |2 +-
 Core/DicomFormat/DicomTag.h|   12 +-
 Core/DicomFormat/DicomValue.cpp|2 +-
 Core/DicomFormat/DicomValue.h  |2 +-
 Core/Endianness.h  |  157 +++
 Core/EnumerationDictionary.h   |2 +-
 Core/Enumerations.cpp  |  248 +++-
 Core/Enumerations.h|   84 +-
 Core/FileStorage/FileInfo.h|2 +-
 Core/FileStorage/FilesystemStorage.cpp |4 +-
 Core/FileStorage/FilesystemStorage.h   |2 +-
 Core/FileStorage/IStorageArea.h|2 +-
 Core/FileStorage/StorageAccessor.cpp   |2 +-
 Core/FileStorage/StorageAccessor.h |2 +-
 Core/HttpClient.cpp|  493 ++--
 Core/HttpClient.h  |  120 +-
 Core/HttpServer/BufferHttpSender.cpp   |2 +-
 Core/HttpServer/BufferHttpSender.h |2 +-
 Core/HttpServer/EmbeddedResourceHttpHandler.cpp|2 +-
 Core/HttpServer/EmbeddedResourceHttpHandler.h  |2 +-
 Core/HttpServer/FilesystemHttpHandler.cpp  |8 +-
 Core/HttpServer/FilesystemHttpHandler.h|2 +-
 Core/HttpServer/FilesystemHttpSender.cpp   |2 +-
 Core/HttpServer/FilesystemHttpSender.h |2 +-
 Core/HttpServer/HttpContentNegociation.cpp |2 +-
 Core/HttpServer/HttpContentNegociation.h   |2 +-
 Core/HttpServer/HttpFileSender.cpp |2 +-
 Core/HttpServer/HttpFileSender.h   |2 +-
 Core/HttpServer/HttpOutput.cpp |6 +-
 Core/HttpServer/HttpOutput.h   |2 +-
 Core/HttpServer/HttpStreamTranscoder.cpp   |2 +-
 Core/HttpServer/HttpStreamTranscoder.h |2 +-
 Core/HttpServer/HttpToolbox.cpp|4 +-
 Core/HttpServer/HttpToolbox.h  |2 +-
 Core/HttpServer/IHttpHandler.h |2 +-
 Core/HttpServer/IHttpOutputStream.h|2 +-

[med-svn] [orthanc] 03/06: Merge tag 'upstream/1.1.0+dfsg'

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit d39620d02f98ebb28bc9570a897e0d003d4ba839
Merge: f7c5835 d00e231
Author: jodogne-guest 
Date:   Mon Jun 27 15:59:27 2016 +0200

Merge tag 'upstream/1.1.0+dfsg'

Upstream version 1.1.0+dfsg

 .hg_archival.txt   |6 +-
 CMakeLists.txt |  220 +++-
 Core/Cache/ICachePageProvider.h|2 +-
 Core/Cache/LeastRecentlyUsedIndex.h|2 +-
 Core/Cache/MemoryCache.cpp |2 +-
 Core/Cache/MemoryCache.h   |2 +-
 Core/Cache/SharedArchive.cpp   |2 +-
 Core/Cache/SharedArchive.h |2 +-
 Core/ChunkedBuffer.cpp |   15 +-
 Core/ChunkedBuffer.h   |4 +-
 Core/Compression/DeflateBaseCompressor.cpp |2 +-
 Core/Compression/DeflateBaseCompressor.h   |2 +-
 Core/Compression/GzipCompressor.cpp|2 +-
 Core/Compression/GzipCompressor.h  |2 +-
 Core/Compression/HierarchicalZipWriter.cpp |2 +-
 Core/Compression/HierarchicalZipWriter.h   |2 +-
 Core/Compression/IBufferCompressor.h   |2 +-
 Core/Compression/ZipWriter.cpp |2 +-
 Core/Compression/ZipWriter.h   |2 +-
 Core/Compression/ZlibCompressor.cpp|2 +-
 Core/Compression/ZlibCompressor.h  |2 +-
 Core/DicomFormat/DicomArray.cpp|2 +-
 Core/DicomFormat/DicomArray.h  |2 +-
 Core/DicomFormat/DicomElement.h|2 +-
 Core/DicomFormat/DicomImageInformation.cpp |   26 +-
 Core/DicomFormat/DicomImageInformation.h   |7 +-
 Core/DicomFormat/DicomInstanceHasher.cpp   |2 +-
 Core/DicomFormat/DicomInstanceHasher.h |2 +-
 Core/DicomFormat/DicomIntegerPixelAccessor.cpp |7 +-
 Core/DicomFormat/DicomIntegerPixelAccessor.h   |2 +-
 Core/DicomFormat/DicomMap.cpp  |  339 +-
 Core/DicomFormat/DicomMap.h|   18 +-
 Core/DicomFormat/DicomTag.cpp  |2 +-
 Core/DicomFormat/DicomTag.h|   12 +-
 Core/DicomFormat/DicomValue.cpp|2 +-
 Core/DicomFormat/DicomValue.h  |2 +-
 Core/Endianness.h  |  157 +++
 Core/EnumerationDictionary.h   |2 +-
 Core/Enumerations.cpp  |  248 +++-
 Core/Enumerations.h|   84 +-
 Core/FileStorage/FileInfo.h|2 +-
 Core/FileStorage/FilesystemStorage.cpp |4 +-
 Core/FileStorage/FilesystemStorage.h   |2 +-
 Core/FileStorage/IStorageArea.h|2 +-
 Core/FileStorage/StorageAccessor.cpp   |2 +-
 Core/FileStorage/StorageAccessor.h |2 +-
 Core/HttpClient.cpp|  493 ++--
 Core/HttpClient.h  |  120 +-
 Core/HttpServer/BufferHttpSender.cpp   |2 +-
 Core/HttpServer/BufferHttpSender.h |2 +-
 Core/HttpServer/EmbeddedResourceHttpHandler.cpp|2 +-
 Core/HttpServer/EmbeddedResourceHttpHandler.h  |2 +-
 Core/HttpServer/FilesystemHttpHandler.cpp  |8 +-
 Core/HttpServer/FilesystemHttpHandler.h|2 +-
 Core/HttpServer/FilesystemHttpSender.cpp   |2 +-
 Core/HttpServer/FilesystemHttpSender.h |2 +-
 Core/HttpServer/HttpContentNegociation.cpp |2 +-
 Core/HttpServer/HttpContentNegociation.h   |2 +-
 Core/HttpServer/HttpFileSender.cpp |2 +-
 Core/HttpServer/HttpFileSender.h   |2 +-
 Core/HttpServer/HttpOutput.cpp |6 +-
 Core/HttpServer/HttpOutput.h   |2 +-
 Core/HttpServer/HttpStreamTranscoder.cpp   |2 +-
 Core/HttpServer/HttpStreamTranscoder.h |2 +-
 Core/HttpServer/HttpToolbox.cpp|4 +-
 Core/HttpServer/HttpToolbox.h  |2 +-
 Core/HttpServer/IHttpHandler.h |2 +-
 Core/HttpServer/IHttpOutputStream.h|2 +-
 Core/HttpServer/IHttpStreamAnswer.h|2 +-
 ...OutputStream.h => IIncomingHttpRequestFilter.h} |   19 +-
 Core/HttpServer/MongooseServer.cpp |   12 +-
 Core/HttpServer/MongooseServer.h   |   20 +-
 Core/HttpServer/StringHttpOutput.cpp   |   27 +-
 Core/HttpServer/StringHttpOutput.h |   12 +-
 Core/ICommand.h

[med-svn] [orthanc] 01/01: pristine-tar data for orthanc_1.1.0+dfsg.orig.tar.xz

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch pristine-tar
in repository orthanc.

commit 05c4f53b17b95d7d6731ebdf653cbff28a8c1ccd
Author: jodogne-guest 
Date:   Mon Jun 27 15:59:26 2016 +0200

pristine-tar data for orthanc_1.1.0+dfsg.orig.tar.xz
---
 orthanc_1.1.0+dfsg.orig.tar.xz.delta | Bin 0 -> 17367 bytes
 orthanc_1.1.0+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/orthanc_1.1.0+dfsg.orig.tar.xz.delta 
b/orthanc_1.1.0+dfsg.orig.tar.xz.delta
new file mode 100644
index 000..d8cd59f
Binary files /dev/null and b/orthanc_1.1.0+dfsg.orig.tar.xz.delta differ
diff --git a/orthanc_1.1.0+dfsg.orig.tar.xz.id 
b/orthanc_1.1.0+dfsg.orig.tar.xz.id
new file mode 100644
index 000..6f1b4f1
--- /dev/null
+++ b/orthanc_1.1.0+dfsg.orig.tar.xz.id
@@ -0,0 +1 @@
+76ed3c52f1f8994819ec1ed5f431248e748d9dac

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 06/06: Orthanc 1.1.0 dropped support for Google Log

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 77ae71d95b8b8b02afdb45bb7f7994696d99e1a6
Author: jodogne-guest 
Date:   Mon Jun 27 16:42:13 2016 +0200

Orthanc 1.1.0 dropped support for Google Log
---
 debian/copyright | 4 
 1 file changed, 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 8417239..722bf41 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -65,10 +65,6 @@ License: MIT
 
 
 
-Files: Resources/CMake/GoogleLogConfiguration*.h 
Resources/Patches/glog-visual-studio-port.h
-Copyright: 2008 Google Inc.
-License: BSD-3-clause
-
 Files: Resources/Samples/WebApplications/DrawingDicomizer/drawing.js
 Copyright: 2010 William Malone 
 License: Apache-2

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch upstream updated (c66c8cc -> d00e231)

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch upstream
in repository orthanc.

  from  c66c8cc   Imported Upstream version 1.0.0+dfsg
   new  d00e231   Imported Upstream version 1.1.0+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |6 +-
 CMakeLists.txt |  220 +++-
 Core/Cache/ICachePageProvider.h|2 +-
 Core/Cache/LeastRecentlyUsedIndex.h|2 +-
 Core/Cache/MemoryCache.cpp |2 +-
 Core/Cache/MemoryCache.h   |2 +-
 Core/Cache/SharedArchive.cpp   |2 +-
 Core/Cache/SharedArchive.h |2 +-
 Core/ChunkedBuffer.cpp |   15 +-
 Core/ChunkedBuffer.h   |4 +-
 Core/Compression/DeflateBaseCompressor.cpp |2 +-
 Core/Compression/DeflateBaseCompressor.h   |2 +-
 Core/Compression/GzipCompressor.cpp|2 +-
 Core/Compression/GzipCompressor.h  |2 +-
 Core/Compression/HierarchicalZipWriter.cpp |2 +-
 Core/Compression/HierarchicalZipWriter.h   |2 +-
 Core/Compression/IBufferCompressor.h   |2 +-
 Core/Compression/ZipWriter.cpp |2 +-
 Core/Compression/ZipWriter.h   |2 +-
 Core/Compression/ZlibCompressor.cpp|2 +-
 Core/Compression/ZlibCompressor.h  |2 +-
 Core/DicomFormat/DicomArray.cpp|2 +-
 Core/DicomFormat/DicomArray.h  |2 +-
 Core/DicomFormat/DicomElement.h|2 +-
 Core/DicomFormat/DicomImageInformation.cpp |   26 +-
 Core/DicomFormat/DicomImageInformation.h   |7 +-
 Core/DicomFormat/DicomInstanceHasher.cpp   |2 +-
 Core/DicomFormat/DicomInstanceHasher.h |2 +-
 Core/DicomFormat/DicomIntegerPixelAccessor.cpp |7 +-
 Core/DicomFormat/DicomIntegerPixelAccessor.h   |2 +-
 Core/DicomFormat/DicomMap.cpp  |  339 +-
 Core/DicomFormat/DicomMap.h|   18 +-
 Core/DicomFormat/DicomTag.cpp  |2 +-
 Core/DicomFormat/DicomTag.h|   12 +-
 Core/DicomFormat/DicomValue.cpp|2 +-
 Core/DicomFormat/DicomValue.h  |2 +-
 Core/Endianness.h  |  157 +++
 Core/EnumerationDictionary.h   |2 +-
 Core/Enumerations.cpp  |  248 +++-
 Core/Enumerations.h|   84 +-
 Core/FileStorage/FileInfo.h|2 +-
 Core/FileStorage/FilesystemStorage.cpp |4 +-
 Core/FileStorage/FilesystemStorage.h   |2 +-
 Core/FileStorage/IStorageArea.h|2 +-
 Core/FileStorage/StorageAccessor.cpp   |2 +-
 Core/FileStorage/StorageAccessor.h |2 +-
 Core/HttpClient.cpp|  493 ++--
 Core/HttpClient.h  |  120 +-
 Core/HttpServer/BufferHttpSender.cpp   |2 +-
 Core/HttpServer/BufferHttpSender.h |2 +-
 Core/HttpServer/EmbeddedResourceHttpHandler.cpp|2 +-
 Core/HttpServer/EmbeddedResourceHttpHandler.h  |2 +-
 Core/HttpServer/FilesystemHttpHandler.cpp  |8 +-
 Core/HttpServer/FilesystemHttpHandler.h|2 +-
 Core/HttpServer/FilesystemHttpSender.cpp   |2 +-
 Core/HttpServer/FilesystemHttpSender.h |2 +-
 Core/HttpServer/HttpContentNegociation.cpp |2 +-
 Core/HttpServer/HttpContentNegociation.h   |2 +-
 Core/HttpServer/HttpFileSender.cpp |2 +-
 Core/HttpServer/HttpFileSender.h   |2 +-
 Core/HttpServer/HttpOutput.cpp |6 +-
 Core/HttpServer/HttpOutput.h   |2 +-
 Core/HttpServer/HttpStreamTranscoder.cpp   |2 +-
 Core/HttpServer/HttpStreamTranscoder.h |2 +-
 Core/HttpServer/HttpToolbox.cpp|4 +-
 Core/HttpServer/HttpToolbox.h  |2 +-
 Core/HttpServer/IHttpHandler.h |2 +-
 Core/HttpServer/IHttpOutputStream.h|2 +-
 Core/HttpServer/IHttpStreamAnswer.h|2 +-
 .../IIncomingHttpRequestFilter.h}  |   15 +-
 Core/HttpServer/MongooseServer.cpp |   12 +-
 Core/HttpServer/MongooseServer.h   |   20 +-

[med-svn] [orthanc] 04/06: preparing for 1.1.0+dfsg-1

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit d02b1028a73ccce982e870095c39b4fb00829ff5
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Mon Jun 27 16:05:28 2016 +0200

preparing for 1.1.0+dfsg-1
---
 debian/changelog   | 11 +++
 debian/control |  1 -
 debian/orthanc.dirs|  1 +
 debian/orthanc.install |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0e923ef..8e6d3aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+orthanc (1.1.0+dfsg-1) UNRELEASED; urgency=medium
+
+  [ Sebastien Jodogne ]
+  * New upstream version
+  * Adding of the tool OrthancRecoverCompressedFile. Closes: #823139
+
+  [ Martin Pitt <mp...@debian.org> ]
+  * Drop unnecessary initscripts build dependency. Closes: #828002
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Mon, 27 Jun 2016 15:59:58 +0200
+
 orthanc (1.0.0+dfsg-4) unstable; urgency=medium
 
   * Replace macro "__linux" (now obsolete) with "__linux__". Closes: #821011
diff --git a/debian/control b/debian/control
index af217a9..c2ae6b0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Priority: optional
 Build-Depends: cmake,
debhelper (>= 9),
doxygen,
-   initscripts,
libboost-all-dev,
libcharls-dev,
libcurl4-openssl-dev | libcurl4-dev,
diff --git a/debian/orthanc.dirs b/debian/orthanc.dirs
index e6db090..df983d0 100644
--- a/debian/orthanc.dirs
+++ b/debian/orthanc.dirs
@@ -1,5 +1,6 @@
 etc/init.d
 etc/orthanc
+usr/bin
 usr/sbin
 usr/share/doc/orthanc
 usr/share/orthanc/plugins
diff --git a/debian/orthanc.install b/debian/orthanc.install
index bab9c4c..bee50f3 100644
--- a/debian/orthanc.install
+++ b/debian/orthanc.install
@@ -3,3 +3,4 @@ debian/configuration/serve-folders.json etc/orthanc
 debian/configuration/worklists.jsonetc/orthanc
 Build/Orthanc  usr/sbin
 Build/lib*.so.*usr/lib/orthanc
+Build/OrthancRecoverCompressedFile  usr/bin

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 05/06: update configuration files

2016-06-27 Thread Sebastien Jodogne

/git/debian-med/orthanc.git
 Homepage: http://www.orthanc-server.com/
diff --git a/debian/docs/Orthanc.1 b/debian/docs/Orthanc.1
index 7ec8139..02cef59 100644
--- a/debian/docs/Orthanc.1
+++ b/debian/docs/Orthanc.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ORTHANC "1" "December 2015" "Orthanc 1.0.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH ORTHANC "1" "June 2016" "Orthanc 1.1.0" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical 
research
 .SH SYNOPSIS
@@ -20,7 +20,11 @@ display this help and exit
 .TP
 \fB\-\-logdir\fR=\fI\,[dir]\/\fR
 directory where to store the log files
-(if not used, the logs are dumped to stderr)
+(by default, the log is dumped to stderr)
+.TP
+\fB\-\-logfile\fR=\fI\,[file]\/\fR
+file where to store the log of Orthanc
+(by default, the log is dumped to stderr)
 .TP
 \fB\-\-config\fR=\fI\,[file]\/\fR
 create a sample configuration file and exit
@@ -49,7 +53,7 @@ output version information and exit
 .SH AUTHOR
 Written by Sebastien Jodogne <s.jodo...@gmail.com>
 .SH COPYRIGHT
-Copyright \(co 2012\-2015 Sebastien Jodogne, Medical Physics Department, 
University Hospital of Liege (Belgium)
+Copyright \(co 2012\-2016 Sebastien Jodogne, Medical Physics Department, 
University Hospital 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.
diff --git a/debian/docs/OrthancRecoverCompressedFile.8 
b/debian/docs/OrthancRecoverCompressedFile.8
new file mode 100644
index 000..0e48721
--- /dev/null
+++ b/debian/docs/OrthancRecoverCompressedFile.8
@@ -0,0 +1,26 @@
+.TH ORTHANC "8" "June 2016" "Orthanc 1.1.0" "System Administration tools and 
Deamons"
+.SH NAME
+Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical 
research
+.SH SYNOPSIS
+.B OrthancRecoverCompressedFile
+[\fI\,INPUT\/\fR] [\fI\,OUTPUT\/\fR]
+.SH DESCRIPTION
+Orthanc, lightweight, RESTful DICOM server for healthcare and medical research.
+.PP
+This is a maintenance tool to recover a DICOM file that was compressed
+by Orthanc.  If no output is given, the data will be output to
+stdout. Please refer to the Orthanc homepage for the full instructions
+about how to use Orthanc <http://www.orthanc-server.com/>.
+.SS "Exit status:"
+.IP
+0 if success,
+.HP
+\fB\-1\fR if error.
+.SH AUTHOR
+Written by Sebastien Jodogne <s.jodo...@gmail.com>
+.SH COPYRIGHT
+Copyright \(co 2012\-2016 Sebastien Jodogne, Medical Physics Department, 
University Hospital 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.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/debian/orthanc.lintian-overrides b/debian/orthanc.lintian-overrides
index 44576bb..211482f 100644
--- a/debian/orthanc.lintian-overrides
+++ b/debian/orthanc.lintian-overrides
@@ -9,3 +9,4 @@ spelling-error-in-binary usr/sbin/Orthanc supress suppress
 # "libServeFolders.so" shared library is placed inside
 # "/usr/lib/orthanc", that lintian seems not to scan
 postinst-has-useless-call-to-ldconfig
+package-has-unnecessary-activation-of-ldconfig-trigger
diff --git a/debian/orthanc.manpages b/debian/orthanc.manpages
index 7f4c201..006c514 100644
--- a/debian/orthanc.manpages
+++ b/debian/orthanc.manpages
@@ -1 +1,2 @@
 debian/docs/Orthanc.1
+debian/docs/OrthancRecoverCompressedFile.8

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/06: removal of old patches

2016-06-27 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit f7c58356bf275b26db7fd01f28eddbf465803ff5
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Mon Jun 27 15:58:20 2016 +0200

removal of old patches
---
 debian/patches/cmake-dcmtk |  30 ---
 debian/patches/jsoncpp-cxx11   |  16 
 debian/patches/linux-detection | 193 -
 debian/patches/series  |   3 -
 4 files changed, 242 deletions(-)

diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk
deleted file mode 100644
index 92de30d..000
--- a/debian/patches/cmake-dcmtk
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix bug #818512 ("FTBFS: Please install libdcmtk*-dev")
-Author: Sebastien Jodogne <s.jodo...@gmail.com>

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake
-===
 Orthanc-1.0.0.orig/Resources/CMake/DcmtkConfiguration.cmake
2015-12-15 17:49:02.0 +0100
-+++ Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake 2016-04-04 
14:12:12.761016221 +0200
-@@ -180,16 +180,16 @@
-   include(FindDCMTK)
-   list(APPEND DCMTK_LIBRARIES "${tmp}")
- 
--  include_directories(${DCMTK_INCLUDE_DIR})
-+  include_directories(${DCMTK_INCLUDE_DIRS})
- 
-   add_definitions(
- -DHAVE_CONFIG_H=1
- )
- 
--  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
--set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
--  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
--set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
-+  if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
-+set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
-+  elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for 
Arch Linux
-+set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
-   else()
- message(FATAL_ERROR "Please install libdcmtk*-dev")
-   endif()
diff --git a/debian/patches/jsoncpp-cxx11 b/debian/patches/jsoncpp-cxx11
deleted file mode 100644
index 1be0516..000
--- a/debian/patches/jsoncpp-cxx11
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Use 2011 ISO C++ standard as JsonCpp version >= 1.x.y
-Author: Sebastien Jodogne <s.jodo...@gmail.com>

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-1.0.0/Resources/CMake/Compiler.cmake
-===
 Orthanc-1.0.0.orig/Resources/CMake/Compiler.cmake  2015-12-15 
17:49:02.0 +0100
-+++ Orthanc-1.0.0/Resources/CMake/Compiler.cmake   2016-04-07 
15:29:08.565628959 +0200
-@@ -11,6 +11,7 @@
-   # --std=c99 makes libcurl not to compile
-   # -pedantic gives a lot of warnings on OpenSSL 
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long 
-Wno-variadic-macros")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 
-Wno-deprecated-declarations")
- 
-   if (CMAKE_CROSSCOMPILING)
- # http://stackoverflow.com/a/3543845/881731
diff --git a/debian/patches/linux-detection b/debian/patches/linux-detection
deleted file mode 100644
index 090504b..000
--- a/debian/patches/linux-detection
+++ /dev/null
@@ -1,193 +0,0 @@
-Description: Replace macro "__linux" (now obsolete) with "__linux__"
-Author: Sebastien Jodogne <s.jodo...@gmail.com>

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-1.0.0/Core/MultiThreading/Mutex.cpp
-===
 Orthanc-1.0.0.orig/Core/MultiThreading/Mutex.cpp   2015-12-15 
17:49:02.0 +0100
-+++ Orthanc-1.0.0/Core/MultiThreading/Mutex.cpp2016-04-14 
18:10:03.702461024 +0200
-@@ -37,7 +37,7 @@
- 
- #if defined(_WIN32)
- #include 
--#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
-+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
- #include 
- #else
- #error Support your platform here
-@@ -75,7 +75,7 @@
-   }
- 
- 
--#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
-+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
- 
-   struct Mutex::PImpl
-   {
-Index: Orthanc-1.0.0/Core/Toolbox.cpp
-===
 Orthanc-1.0.0.orig/Core/Toolbox.cpp2015-12-15 17:49:02.0 
+0100
-+++ Orthanc-1.0.0/Core/Toolbox.cpp 2016-04-14 18:10:19.070461648 +0200
-@@ -67,7 +67,7 @@
- #include   /* PATH_MAX */
- #

[med-svn] [orthanc] 03/03: preparing for 1.0.0+dfsg-3

2016-04-07 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit e9090f1526e322e50e144e296d38ebdb82e0070b
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Thu Apr 7 15:39:36 2016 +0200

preparing for 1.0.0+dfsg-3
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b40e6fd..a999e0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.0.0+dfsg-3) UNRELEASED; urgency=medium
+
+  * Stick to 2011 ISO C++ standard as JsonCpp version is now above 1.0.0
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 07 Apr 2016 15:37:31 +0200
+
 orthanc (1.0.0+dfsg-2) unstable; urgency=medium
 
   [ Sebastien Jodogne ]

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 02/03: jsoncpp-cxx11 patch

2016-04-07 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 56f82da2d559eb983180a038d6f29c48a0d60b14
Author: jodogne-guest 
Date:   Thu Apr 7 15:32:42 2016 +0200

jsoncpp-cxx11 patch
---
 debian/patches/jsoncpp-cxx11 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/jsoncpp-cxx11 b/debian/patches/jsoncpp-cxx11
index 7c479a6..1be0516 100644
--- a/debian/patches/jsoncpp-cxx11
+++ b/debian/patches/jsoncpp-cxx11
@@ -10,7 +10,7 @@ Index: Orthanc-1.0.0/Resources/CMake/Compiler.cmake
# --std=c99 makes libcurl not to compile
# -pedantic gives a lot of warnings on OpenSSL 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long 
-Wno-variadic-macros")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 
-Wno-deprecated-declarations")
  
if (CMAKE_CROSSCOMPILING)
  # http://stackoverflow.com/a/3543845/881731

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/03: jsoncpp-cxx11 patch

2016-04-07 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 1554c2c3ee71a9ecb11f0fb3d248c39959974301
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Thu Apr 7 15:31:24 2016 +0200

jsoncpp-cxx11 patch
---
 debian/patches/jsoncpp-cxx11 | 16 
 debian/patches/series|  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/patches/jsoncpp-cxx11 b/debian/patches/jsoncpp-cxx11
new file mode 100644
index 000..7c479a6
--- /dev/null
+++ b/debian/patches/jsoncpp-cxx11
@@ -0,0 +1,16 @@
+Description: Use 2011 ISO C++ standard as JsonCpp version >= 1.x.y
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.0.0/Resources/CMake/Compiler.cmake
+===
+--- Orthanc-1.0.0.orig/Resources/CMake/Compiler.cmake  2015-12-15 
17:49:02.0 +0100
 Orthanc-1.0.0/Resources/CMake/Compiler.cmake   2016-04-07 
15:29:08.565628959 +0200
+@@ -11,6 +11,7 @@
+   # --std=c99 makes libcurl not to compile
+   # -pedantic gives a lot of warnings on OpenSSL 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long 
-Wno-variadic-macros")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+   if (CMAKE_CROSSCOMPILING)
+ # http://stackoverflow.com/a/3543845/881731
diff --git a/debian/patches/series b/debian/patches/series
index a728c1c..be0b154 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 cmake-dcmtk
-
+jsoncpp-cxx11

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 03/04: Fix some lintian issues

2016-04-04 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 7d6bb69b2b169ece92e1fa5c9719b77544eb2c78
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Mon Apr 4 14:49:48 2016 +0200

Fix some lintian issues
---
 debian/changelog| 1 +
 debian/control  | 2 +-
 debian/source.lintian-overrides | 5 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 311a937..dd1c47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 orthanc (1.0.0+dfsg-2) UNRELEASED; urgency=medium
 
   * Fix "FTBFS: Please install libdcmtk*-dev". Closes: #818512
+  * Fix some lintian issues
 
  -- Sebastien Jodogne <s.jodo...@gmail.com>  Mon, 04 Apr 2016 14:15:07 +0200
 
diff --git a/debian/control b/debian/control
index f369708..fe9bd28 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Sebastien Jodogne <s.jodo...@gmail.com>,
Andreas Tille <ti...@debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://www.orthanc-server.com/
 Build-Depends: cmake (>= 2.8),
debhelper (>= 9),
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index f6b9d16..46e8f21 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -16,3 +16,8 @@ orthanc source: source-is-missing 
debian/JS/DateJs/src/globalization/sa-IN.js
 orthanc source: source-is-missing debian/JS/DateJs/src/globalization/ta-IN.js
 orthanc source: source-is-missing debian/JS/DateJs/src/globalization/te-IN.js
 orthanc source: source-is-missing debian/JS/DateJs/src/globalization/th-TH.js
+
+# The following lines are wrongly interpreted as minimified JavaScript
+# by lintian, as some of their lines contain more than 256 characters
+orthanc source: source-is-missing 
OrthancExplorer/libs/jquery.mobile.simpledialog2.js
+orthanc source: source-is-missing OrthancExplorer/libs/tree.jquery.js

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/04: fix bug #818512

2016-04-04 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 99f77dccb144c029899feabdedddfdaa6a5250fe
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Mon Apr 4 14:14:30 2016 +0200

fix bug #818512
---
 debian/patches/cmake-dcmtk | 30 ++
 debian/patches/series  |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk
new file mode 100644
index 000..92de30d
--- /dev/null
+++ b/debian/patches/cmake-dcmtk
@@ -0,0 +1,30 @@
+Description: Fix bug #818512 ("FTBFS: Please install libdcmtk*-dev")
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake
+===
+--- Orthanc-1.0.0.orig/Resources/CMake/DcmtkConfiguration.cmake
2015-12-15 17:49:02.0 +0100
 Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake 2016-04-04 
14:12:12.761016221 +0200
+@@ -180,16 +180,16 @@
+   include(FindDCMTK)
+   list(APPEND DCMTK_LIBRARIES "${tmp}")
+ 
+-  include_directories(${DCMTK_INCLUDE_DIR})
++  include_directories(${DCMTK_INCLUDE_DIRS})
+ 
+   add_definitions(
+ -DHAVE_CONFIG_H=1
+ )
+ 
+-  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
+-set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
+-  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
+-set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
++  if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
++set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
++  elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for 
Arch Linux
++set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
+   else()
+ message(FATAL_ERROR "Please install libdcmtk*-dev")
+   endif()
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..a728c1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+cmake-dcmtk
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 02/04: preparing for 1.0.0+dfsg-2

2016-04-04 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 85ae02ac79b4ee90ff8c6b3fc32365e0c8d7f542
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Mon Apr 4 14:16:05 2016 +0200

preparing for 1.0.0+dfsg-2
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 59d669c..311a937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.0.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Fix "FTBFS: Please install libdcmtk*-dev". Closes: #818512
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Mon, 04 Apr 2016 14:15:07 +0200
+
 orthanc (1.0.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 04/04: Fix some lintian issues

2016-04-04 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit f12a4b41e66a703765dd31a5f5b965dd2aec4abe
Author: jodogne-guest 
Date:   Mon Apr 4 15:05:32 2016 +0200

Fix some lintian issues
---
 debian/source.lintian-overrides | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 46e8f21..6529e90 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -19,5 +19,5 @@ orthanc source: source-is-missing 
debian/JS/DateJs/src/globalization/th-TH.js
 
 # The following lines are wrongly interpreted as minimified JavaScript
 # by lintian, as some of their lines contain more than 256 characters
-orthanc source: source-is-missing 
OrthancExplorer/libs/jquery.mobile.simpledialog2.js
-orthanc source: source-is-missing OrthancExplorer/libs/tree.jquery.js
+orthanc source: source-is-missing 
OrthancExplorer/libs/jquery.mobile.simpledialog2.js line length is 366 
characters (>256)
+orthanc source: source-is-missing OrthancExplorer/libs/tree.jquery.js line 
length is 292 characters (>256)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (ac14e14 -> f12a4b4)

2016-04-04 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  ac14e14   Upload to unstable
   new  99f77dc   fix bug #818512
   new  85ae02a   preparing for 1.0.0+dfsg-2
   new  7d6bb69   Fix some lintian issues
   new  f12a4b4   Fix some lintian issues

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|  7 +++
 debian/control  |  2 +-
 debian/patches/cmake-dcmtk  | 30 ++
 debian/patches/series   |  1 +
 debian/source.lintian-overrides |  5 +
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/cmake-dcmtk

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/02: preparing for 1.0.0+dfsg-4

2016-04-14 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 5cfa45c095b326adca6aea1f558bda9202c46669
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Thu Apr 14 18:21:31 2016 +0200

preparing for 1.0.0+dfsg-4
---
 debian/changelog   |   6 ++
 debian/patches/linux-detection | 193 +
 debian/patches/series  |   1 +
 3 files changed, 200 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0424689..fddfdc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.0.0+dfsg-4) UNRELEASED; urgency=medium
+
+  * Replace macro "__linux" (now obsolete) with "__linux__". Should close: 
#821011
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 14 Apr 2016 18:19:58 +0200
+
 orthanc (1.0.0+dfsg-3) unstable; urgency=medium
 
   [ Sebastien Jodogne ]
diff --git a/debian/patches/linux-detection b/debian/patches/linux-detection
new file mode 100644
index 000..090504b
--- /dev/null
+++ b/debian/patches/linux-detection
@@ -0,0 +1,193 @@
+Description: Replace macro "__linux" (now obsolete) with "__linux__"
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.0.0/Core/MultiThreading/Mutex.cpp
+===
+--- Orthanc-1.0.0.orig/Core/MultiThreading/Mutex.cpp   2015-12-15 
17:49:02.0 +0100
 Orthanc-1.0.0/Core/MultiThreading/Mutex.cpp2016-04-14 
18:10:03.702461024 +0200
+@@ -37,7 +37,7 @@
+ 
+ #if defined(_WIN32)
+ #include 
+-#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
+ #include 
+ #else
+ #error Support your platform here
+@@ -75,7 +75,7 @@
+   }
+ 
+ 
+-#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) 
|| defined(__FreeBSD__)
+ 
+   struct Mutex::PImpl
+   {
+Index: Orthanc-1.0.0/Core/Toolbox.cpp
+===
+--- Orthanc-1.0.0.orig/Core/Toolbox.cpp2015-12-15 17:49:02.0 
+0100
 Orthanc-1.0.0/Core/Toolbox.cpp 2016-04-14 18:10:19.070461648 +0200
+@@ -67,7 +67,7 @@
+ #include   /* PATH_MAX */
+ #endif
+ 
+-#if defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
+ #include   /* PATH_MAX */
+ #include 
+ #include 
+@@ -131,7 +131,7 @@
+   {
+ #if defined(_WIN32)
+ ::Sleep(static_cast(microSeconds / static_cast(1000)));
+-#elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD_kernel__) 
|| defined(__FreeBSD__)
++#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) 
|| defined(__FreeBSD__)
+ usleep(microSeconds);
+ #else
+ #error Support your platform here
+@@ -576,7 +576,7 @@
+ return std::string([0]);
+   }
+ 
+-#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__)
+   static std::string GetPathToExecutableInternal()
+   {
+ std::vector buffer(PATH_MAX + 1);
+Index: Orthanc-1.0.0/OrthancServer/DicomProtocol/DicomServer.cpp
+===
+--- Orthanc-1.0.0.orig/OrthancServer/DicomProtocol/DicomServer.cpp 
2015-12-15 17:49:02.0 +0100
 Orthanc-1.0.0/OrthancServer/DicomProtocol/DicomServer.cpp  2016-04-14 
18:10:05.646461103 +0200
+@@ -44,7 +44,7 @@
+ 
+ #include 
+ 
+-#if defined(__linux)
++#if defined(__linux__)
+ #include 
+ #endif
+ 
+Index: Orthanc-1.0.0/OrthancServer/FromDcmtkBridge.cpp
+===
+--- Orthanc-1.0.0.orig/OrthancServer/FromDcmtkBridge.cpp   2015-12-15 
17:49:02.0 +0100
 Orthanc-1.0.0/OrthancServer/FromDcmtkBridge.cpp2016-04-14 
18:09:53.798460621 +0200
+@@ -208,7 +208,7 @@
+   LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM);
+   LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE);
+ 
+-#elif defined(__linux) || defined(__FreeBSD_kernel__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__)
+   std::string path = DCMTK_DICTIONARY_DIR;
+ 
+   const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE);
+Index: Orthanc-1.0.0/Plugins/Engine/PluginsManager.cpp
+===
+--- Orthanc-1.0.0.orig/Plugins/Engine/PluginsManager.cpp   2015-12-15 
17:49:02.0 +0100
 Orthanc-1.0.0/Plugins/Engine/

[med-svn] [orthanc] 02/02: fix changelog

2016-04-14 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 1ab4b68f0a5cf7c40d5ffd18423ea318dda563ab
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Thu Apr 14 18:26:19 2016 +0200

fix changelog
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fddfdc8..1f3bb24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 orthanc (1.0.0+dfsg-4) UNRELEASED; urgency=medium
 
-  * Replace macro "__linux" (now obsolete) with "__linux__". Should close: 
#821011
+  * Replace macro "__linux" (now obsolete) with "__linux__". Closes: #821011
 
  -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 14 Apr 2016 18:19:58 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (325401e -> 1ab4b68)

2016-04-14 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  325401e   Upload to unstable
   new  5cfa45c   preparing for 1.0.0+dfsg-4
   new  1ab4b68   fix changelog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |   6 ++
 debian/patches/linux-detection | 193 +
 debian/patches/series  |   1 +
 3 files changed, 200 insertions(+)
 create mode 100644 debian/patches/linux-detection

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r21712 - in trunk/packages/orthanc-imagej/trunk/debian: . patches

2016-04-15 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-04-15 10:25:52 + (Fri, 15 Apr 2016)
New Revision: 21712

Modified:
   trunk/packages/orthanc-imagej/trunk/debian/changelog
   trunk/packages/orthanc-imagej/trunk/debian/control
   trunk/packages/orthanc-imagej/trunk/debian/copyright
   trunk/packages/orthanc-imagej/trunk/debian/patches/json-simple
   trunk/packages/orthanc-imagej/trunk/debian/watch
Log:
Orthanc ImageJ 1.1

Modified: trunk/packages/orthanc-imagej/trunk/debian/changelog
===
--- trunk/packages/orthanc-imagej/trunk/debian/changelog2016-04-15 
10:20:04 UTC (rev 21711)
+++ trunk/packages/orthanc-imagej/trunk/debian/changelog2016-04-15 
10:25:52 UTC (rev 21712)
@@ -1,8 +1,9 @@
-orthanc-imagej (1.0.0+dfsg-2) UNRELEASED; urgency=medium
+orthanc-imagej (1.1+dfsg-1) UNRELEASED; urgency=medium
 
-  * Updated URLs to the project, the code repository and the downloads
+  * New upstream version.
+  * Updated URLs to the project, the code repository and the downloads.
 
- -- Sebastien Jodogne <s.jodo...@gmail.com>  Thu, 30 Jul 2015 10:19:28 +0200
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Fri, 15 Apr 2016 11:44:54 +0200
 
 orthanc-imagej (1.0.0+dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/orthanc-imagej/trunk/debian/control
===
--- trunk/packages/orthanc-imagej/trunk/debian/control  2016-04-15 10:20:04 UTC 
(rev 21711)
+++ trunk/packages/orthanc-imagej/trunk/debian/control  2016-04-15 10:25:52 UTC 
(rev 21712)
@@ -4,13 +4,13 @@
Andreas Tille <ti...@debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Build-Depends: cmake (>= 2.8),
default-jdk,
debhelper (>= 9),
imagej,
libjson-simple-java
-Vcs-Browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-imagej/trunk/
+Vcs-Browser: 
https://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-imagej/trunk/
 Vcs-Svn: 
svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-imagej/trunk/
 Homepage: http://www.orthanc-server.com/static.php?page=imagej
 
@@ -27,9 +27,9 @@
  Orthanc is a lightweight, RESTful DICOM server for healthcare and
  medical research.
  .
- This plugin hopefully greatly simplifies the indexation of DICOM
- images when dealing with ImageJ (e.g. for quality control of DICOM
- modalities, or for pedagogical use). There is also no need to carry
- on any complex network configuration, since the plugin directly uses
- the REST API of Orthanc. This makes its installation and its use
+ This plugin simplifies the indexation of DICOM images if using
+ ImageJ (e.g. for quality control of DICOM modalities, or for
+ pedagogical use). There is also no need to carry on any complex
+ network configuration, since the plugin directly uses the REST
+ API of Orthanc. This makes its installation and its use
  quite straightforward.

Modified: trunk/packages/orthanc-imagej/trunk/debian/copyright
===
--- trunk/packages/orthanc-imagej/trunk/debian/copyright2016-04-15 
10:20:04 UTC (rev 21711)
+++ trunk/packages/orthanc-imagej/trunk/debian/copyright2016-04-15 
10:25:52 UTC (rev 21712)
@@ -5,7 +5,7 @@
 Files-Excluded: org/*
 
 Files: *
-Copyright: 2012-2014 CHU of Liege (Belgium), and Sebastien Jodogne 
<s.jodo...@gmail.com>
+Copyright: 2012-2016 CHU of Liege (Belgium), and Sebastien Jodogne 
<s.jodo...@gmail.com>
 License: GPL-3
 
 

Modified: trunk/packages/orthanc-imagej/trunk/debian/patches/json-simple
===
--- trunk/packages/orthanc-imagej/trunk/debian/patches/json-simple  
2016-04-15 10:20:04 UTC (rev 21711)
+++ trunk/packages/orthanc-imagej/trunk/debian/patches/json-simple  
2016-04-15 10:25:52 UTC (rev 21712)
@@ -2,10 +2,10 @@
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancImageJ.2/CMakeLists.txt
+Index: OrthancImageJ-1.1/CMakeLists.txt
 ===
 OrthancImageJ.2.orig/CMakeLists.txt
-+++ OrthancImageJ.2/CMakeLists.txt
+--- OrthancImageJ-1.1.orig/CMakeLists.txt
 OrthancImageJ-1.1/CMakeLists.txt
 @@ -6,7 +6,7 @@ find_package(Java REQUIRED)
  include(UseJava)
  
@@ -15,10 +15,10 @@
  
  # The name of an ImageJ plugin must contain an underscore
  # 
http://imagejdocu.tudor.lu/doku.php?id=howto:plugins:howto_create_an_imagej_plugin_jar_file
-@@ -18,20 +18,6 @@ add_jar(Orthanc_Import
-   ${CMAKE_SOURCE_DIR}/com/orthancserver/OrthancConnection.java
+@@ -19,20 +19,6 @@ add_jar(Orthanc_Import
${CMAKE_SOURCE_DIR}/com/orthancserver/PreviewPanel.java
${CMAKE_SOURCE_DIR}/com/orthancserver/SelectImageDialog.java

[med-svn] r21721 - trunk/packages/orthanc-imagej/trunk/debian

2016-04-18 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-04-18 08:58:06 + (Mon, 18 Apr 2016)
New Revision: 21721

Modified:
   trunk/packages/orthanc-imagej/trunk/debian/control
Log:
update to openjdk 8

Modified: trunk/packages/orthanc-imagej/trunk/debian/control
===
--- trunk/packages/orthanc-imagej/trunk/debian/control  2016-04-17 13:54:30 UTC 
(rev 21720)
+++ trunk/packages/orthanc-imagej/trunk/debian/control  2016-04-18 08:58:06 UTC 
(rev 21721)
@@ -6,7 +6,7 @@
 Priority: optional
 Standards-Version: 3.9.7
 Build-Depends: cmake (>= 2.8),
-   default-jdk,
+   default-jdk | openjdk-8-jdk,
debhelper (>= 9),
imagej,
libjson-simple-java
@@ -17,7 +17,7 @@
 Package: orthanc-imagej
 Architecture: all
 Depends: ${misc:Depends},
- default-jre | openjdk-7-jre,
+ default-jre | openjdk-8-jre,
  imagej,
  libjson-simple-java
 Recommends: orthanc


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

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

2016-06-28 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-06-28 13:59:22 + (Tue, 28 Jun 2016)
New Revision: 22235

Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/changelog
   trunk/packages/orthanc-webviewer/trunk/debian/control
   trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
   trunk/packages/orthanc-webviewer/trunk/debian/rules
   trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides
Log:
Orthanc WebViewer 2.2

Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog 2016-06-28 
13:34:09 UTC (rev 22234)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog 2016-06-28 
13:59:22 UTC (rev 22235)
@@ -1,3 +1,9 @@
+orthanc-webviewer (2.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Tue, 28 Jun 2016 15:20:00 +0200
+
 orthanc-webviewer (2.1-1) unstable; urgency=medium
 
   * New upstream version.

Modified: trunk/packages/orthanc-webviewer/trunk/debian/control
===
--- trunk/packages/orthanc-webviewer/trunk/debian/control   2016-06-28 
13:34:09 UTC (rev 22234)
+++ trunk/packages/orthanc-webviewer/trunk/debian/control   2016-06-28 
13:59:22 UTC (rev 22235)
@@ -4,7 +4,7 @@
Andreas Tille <ti...@debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Build-Depends: cmake (>= 2.8),
debhelper (>= 9),
libboost-all-dev,
@@ -21,7 +21,7 @@
uuid-dev,
yui-compressor,
zlib1g-dev
-Vcs-Browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-webviewer/trunk/
+Vcs-Browser: 
https://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: http://www.orthanc-server.com/static.php?page=web-viewer
 

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
===
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2016-06-28 
13:34:09 UTC (rev 22234)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake 2016-06-28 
13:59:22 UTC (rev 22235)
@@ -2,10 +2,10 @@
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-2.1/CMakeLists.txt
+Index: OrthancWebViewer-2.2/CMakeLists.txt
 ===
 OrthancWebViewer-2.1.orig/CMakeLists.txt
-+++ OrthancWebViewer-2.1/CMakeLists.txt
+--- OrthancWebViewer-2.2.orig/CMakeLists.txt
 OrthancWebViewer-2.2/CMakeLists.txt
 @@ -54,7 +54,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso
  include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/SQLiteConfiguration.cmake)
  
@@ -15,7 +15,7 @@
  
  
  # Check that the Orthanc SDK headers are available or download them
-@@ -174,15 +174,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
+@@ -177,15 +177,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
add_dependencies(OrthancWebViewer GDCM)
  endif()
  

Modified: trunk/packages/orthanc-webviewer/trunk/debian/rules
===
--- trunk/packages/orthanc-webviewer/trunk/debian/rules 2016-06-28 13:34:09 UTC 
(rev 22234)
+++ trunk/packages/orthanc-webviewer/trunk/debian/rules 2016-06-28 13:59:22 UTC 
(rev 22235)
@@ -5,6 +5,8 @@
 export UPSTREAM_VERSION := $(shell echo "$(DEBIAN_VERSION)" | cut -d '-' -f 1)
 export TARGET := libOrthancWebViewer.so
 
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+
 %:
dh $@ --parallel --builddirectory=Build
 

Modified: trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides
===
--- trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides  
2016-06-28 13:34:09 UTC (rev 22234)
+++ trunk/packages/orthanc-webviewer/trunk/debian/source.lintian-overrides  
2016-06-28 13:59:22 UTC (rev 22235)
@@ -1,5 +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
+orthanc-webviewer source: source-is-missing 
debian/JS/jsPanel-2.3.3/mobile-detect.js line length is 659 characters (>512)
+orthanc-webviewer source: source-is-missing 
debian/JS/pako-0.2.5/pako_inflate.js line length is 768 characters (>512)


___
debian-med-commit mailing list
debian

[med-svn] [orthanc-dicomweb] 04/05: building 0.3+dfsg-1

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-dicomweb.

commit c16b60a673e63ad841d36fced7a293c8c95c2e80
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Tue Jun 28 16:15:19 2016 +0200

building 0.3+dfsg-1
---
 debian/patches/cmake | 34 --
 debian/rules |  2 ++
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/debian/patches/cmake b/debian/patches/cmake
index 9c1679c..5980cc3 100644
--- a/debian/patches/cmake
+++ b/debian/patches/cmake
@@ -2,10 +2,10 @@ Description: Fix the linking of the shared library
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancDicomWeb-0.2/CMakeLists.txt
+Index: OrthancDicomWeb-0.3/CMakeLists.txt
 ===
 OrthancDicomWeb-0.2.orig/CMakeLists.txt
-+++ OrthancDicomWeb-0.2/CMakeLists.txt
+--- OrthancDicomWeb-0.3.orig/CMakeLists.txt
 OrthancDicomWeb-0.3/CMakeLists.txt
 @@ -47,7 +47,7 @@ include(CheckIncludeFileCXX)
  include(CheckLibraryExists)
  include(FindPythonInterp)
@@ -15,7 +15,7 @@ Index: OrthancDicomWeb-0.2/CMakeLists.txt
  
  include(${ORTHANC_ROOT}/Resources/CMake/BoostConfiguration.cmake)
  include(${ORTHANC_ROOT}/Resources/CMake/GoogleTestConfiguration.cmake)
-@@ -130,15 +130,13 @@ add_library(OrthancDicomWeb SHARED ${COR
+@@ -136,15 +136,13 @@ add_library(OrthancDicomWeb SHARED ${COR
${AUTOGENERATED_SOURCES}
)
  
@@ -34,11 +34,11 @@ Index: OrthancDicomWeb-0.2/CMakeLists.txt
)
  
  install(
-Index: OrthancDicomWeb-0.2/Orthanc/Resources/CMake/Compiler.cmake
+Index: OrthancDicomWeb-0.3/Orthanc/Resources/CMake/Compiler.cmake
 ===
 OrthancDicomWeb-0.2.orig/Orthanc/Resources/CMake/Compiler.cmake
-+++ OrthancDicomWeb-0.2/Orthanc/Resources/CMake/Compiler.cmake
-@@ -55,7 +55,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
+--- OrthancDicomWeb-0.3.orig/Orthanc/Resources/CMake/Compiler.cmake
 OrthancDicomWeb-0.3/Orthanc/Resources/CMake/Compiler.cmake
+@@ -60,7 +60,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux
# Remove the "-rdynamic" option
# http://www.mail-archive.com/cmake@cmake.org/msg08837.html
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
@@ -47,21 +47,3 @@ Index: 
OrthancDicomWeb-0.2/Orthanc/Resources/CMake/Compiler.cmake
  
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-@@ -134,17 +134,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeB
- endif()
- 
- 
--if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
--  CHECK_INCLUDE_FILES(rpc.h HAVE_UUID_H)
--else()
--  CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
--endif()
--
--if (NOT HAVE_UUID_H)
--  message(FATAL_ERROR "Please install the uuid-dev package")
--endif()
--
--
- if (STATIC_BUILD)
-   add_definitions(-DORTHANC_STATIC=1)
- else()
diff --git a/debian/rules b/debian/rules
index 78c6c71..e1c753c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@ export DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 
-e 's/^Version: //
 export UPSTREAM_VERSION := $(shell echo "$(DEBIAN_VERSION)" | cut -d '+' -f 1)
 export TARGET := libOrthancDicomWeb.so
 
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+
 %:
dh $@ --parallel --builddirectory=Build
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-dicomweb.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-dicomweb] branch master updated (f869f80 -> 5b8603e)

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc-dicomweb.

  from  f869f80   Upload to unstable
   new  cfc0bd6   preparing for 0.3+dfsg-1
   new  fc6ba12   Imported Upstream version 0.3+dfsg
   new  30cd0aa   Merge tag 'upstream/0.3+dfsg'
   new  c16b60a   building 0.3+dfsg-1
   new  5b8603e   fix lintian warning

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |   6 +-
 AUTHORS|   4 +-
 CMakeLists.txt |  17 +-
 NEWS   |  13 +
 Orthanc/Core/ChunkedBuffer.cpp |  15 +-
 Orthanc/Core/ChunkedBuffer.h   |   4 +-
 Orthanc/Core/Enumerations.cpp  | 248 +-
 Orthanc/Core/Enumerations.h|  84 ++-
 Orthanc/Core/Logging.h |  15 +-
 Orthanc/Core/OrthancException.h|   2 +-
 Orthanc/Core/PrecompiledHeaders.h  |   2 +-
 Orthanc/Core/Toolbox.cpp   | 232 +-
 Orthanc/Core/Toolbox.h |  20 +-
 Orthanc/Core/WebServiceParameters.cpp  | 265 +++
 Orthanc/Core/WebServiceParameters.h| 124 +++
 .../Samples/Common/OrthancPluginCppWrapper.cpp | 829 +
 .../Samples/Common/OrthancPluginCppWrapper.h   | 384 ++
 Orthanc/Resources/CMake/BoostConfiguration.cmake   |  65 +-
 Orthanc/Resources/CMake/Compiler.cmake |  35 +-
 Orthanc/Resources/CMake/DownloadPackage.cmake  |  14 +-
 Orthanc/Resources/CMake/JsonCppConfiguration.cmake |  25 +
 Orthanc/Resources/WindowsResources.py  |   2 +-
 .../orthanc/OrthancCPlugin.h   | 735 +-
 Plugin/ChunkedBuffer.cpp   |  86 ---
 Plugin/ChunkedBuffer.h |  59 --
 Plugin/Configuration.cpp   | 354 -
 Plugin/Configuration.h |  65 +-
 Plugin/Dicom.cpp   | 195 +++--
 Plugin/Dicom.h |  38 +-
 Plugin/DicomResults.cpp| 356 -
 Plugin/DicomResults.h  |  10 +-
 Plugin/DicomWebClient.cpp  | 616 +++
 Plugin/{QidoRs.h => DicomWebClient.h}  |  18 +-
 Plugin/DicomWebServers.cpp | 279 +++
 Plugin/DicomWebServers.h   |  73 ++
 Plugin/Plugin.cpp  | 234 +++---
 Plugin/Plugin.h|  10 +-
 Plugin/QidoRs.cpp  | 383 +++---
 Plugin/QidoRs.h|   2 +-
 Plugin/StowRs.cpp  |  56 +-
 Plugin/StowRs.h|   2 +-
 Plugin/WadoRs.cpp  | 180 ++---
 Plugin/WadoRs.h|   2 +-
 Plugin/WadoRsRetrieveFrames.cpp|  97 +--
 Plugin/{Wado.cpp => WadoUri.cpp}   | 111 ++-
 Plugin/{Wado.h => WadoUri.h}   |   8 +-
 README |  21 +-
 Resources/CMake/GdcmConfiguration.cmake|   2 +-
 Resources/Samples/JavaScript/index.html|   4 +-
 Resources/Samples/JavaScript/qido-rs.js|   2 +-
 Resources/Samples/JavaScript/stow-rs.js|   2 +-
 Resources/Samples/{ => Python}/SendStow.py |  44 +-
 .../Samples/{ => Python}/WadoRetrieveStudy.py  |   2 +-
 Resources/SyncOrthancFolder.py |  22 +-
 UnitTestsSources/UnitTestsMain.cpp |   4 +-
 Usage.txt  | 284 +++
 debian/changelog   |   6 +
 debian/control |   4 +-
 debian/patches/cmake   |  34 +-
 debian/rules   |   2 +
 debian/watch   |   2 +-
 61 files changed, 5741 insertions(+), 1068 deletions(-)
 create mode 100644 Orthanc/Core/WebServiceParameters.cpp
 create mode 100644 Orthanc/Core/WebServiceParameters.h
 create mode 100644 Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
 create mode 100644 Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.h
 rename Orthanc/{Sdk-0.9.5 => Sdk-1.1.0}/orthanc/OrthancCPlugin.h (85%)
 delete mode 100644 Plugin/ChunkedBuffer.cpp
 delete mode 100644

[med-svn] [orthanc-dicomweb] 03/05: Merge tag 'upstream/0.3+dfsg'

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-dicomweb.

commit 30cd0aa88ff313d3263eb53be513ef33dac87867
Merge: cfc0bd6 fc6ba12
Author: jodogne-guest 
Date:   Tue Jun 28 16:07:54 2016 +0200

Merge tag 'upstream/0.3+dfsg'

Upstream version 0.3+dfsg

 .hg_archival.txt   |   6 +-
 AUTHORS|   4 +-
 CMakeLists.txt |  17 +-
 NEWS   |  13 +
 Orthanc/Core/ChunkedBuffer.cpp |  15 +-
 Orthanc/Core/ChunkedBuffer.h   |   4 +-
 Orthanc/Core/Enumerations.cpp  | 248 +-
 Orthanc/Core/Enumerations.h|  84 ++-
 Orthanc/Core/Logging.h |  15 +-
 Orthanc/Core/OrthancException.h|   2 +-
 Orthanc/Core/PrecompiledHeaders.h  |   2 +-
 Orthanc/Core/Toolbox.cpp   | 232 +-
 Orthanc/Core/Toolbox.h |  20 +-
 Orthanc/Core/WebServiceParameters.cpp  | 265 +++
 Orthanc/Core/WebServiceParameters.h| 124 +++
 .../Samples/Common/OrthancPluginCppWrapper.cpp | 829 +
 .../Samples/Common/OrthancPluginCppWrapper.h   | 384 ++
 Orthanc/Resources/CMake/BoostConfiguration.cmake   |  65 +-
 Orthanc/Resources/CMake/Compiler.cmake |  35 +-
 Orthanc/Resources/CMake/DownloadPackage.cmake  |  14 +-
 Orthanc/Resources/CMake/JsonCppConfiguration.cmake |  25 +
 Orthanc/Resources/WindowsResources.py  |   2 +-
 .../orthanc/OrthancCPlugin.h   | 735 +-
 Plugin/ChunkedBuffer.cpp   |  86 ---
 Plugin/ChunkedBuffer.h |  59 --
 Plugin/Configuration.cpp   | 354 -
 Plugin/Configuration.h |  65 +-
 Plugin/Dicom.cpp   | 195 +++--
 Plugin/Dicom.h |  38 +-
 Plugin/DicomResults.cpp| 356 -
 Plugin/DicomResults.h  |  10 +-
 Plugin/DicomWebClient.cpp  | 616 +++
 Plugin/{QidoRs.h => DicomWebClient.h}  |  18 +-
 Plugin/DicomWebServers.cpp | 279 +++
 Plugin/DicomWebServers.h   |  73 ++
 Plugin/Plugin.cpp  | 234 +++---
 Plugin/Plugin.h|  10 +-
 Plugin/QidoRs.cpp  | 383 +++---
 Plugin/QidoRs.h|   2 +-
 Plugin/StowRs.cpp  |  56 +-
 Plugin/StowRs.h|   2 +-
 Plugin/WadoRs.cpp  | 180 ++---
 Plugin/WadoRs.h|   2 +-
 Plugin/WadoRsRetrieveFrames.cpp|  97 +--
 Plugin/{Wado.cpp => WadoUri.cpp}   | 111 ++-
 Plugin/{Wado.h => WadoUri.h}   |   8 +-
 README |  21 +-
 Resources/CMake/GdcmConfiguration.cmake|   2 +-
 Resources/Samples/JavaScript/index.html|   4 +-
 Resources/Samples/JavaScript/qido-rs.js|   2 +-
 Resources/Samples/JavaScript/stow-rs.js|   2 +-
 Resources/Samples/{ => Python}/SendStow.py |  44 +-
 .../Samples/{ => Python}/WadoRetrieveStudy.py  |   2 +-
 Resources/SyncOrthancFolder.py |  22 +-
 UnitTestsSources/UnitTestsMain.cpp |   4 +-
 Usage.txt  | 284 +++
 56 files changed, 5722 insertions(+), 1039 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-dicomweb.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-dicomweb] branch pristine-tar updated (657cadd -> 8756fd8)

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch pristine-tar
in repository orthanc-dicomweb.

  from  657cadd   pristine-tar data for 
orthanc-dicomweb_0.2+dfsg.orig.tar.xz
   new  8756fd8   pristine-tar data for 
orthanc-dicomweb_0.3+dfsg.orig.tar.xz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 orthanc-dicomweb_0.3+dfsg.orig.tar.xz.delta | Bin 0 -> 3057 bytes
 orthanc-dicomweb_0.3+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 orthanc-dicomweb_0.3+dfsg.orig.tar.xz.delta
 create mode 100644 orthanc-dicomweb_0.3+dfsg.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-dicomweb.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-dicomweb] branch upstream updated (9813e4a -> fc6ba12)

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch upstream
in repository orthanc-dicomweb.

  from  9813e4a   Imported Upstream version 0.2+dfsg
   new  fc6ba12   Imported Upstream version 0.3+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |   6 +-
 AUTHORS|   4 +-
 CMakeLists.txt |  17 +-
 NEWS   |  13 +
 Orthanc/Core/ChunkedBuffer.cpp |  15 +-
 Orthanc/Core/ChunkedBuffer.h   |   4 +-
 Orthanc/Core/Enumerations.cpp  | 248 +-
 Orthanc/Core/Enumerations.h|  84 ++-
 Orthanc/Core/Logging.h |  15 +-
 Orthanc/Core/OrthancException.h|   2 +-
 Orthanc/Core/PrecompiledHeaders.h  |   2 +-
 Orthanc/Core/Toolbox.cpp   | 232 +-
 Orthanc/Core/Toolbox.h |  20 +-
 Orthanc/Core/WebServiceParameters.cpp  | 265 +++
 Orthanc/Core/WebServiceParameters.h| 124 +++
 .../Samples/Common/OrthancPluginCppWrapper.cpp | 829 +
 .../Samples/Common/OrthancPluginCppWrapper.h   | 384 ++
 Orthanc/Resources/CMake/BoostConfiguration.cmake   |  65 +-
 Orthanc/Resources/CMake/Compiler.cmake |  35 +-
 Orthanc/Resources/CMake/DownloadPackage.cmake  |  14 +-
 Orthanc/Resources/CMake/JsonCppConfiguration.cmake |  25 +
 Orthanc/Resources/WindowsResources.py  |   2 +-
 .../orthanc/OrthancCPlugin.h   | 735 +-
 Plugin/ChunkedBuffer.cpp   |  86 ---
 Plugin/ChunkedBuffer.h |  59 --
 Plugin/Configuration.cpp   | 354 -
 Plugin/Configuration.h |  65 +-
 Plugin/Dicom.cpp   | 195 +++--
 Plugin/Dicom.h |  38 +-
 Plugin/DicomResults.cpp| 356 -
 Plugin/DicomResults.h  |  10 +-
 Plugin/DicomWebClient.cpp  | 616 +++
 Plugin/{QidoRs.h => DicomWebClient.h}  |  18 +-
 Plugin/DicomWebServers.cpp | 279 +++
 Plugin/DicomWebServers.h   |  73 ++
 Plugin/Plugin.cpp  | 234 +++---
 Plugin/Plugin.h|  10 +-
 Plugin/QidoRs.cpp  | 383 +++---
 Plugin/QidoRs.h|   2 +-
 Plugin/StowRs.cpp  |  56 +-
 Plugin/StowRs.h|   2 +-
 Plugin/WadoRs.cpp  | 180 ++---
 Plugin/WadoRs.h|   2 +-
 Plugin/WadoRsRetrieveFrames.cpp|  97 +--
 Plugin/{Wado.cpp => WadoUri.cpp}   | 111 ++-
 Plugin/{Wado.h => WadoUri.h}   |   8 +-
 README |  21 +-
 Resources/CMake/GdcmConfiguration.cmake|   2 +-
 Resources/Samples/JavaScript/index.html|   4 +-
 Resources/Samples/JavaScript/qido-rs.js|   2 +-
 Resources/Samples/JavaScript/stow-rs.js|   2 +-
 Resources/Samples/{ => Python}/SendStow.py |  44 +-
 .../Samples/{ => Python}/WadoRetrieveStudy.py  |   2 +-
 Resources/SyncOrthancFolder.py |  22 +-
 UnitTestsSources/UnitTestsMain.cpp |   4 +-
 Usage.txt  | 284 +++
 56 files changed, 5722 insertions(+), 1039 deletions(-)
 create mode 100644 Orthanc/Core/WebServiceParameters.cpp
 create mode 100644 Orthanc/Core/WebServiceParameters.h
 create mode 100644 Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
 create mode 100644 Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.h
 rename Orthanc/{Sdk-0.9.5 => Sdk-1.1.0}/orthanc/OrthancCPlugin.h (85%)
 delete mode 100644 Plugin/ChunkedBuffer.cpp
 delete mode 100644 Plugin/ChunkedBuffer.h
 create mode 100644 Plugin/DicomWebClient.cpp
 copy Plugin/{QidoRs.h => DicomWebClient.h} (65%)
 create mode 100644 Plugin/DicomWebServers.cpp
 create mode 100644 Plugin/DicomWebServers.h
 rename Plugin/{Wado.cpp => WadoUri.cpp} (56%)
 rename Plugin/{Wado.h => WadoUri.h} (79%)
 rename Resources/Samples/{ => Python}/SendStow.py (57%)
 rename Resources/Samples/{ => Python}/WadoRetrieveStudy.py (95%)
 create mode 100644 Usage.txt

-- 
Alioth's

[med-svn] [orthanc-dicomweb] 01/01: pristine-tar data for orthanc-dicomweb_0.3+dfsg.orig.tar.xz

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch pristine-tar
in repository orthanc-dicomweb.

commit 8756fd8044657fcee48fe309c7f42bb36ba0dc00
Author: jodogne-guest 
Date:   Tue Jun 28 16:07:54 2016 +0200

pristine-tar data for orthanc-dicomweb_0.3+dfsg.orig.tar.xz
---
 orthanc-dicomweb_0.3+dfsg.orig.tar.xz.delta | Bin 0 -> 3057 bytes
 orthanc-dicomweb_0.3+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/orthanc-dicomweb_0.3+dfsg.orig.tar.xz.delta 
b/orthanc-dicomweb_0.3+dfsg.orig.tar.xz.delta
new file mode 100644
index 000..154f7cf
Binary files /dev/null and b/orthanc-dicomweb_0.3+dfsg.orig.tar.xz.delta differ
diff --git a/orthanc-dicomweb_0.3+dfsg.orig.tar.xz.id 
b/orthanc-dicomweb_0.3+dfsg.orig.tar.xz.id
new file mode 100644
index 000..2d35c87
--- /dev/null
+++ b/orthanc-dicomweb_0.3+dfsg.orig.tar.xz.id
@@ -0,0 +1 @@
+0c0f69433cb3f22be3348cc6349f392e353c42eb

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-dicomweb.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-dicomweb] 01/05: preparing for 0.3+dfsg-1

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-dicomweb.

commit cfc0bd60c9e7aedd3cd87cdaa5369a244e253c80
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Tue Jun 28 16:07:47 2016 +0200

preparing for 0.3+dfsg-1
---
 debian/changelog | 6 ++
 debian/watch | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 091a3b3..80ee768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc-dicomweb (0.3+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Tue, 28 Jun 2016 16:07:32 +0200
+
 orthanc-dicomweb (0.2+dfsg-1) unstable; urgency=medium
 
   [ Sebastien Jodogne ]
diff --git a/debian/watch b/debian/watch
index 0d73b9a..7ce4698 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g"
 \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g,repack,compression=xz"
 \
 http://www.orthanc-server.com/browse.php?path=/plugin-dicom-web 
downloads/get\.php\?path=/plugin-dicom-web/OrthancDicomWeb-(\d\S*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-dicomweb.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-dicomweb] 05/05: fix lintian warning

2016-06-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-dicomweb.

commit 5b8603e16ff40fe54845dea98d73c710c60318de
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Tue Jun 28 16:21:48 2016 +0200

fix lintian warning
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index db76532..801ba3f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Sebastien Jodogne <s.jodo...@gmail.com>,
Andreas Tille <ti...@debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Build-Depends: cmake (>= 2.8),
debhelper (>= 9),
libboost-all-dev,
@@ -15,7 +15,7 @@ Build-Depends: cmake (>= 2.8),
libjsoncpp-dev,
libpng-dev,
libpugixml-dev,
-   orthanc-dev (>= 0.9.5),
+   orthanc-dev (>= 1.1.0),
uuid-dev,
zlib1g-dev
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/orthanc-dicomweb.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-dicomweb.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (77ae71d -> 8d9cbc2)

2016-07-08 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  77ae71d   Orthanc 1.1.0 dropped support for Google Log
   new  8d9cbc2   preparing for 1.1.0+dfsg-2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  9 -
 debian/patches/cmake-dcmtk | 18 ++
 debian/patches/series  |  1 +
 debian/rules   |  1 -
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/cmake-dcmtk

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/01: preparing for 1.1.0+dfsg-2

2016-07-08 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 8d9cbc2f8b4c8d6395ad59cee45ba92adf39b447
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Fri Jul 8 15:43:42 2016 +0200

preparing for 1.1.0+dfsg-2
---
 debian/changelog   |  9 -
 debian/patches/cmake-dcmtk | 18 ++
 debian/patches/series  |  1 +
 debian/rules   |  1 -
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e6d3aa..fed4e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-orthanc (1.1.0+dfsg-1) UNRELEASED; urgency=medium
+orthanc (1.1.0+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Gianfranco Costamagna and Sebastien Jodogne ]
+  * Fix for cmake to find new versions of dcmtk. Closes: #829608
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Fri, 08 Jul 2016 15:42:10 +0200
+
+orthanc (1.1.0+dfsg-1) unstable; urgency=medium
 
   [ Sebastien Jodogne ]
   * New upstream version
diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk
new file mode 100644
index 000..ba010f2
--- /dev/null
+++ b/debian/patches/cmake-dcmtk
@@ -0,0 +1,18 @@
+Description: Fix for cmake to find new versions of dcmtk
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.1.0/Resources/CMake/DcmtkConfiguration.cmake
+===
+--- Orthanc-1.1.0.orig/Resources/CMake/DcmtkConfiguration.cmake
2016-06-27 13:02:35.0 +0200
 Orthanc-1.1.0/Resources/CMake/DcmtkConfiguration.cmake 2016-07-08 
15:29:05.748036168 +0200
+@@ -271,6 +271,9 @@
+   /usr/share/libdcmtk4
+   /usr/share/libdcmtk5
+   /usr/share/libdcmtk6
++  /usr/share/libdcmtk7
++  /usr/share/libdcmtk8
++  /usr/share/libdcmtk9
+   /usr/local/share/dcmtk
+   )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..2c63196 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cmake-dcmtk
diff --git a/debian/rules b/debian/rules
index 7a67d2f..ab256a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ CMAKE_EXTRA_FLAGS += \
-DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \
-DDCMTK_LIBRARIES:STRING=dcmjpls \
-DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=OFF \
-   -DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk5 \
-DCMAKE_BUILD_TYPE=""
 
 override_dh_auto_configure:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r22265 - in trunk/packages/orthanc-postgresql/trunk/debian: . patches

2016-06-29 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-06-29 15:11:18 + (Wed, 29 Jun 2016)
New Revision: 22265

Added:
   trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5
Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
   trunk/packages/orthanc-postgresql/trunk/debian/control
   trunk/packages/orthanc-postgresql/trunk/debian/patches/series
   trunk/packages/orthanc-postgresql/trunk/debian/postrm
   trunk/packages/orthanc-postgresql/trunk/debian/rules
Log:
Fix to find PostgreSQL 9.5 dev headers

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog2016-06-29 
14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog2016-06-29 
15:11:18 UTC (rev 22265)
@@ -1,3 +1,10 @@
+orthanc-postgresql (2.0-2) UNRELEASED; urgency=medium
+
+  * Fix to find PostgreSQL 9.5 dev headers
+  * Add hardening flags
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Wed, 29 Jun 2016 17:02:36 +0200
+
 orthanc-postgresql (2.0-1) unstable; urgency=medium
 
   * New upstream version.

Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===
--- trunk/packages/orthanc-postgresql/trunk/debian/control  2016-06-29 
14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control  2016-06-29 
15:11:18 UTC (rev 22265)
@@ -4,24 +4,26 @@
Andreas Tille <ti...@debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
-Build-Depends: cmake (>= 2.8),
+Build-Depends: cmake,
debhelper (>= 9),
libboost-all-dev,
-   libgtest-dev (>= 1.6.0),
+   libgtest-dev,
libjsoncpp-dev,
libpq-dev,
-   orthanc-dev (>= 0.9.5),
+   orthanc-dev,
postgresql-server-dev-all,
unzip,
uuid-dev
-Vcs-Browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-postgresql/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: 
https://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-postgresql/trunk/
 Vcs-Svn: 
svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-postgresql/trunk/
 Homepage: http://www.orthanc-server.com/static.php?page=postgresql
 
 Package: orthanc-postgresql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.5)
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ orthanc (>= 0.9.5)
 Suggests: postgresql
 Description: Plugins to use PostgreSQL as a database back-end to Orthanc
  Orthanc PostgreSQL is a set of two plugins to Orthanc, a lightweight,

Added: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5   
(rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5   
2016-06-29 15:11:18 UTC (rev 22265)
@@ -0,0 +1,17 @@
+Description: Fix to find the development headers for PostgreSQL 9.5
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
+===
+--- OrthancPostgreSQL-2.0.orig/Resources/CMake/FindPostgreSQL.cmake
 OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
+@@ -75,7 +75,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the
+ 
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-"9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++"9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ if ( WIN32 )

Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/series
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/series   
2016-06-29 14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/series   
2016-06-29 15:11:18 UTC (rev 22265)
@@ -1,2 +1,2 @@
 shlibs
-
+postgresql-9.5

Modified: trunk/packages/orthanc-postgresql/trunk/debian/postrm
===
--- trunk/packages/orthanc-postgresql/trunk/debian/postrm   2016-06-29 
14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/postrm   2016-06-29 
15:11:18 UTC (re

[med-svn] r22266 - trunk/packages/orthanc-postgresql/trunk/debian

2016-06-29 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-06-29 15:55:56 + (Wed, 29 Jun 2016)
New Revision: 22266

Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
Log:
Closes: #811141

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog2016-06-29 
15:11:18 UTC (rev 22265)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog2016-06-29 
15:55:56 UTC (rev 22266)
@@ -1,6 +1,6 @@
 orthanc-postgresql (2.0-2) UNRELEASED; urgency=medium
 
-  * Fix to find PostgreSQL 9.5 dev headers
+  * Fix to find PostgreSQL 9.5 dev headers. Closes: #811141
   * Add hardening flags
 
  -- Sebastien Jodogne <s.jodo...@gmail.com>  Wed, 29 Jun 2016 17:02:36 +0200


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r22821 - in trunk/packages/orthanc-postgresql/trunk/debian: . patches

2016-10-03 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-10-03 08:50:12 + (Mon, 03 Oct 2016)
New Revision: 22821

Added:
   trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6
Removed:
   trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5
Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
   trunk/packages/orthanc-postgresql/trunk/debian/patches/series
Log:
orthanc-postgresql: fix issue #839309

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog2016-09-22 
17:35:15 UTC (rev 22820)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog2016-10-03 
08:50:12 UTC (rev 22821)
@@ -1,3 +1,9 @@
+orthanc-postgresql (2.0-3) UNRELEASED; urgency=medium
+
+  * Fix to find PostgreSQL 9.6 dev headers. Closes: #839309
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Mon, 03 Oct 2016 10:45:00 +0200
+
 orthanc-postgresql (2.0-2) unstable; urgency=medium
 
   * Fix to find PostgreSQL 9.5 dev headers. Closes: #811141

Deleted: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5   
2016-09-22 17:35:15 UTC (rev 22820)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5   
2016-10-03 08:50:12 UTC (rev 22821)
@@ -1,17 +0,0 @@
-Description: Fix to find the development headers for PostgreSQL 9.5
-Author: Sebastien Jodogne <s.jodo...@gmail.com>

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
-===
 OrthancPostgreSQL-2.0.orig/Resources/CMake/FindPostgreSQL.cmake
-+++ OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
-@@ -75,7 +75,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the
- 
- 
- set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
--"9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-+"9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
- 
- # Define additional search paths for root directories.
- if ( WIN32 )

Added: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6   
    (rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6   
2016-10-03 08:50:12 UTC (rev 22821)
@@ -0,0 +1,17 @@
+Description: Fix to find the development headers for PostgreSQL 9.6
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
+===
+--- OrthancPostgreSQL-2.0.orig/Resources/CMake/FindPostgreSQL.cmake
 OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
+@@ -75,7 +75,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the
+ 
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-"9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++"9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ if ( WIN32 )

Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/series
===
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/series   
2016-09-22 17:35:15 UTC (rev 22820)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/series   
2016-10-03 08:50:12 UTC (rev 22821)
@@ -1,2 +1,2 @@
 shlibs
-postgresql-9.5
+postgresql-9.6


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r22922 - in trunk/packages: . orthanc-wsi orthanc-wsi/trunk orthanc-wsi/trunk/debian

2016-10-27 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-10-27 08:46:09 + (Thu, 27 Oct 2016)
New Revision: 22922

Added:
   trunk/packages/orthanc-wsi/
   trunk/packages/orthanc-wsi/trunk/
   trunk/packages/orthanc-wsi/trunk/debian/
Log:
Creation of orthanc-wsi package


Property changes on: trunk/packages/orthanc-wsi/trunk/debian
___
Added: mergeWithUpstream
   + 1


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-wsi] 01/01: update manpages

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-wsi.

commit 68ff47c50bbb7bca6426a7c227ffa50d37a74c37
Author: jodogne-guest 
Date:   Mon Nov 28 21:25:47 2016 +0100

update manpages
---
 debian/docs/OrthancWSIDicomToTiff.1 | 5 +++--
 debian/docs/OrthancWSIDicomizer.1   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/docs/OrthancWSIDicomToTiff.1 
b/debian/docs/OrthancWSIDicomToTiff.1
index 8497cc7..a007ba0 100644
--- a/debian/docs/OrthancWSIDicomToTiff.1
+++ b/debian/docs/OrthancWSIDicomToTiff.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ORTHANCWSIDICOMTOTIFF "1" "October 2016" "OrthancWSIDicomToTiff 0.1" "User 
Commands"
+.TH ORTHANCWSIDICOMTOTIFF "1" "November 2016" "OrthancWSIDicomToTiff 0.2" 
"User Commands"
 .SH NAME
 OrthancWSIDicomToTiff \- Whole-slide imaging support for Orthanc
 .SH SYNOPSIS
@@ -8,7 +8,8 @@ OrthancWSIDicomToTiff \- Whole-slide imaging support for Orthanc
 .SH DESCRIPTION
 Orthanc, lightweight, RESTful DICOM server for healthcare and medical research.
 .PP
-Convert a DICOM for digital pathology stored in some Orthanc server as a 
standard hierarchical TIFF.
+Convert a DICOM image for digital pathology stored in some Orthanc server as a
+standard hierarchical TIFF (whose tiles are all encoded using JPEG).
 .SS "Generic options:"
 .TP
 \fB\-\-help\fR
diff --git a/debian/docs/OrthancWSIDicomizer.1 
b/debian/docs/OrthancWSIDicomizer.1
index 00927e3..386abd5 100644
--- a/debian/docs/OrthancWSIDicomizer.1
+++ b/debian/docs/OrthancWSIDicomizer.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ORTHANCWSIDICOMIZER "1" "October 2016" "OrthancWSIDicomizer 0.1" "User 
Commands"
+.TH ORTHANCWSIDICOMIZER "1" "November 2016" "OrthancWSIDicomizer 0.2" "User 
Commands"
 .SH NAME
 OrthancWSIDicomizer \- Whole-slide imaging support for Orthanc
 .SH SYNOPSIS

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-wsi.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-wsi] branch master updated (c29a92e -> 68ff47c)

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc-wsi.

  from  c29a92e   Merge tag 'upstream/0.2+dfsg'
   new  68ff47c   update manpages

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/docs/OrthancWSIDicomToTiff.1 | 5 +++--
 debian/docs/OrthancWSIDicomizer.1   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-wsi.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-wsi] branch master updated (38ac233 -> c29a92e)

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc-wsi.

  from  38ac233   Move packaging to Git and upload to unstable
   new  5b30414   preparing for 0.2+dfsg-1
   new  3c6e241   New upstream version 0.2+dfsg
   new  c29a92e   Merge tag 'upstream/0.2+dfsg'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |   6 +-
 Applications/ApplicationToolbox.cpp|  10 +-
 Applications/ApplicationToolbox.h  |   2 +-
 Applications/CMakeLists.txt|  57 +-
 Applications/DicomToTiff.cpp   | 136 +++--
 Applications/Dicomizer.cpp |  44 +-
 Framework/Algorithms/PyramidReader.cpp |  50 +-
 Framework/Algorithms/PyramidReader.h   |  11 +-
 Framework/Algorithms/ReconstructPyramidCommand.cpp |  11 +-
 Framework/Algorithms/ReconstructPyramidCommand.h   |   2 +-
 Framework/Algorithms/TranscodeTileCommand.cpp  |  10 +-
 Framework/Algorithms/TranscodeTileCommand.h|   2 +-
 Framework/DicomToolbox.cpp |  95 +---
 Framework/DicomToolbox.h   |  17 -
 Framework/DicomizerParameters.cpp  |   6 +-
 Framework/DicomizerParameters.h|   4 +-
 Framework/Enumerations.cpp |   7 +-
 Framework/Enumerations.h   |   2 +-
 Framework/ImageToolbox.cpp |  14 +-
 Framework/ImageToolbox.h   |   2 +-
 Framework/ImagedVolumeParameters.cpp   |   2 +-
 Framework/Inputs/DecodedTiledPyramid.h |   6 +-
 Framework/Inputs/DicomPyramid.cpp  |  45 +-
 Framework/Inputs/DicomPyramid.h|  19 +-
 Framework/Inputs/DicomPyramidInstance.cpp  | 251 +++--
 Framework/Inputs/DicomPyramidInstance.h|  20 +-
 Framework/Inputs/DicomPyramidLevel.cpp |  64 ++-
 Framework/Inputs/DicomPyramidLevel.h   |  47 +-
 Framework/Inputs/HierarchicalTiff.cpp  |   7 +-
 Framework/Inputs/HierarchicalTiff.h|   9 +-
 Framework/Inputs/ITiledPyramid.h   |   6 +-
 Framework/Inputs/OpenSlideLibrary.cpp  |   4 +-
 Framework/Inputs/OpenSlideLibrary.h|   4 +-
 Framework/Inputs/OpenSlidePyramid.cpp  |   6 +-
 Framework/Inputs/PyramidWithRawTiles.cpp   |  14 +-
 Framework/Inputs/SingleLevelDecodedPyramid.cpp |   2 +-
 Framework/Inputs/TiledJpegImage.h  |   2 +-
 Framework/Inputs/TiledPngImage.h   |   2 +-
 Framework/Inputs/TiledPyramidStatistics.cpp|   5 +-
 Framework/Inputs/TiledPyramidStatistics.h  |   8 +-
 Framework/Jpeg2000Reader.cpp   |   6 +-
 Framework/Jpeg2000Reader.h |   2 +-
 Framework/Jpeg2000Writer.cpp   |   4 +-
 Framework/Jpeg2000Writer.h |   2 +-
 Framework/Messaging/CurlOrthancConnection.cpp  |  59 ---
 Framework/Messaging/CurlOrthancConnection.h|  53 --
 Framework/Messaging/IOrthancConnection.cpp |  63 ---
 Framework/Messaging/IOrthancConnection.h   |  52 --
 Framework/Messaging/OrthancConnectionBase.cpp  |  41 --
 Framework/Messaging/OrthancConnectionBase.h|  51 --
 Framework/Messaging/PluginOrthancConnection.cpp| 133 -
 Framework/Messaging/PluginOrthancConnection.h  |  50 --
 Framework/Orthanc/Core/Uuid.cpp| 162 --
 Framework/Outputs/DicomPyramidWriter.cpp   |   6 +-
 Framework/Outputs/DicomPyramidWriter.h |   2 +-
 Framework/Outputs/HierarchicalTiffWriter.cpp   |  16 +-
 Framework/Outputs/IPyramidWriter.h |   2 +-
 Framework/Outputs/InMemoryTiledImage.cpp   |   5 +-
 Framework/Outputs/InMemoryTiledImage.h |   6 +-
 Framework/Outputs/MultiframeDicomWriter.cpp|   4 +-
 Framework/Outputs/MultiframeDicomWriter.h  |   2 +-
 Framework/Outputs/PyramidWriterBase.cpp|   4 +-
 Framework/Outputs/TruncatedPyramidWriter.cpp   |   2 +-
 Framework/PrecompiledHeadersWSI.h  |   5 +-
 Framework/{Messaging => Targets}/FolderTarget.cpp  |   6 +-
 Framework/{Messaging => Targets}/FolderTarget.h|   0
 Framework/{Messaging => Targets}/IFileTarget.h |   0
 Framework/{Messaging => Targets}/OrthancTarget.cpp |  30 +-
 Framework/{Messaging => Targets}/OrthancTarget.h   |  10 +-
 NEWS   |  10 +
 Resources/CMake/LibTiffConfiguration.cmake |  21 +-
 Resources/CMake/Version.cmake

[med-svn] [orthanc-wsi] branch pristine-tar updated (7e08306 -> 56d8e79)

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch pristine-tar
in repository orthanc-wsi.

  from  7e08306   pristine-tar data for orthanc-wsi_0.1+dfsg.orig.tar.xz
   new  56d8e79   pristine-tar data for orthanc-wsi_0.2+dfsg.orig.tar.xz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 orthanc-wsi_0.2+dfsg.orig.tar.xz.delta | Bin 0 -> 8103 bytes
 orthanc-wsi_0.2+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 orthanc-wsi_0.2+dfsg.orig.tar.xz.delta
 create mode 100644 orthanc-wsi_0.2+dfsg.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-wsi.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-wsi] 03/03: Merge tag 'upstream/0.2+dfsg'

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-wsi.

commit c29a92e72c8db875a9531ca8462f517b5d120569
Merge: 5b30414 3c6e241
Author: jodogne-guest 
Date:   Mon Nov 28 18:38:51 2016 +0100

Merge tag 'upstream/0.2+dfsg'

Upstream version 0.2+dfsg

 .hg_archival.txt   |   6 +-
 Applications/ApplicationToolbox.cpp|  10 +-
 Applications/ApplicationToolbox.h  |   2 +-
 Applications/CMakeLists.txt|  57 +-
 Applications/DicomToTiff.cpp   | 136 +++--
 Applications/Dicomizer.cpp |  44 +-
 Framework/Algorithms/PyramidReader.cpp |  50 +-
 Framework/Algorithms/PyramidReader.h   |  11 +-
 Framework/Algorithms/ReconstructPyramidCommand.cpp |  11 +-
 Framework/Algorithms/ReconstructPyramidCommand.h   |   2 +-
 Framework/Algorithms/TranscodeTileCommand.cpp  |  10 +-
 Framework/Algorithms/TranscodeTileCommand.h|   2 +-
 Framework/DicomToolbox.cpp |  95 +---
 Framework/DicomToolbox.h   |  17 -
 Framework/DicomizerParameters.cpp  |   6 +-
 Framework/DicomizerParameters.h|   4 +-
 Framework/Enumerations.cpp |   7 +-
 Framework/Enumerations.h   |   2 +-
 Framework/ImageToolbox.cpp |  14 +-
 Framework/ImageToolbox.h   |   2 +-
 Framework/ImagedVolumeParameters.cpp   |   2 +-
 Framework/Inputs/DecodedTiledPyramid.h |   6 +-
 Framework/Inputs/DicomPyramid.cpp  |  45 +-
 Framework/Inputs/DicomPyramid.h|  19 +-
 Framework/Inputs/DicomPyramidInstance.cpp  | 251 +++--
 Framework/Inputs/DicomPyramidInstance.h|  20 +-
 Framework/Inputs/DicomPyramidLevel.cpp |  64 ++-
 Framework/Inputs/DicomPyramidLevel.h   |  47 +-
 Framework/Inputs/HierarchicalTiff.cpp  |   7 +-
 Framework/Inputs/HierarchicalTiff.h|   9 +-
 Framework/Inputs/ITiledPyramid.h   |   6 +-
 Framework/Inputs/OpenSlideLibrary.cpp  |   4 +-
 Framework/Inputs/OpenSlideLibrary.h|   4 +-
 Framework/Inputs/OpenSlidePyramid.cpp  |   6 +-
 Framework/Inputs/PyramidWithRawTiles.cpp   |  14 +-
 Framework/Inputs/SingleLevelDecodedPyramid.cpp |   2 +-
 Framework/Inputs/TiledJpegImage.h  |   2 +-
 Framework/Inputs/TiledPngImage.h   |   2 +-
 Framework/Inputs/TiledPyramidStatistics.cpp|   5 +-
 Framework/Inputs/TiledPyramidStatistics.h  |   8 +-
 Framework/Jpeg2000Reader.cpp   |   6 +-
 Framework/Jpeg2000Reader.h |   2 +-
 Framework/Jpeg2000Writer.cpp   |   4 +-
 Framework/Jpeg2000Writer.h |   2 +-
 Framework/Messaging/CurlOrthancConnection.cpp  |  59 ---
 Framework/Messaging/CurlOrthancConnection.h|  53 --
 Framework/Messaging/IOrthancConnection.cpp |  63 ---
 Framework/Messaging/IOrthancConnection.h   |  52 --
 Framework/Messaging/OrthancConnectionBase.cpp  |  41 --
 Framework/Messaging/OrthancConnectionBase.h|  51 --
 Framework/Messaging/PluginOrthancConnection.cpp| 133 -
 Framework/Messaging/PluginOrthancConnection.h  |  50 --
 Framework/Orthanc/Core/Uuid.cpp| 162 --
 Framework/Outputs/DicomPyramidWriter.cpp   |   6 +-
 Framework/Outputs/DicomPyramidWriter.h |   2 +-
 Framework/Outputs/HierarchicalTiffWriter.cpp   |  16 +-
 Framework/Outputs/IPyramidWriter.h |   2 +-
 Framework/Outputs/InMemoryTiledImage.cpp   |   5 +-
 Framework/Outputs/InMemoryTiledImage.h |   6 +-
 Framework/Outputs/MultiframeDicomWriter.cpp|   4 +-
 Framework/Outputs/MultiframeDicomWriter.h  |   2 +-
 Framework/Outputs/PyramidWriterBase.cpp|   4 +-
 Framework/Outputs/TruncatedPyramidWriter.cpp   |   2 +-
 Framework/PrecompiledHeadersWSI.h  |   5 +-
 Framework/{Messaging => Targets}/FolderTarget.cpp  |   6 +-
 Framework/{Messaging => Targets}/FolderTarget.h|   0
 Framework/{Messaging => Targets}/IFileTarget.h |   0
 Framework/{Messaging => Targets}/OrthancTarget.cpp |  30 +-
 Framework/{Messaging => Targets}/OrthancTarget.h   |  10 +-
 NEWS   |  10 +
 Resources/CMake/LibTiffConfiguration.cmake |  21 +-
 Resources/CMake/Version.cmake  |   2 +-
 .../Graveyard}/CMakeLists.txt  | 137 ++---
 Resources/Graveyard/Hello.cpp  |  85 +++
 .../Orthanc/Core/Cache/LeastRecentlyUsedIndex.h| 346

[med-svn] [orthanc-wsi] 01/01: pristine-tar data for orthanc-wsi_0.2+dfsg.orig.tar.xz

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch pristine-tar
in repository orthanc-wsi.

commit 56d8e79debd4558aabf72161d901891f09af5fdc
Author: jodogne-guest 
Date:   Mon Nov 28 18:38:51 2016 +0100

pristine-tar data for orthanc-wsi_0.2+dfsg.orig.tar.xz
---
 orthanc-wsi_0.2+dfsg.orig.tar.xz.delta | Bin 0 -> 8103 bytes
 orthanc-wsi_0.2+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/orthanc-wsi_0.2+dfsg.orig.tar.xz.delta 
b/orthanc-wsi_0.2+dfsg.orig.tar.xz.delta
new file mode 100644
index 000..4a869b3
Binary files /dev/null and b/orthanc-wsi_0.2+dfsg.orig.tar.xz.delta differ
diff --git a/orthanc-wsi_0.2+dfsg.orig.tar.xz.id 
b/orthanc-wsi_0.2+dfsg.orig.tar.xz.id
new file mode 100644
index 000..9f1b0a4
--- /dev/null
+++ b/orthanc-wsi_0.2+dfsg.orig.tar.xz.id
@@ -0,0 +1 @@
+af21e056e22fe9d4b25c334f781df07720cf000e

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-wsi.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc-wsi] branch upstream updated (ce60603 -> 3c6e241)

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch upstream
in repository orthanc-wsi.

  from  ce60603   New upstream version 0.1+dfsg
   new  3c6e241   New upstream version 0.2+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |   6 +-
 Applications/ApplicationToolbox.cpp|  10 +-
 Applications/ApplicationToolbox.h  |   2 +-
 Applications/CMakeLists.txt|  57 +-
 Applications/DicomToTiff.cpp   | 136 +++--
 Applications/Dicomizer.cpp |  44 +-
 Framework/Algorithms/PyramidReader.cpp |  50 +-
 Framework/Algorithms/PyramidReader.h   |  11 +-
 Framework/Algorithms/ReconstructPyramidCommand.cpp |  11 +-
 Framework/Algorithms/ReconstructPyramidCommand.h   |   2 +-
 Framework/Algorithms/TranscodeTileCommand.cpp  |  10 +-
 Framework/Algorithms/TranscodeTileCommand.h|   2 +-
 Framework/DicomToolbox.cpp |  95 +---
 Framework/DicomToolbox.h   |  17 -
 Framework/DicomizerParameters.cpp  |   6 +-
 Framework/DicomizerParameters.h|   4 +-
 Framework/Enumerations.cpp |   7 +-
 Framework/Enumerations.h   |   2 +-
 Framework/ImageToolbox.cpp |  14 +-
 Framework/ImageToolbox.h   |   2 +-
 Framework/ImagedVolumeParameters.cpp   |   2 +-
 Framework/Inputs/DecodedTiledPyramid.h |   6 +-
 Framework/Inputs/DicomPyramid.cpp  |  45 +-
 Framework/Inputs/DicomPyramid.h|  19 +-
 Framework/Inputs/DicomPyramidInstance.cpp  | 251 +++--
 Framework/Inputs/DicomPyramidInstance.h|  20 +-
 Framework/Inputs/DicomPyramidLevel.cpp |  64 ++-
 Framework/Inputs/DicomPyramidLevel.h   |  47 +-
 Framework/Inputs/HierarchicalTiff.cpp  |   7 +-
 Framework/Inputs/HierarchicalTiff.h|   9 +-
 Framework/Inputs/ITiledPyramid.h   |   6 +-
 Framework/Inputs/OpenSlideLibrary.cpp  |   4 +-
 Framework/Inputs/OpenSlideLibrary.h|   4 +-
 Framework/Inputs/OpenSlidePyramid.cpp  |   6 +-
 Framework/Inputs/PyramidWithRawTiles.cpp   |  14 +-
 Framework/Inputs/SingleLevelDecodedPyramid.cpp |   2 +-
 Framework/Inputs/TiledJpegImage.h  |   2 +-
 Framework/Inputs/TiledPngImage.h   |   2 +-
 Framework/Inputs/TiledPyramidStatistics.cpp|   5 +-
 Framework/Inputs/TiledPyramidStatistics.h  |   8 +-
 Framework/Jpeg2000Reader.cpp   |   6 +-
 Framework/Jpeg2000Reader.h |   2 +-
 Framework/Jpeg2000Writer.cpp   |   4 +-
 Framework/Jpeg2000Writer.h |   2 +-
 Framework/Messaging/CurlOrthancConnection.cpp  |  59 ---
 Framework/Messaging/CurlOrthancConnection.h|  53 --
 Framework/Messaging/IOrthancConnection.cpp |  63 ---
 Framework/Messaging/IOrthancConnection.h   |  52 --
 Framework/Messaging/OrthancConnectionBase.cpp  |  41 --
 Framework/Messaging/OrthancConnectionBase.h|  51 --
 Framework/Messaging/PluginOrthancConnection.cpp| 133 -
 Framework/Messaging/PluginOrthancConnection.h  |  50 --
 Framework/Orthanc/Core/Uuid.cpp| 162 --
 Framework/Outputs/DicomPyramidWriter.cpp   |   6 +-
 Framework/Outputs/DicomPyramidWriter.h |   2 +-
 Framework/Outputs/HierarchicalTiffWriter.cpp   |  16 +-
 Framework/Outputs/IPyramidWriter.h |   2 +-
 Framework/Outputs/InMemoryTiledImage.cpp   |   5 +-
 Framework/Outputs/InMemoryTiledImage.h |   6 +-
 Framework/Outputs/MultiframeDicomWriter.cpp|   4 +-
 Framework/Outputs/MultiframeDicomWriter.h  |   2 +-
 Framework/Outputs/PyramidWriterBase.cpp|   4 +-
 Framework/Outputs/TruncatedPyramidWriter.cpp   |   2 +-
 Framework/PrecompiledHeadersWSI.h  |   5 +-
 Framework/{Messaging => Targets}/FolderTarget.cpp  |   6 +-
 Framework/{Messaging => Targets}/FolderTarget.h|   0
 Framework/{Messaging => Targets}/IFileTarget.h |   0
 Framework/{Messaging => Targets}/OrthancTarget.cpp |  30 +-
 Framework/{Messaging => Targets}/OrthancTarget.h   |  10 +-
 NEWS   |  10 +
 Resources/CMake/LibTiffConfiguration.cmake |  21 +-
 Resources/CMake/Version.cmake  |   2 +-
 .../Graveyard}/CMakeLists.txt  | 137 ++---

[med-svn] [orthanc-wsi] 01/03: preparing for 0.2+dfsg-1

2016-11-28 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc-wsi.

commit 5b30414ba967478d3c5d6897491d0d0c35418fda
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Mon Nov 28 18:37:01 2016 +0100

preparing for 0.2+dfsg-1
---
 debian/changelog | 6 ++
 debian/copyright | 8 
 debian/patches/cmake | 8 
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a552e6..8781393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc-wsi (0.2+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Mon, 28 Nov 2016 18:31:48 +0100
+
 orthanc-wsi (0.1+dfsg-1) unstable; urgency=medium
 
   * Initial release. (Closes: #842168)
diff --git a/debian/copyright b/debian/copyright
index 17f5e1b..1a8c698 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,21 +3,21 @@ Upstream-Name: OrthancWSI
 Upstream-Contact: Sebastien Jodogne <s.jodo...@gmail.com>
 Source: https://bitbucket.org/sjodogne/orthanc-wsi/
 Files-Excluded:
-   Framework/Orthanc/Resources/ThirdParty/patch/*
+   Resources/Orthanc/Resources/ThirdParty/patch/*
 
 Files: *
 Copyright: 2012-2016 Sebastien Jodogne <s.jodo...@gmail.com>, University 
Hospital of Liege, Belgium
 License: AGPL-3+
 
-Files: Framework/Orthanc/*
+Files: Resources/Orthanc/*
 Copyright: 2012-2016 Sebastien Jodogne <s.jodo...@gmail.com>, University 
Hospital of Liege, Belgium
 License: GPL-3+ with OpenSSL exception
 
-Files: Framework/Orthanc/Resources/ThirdParty/base64/*
+Files: Resources/Orthanc/Resources/ThirdParty/base64/*
 Copyright: 2004-2008 Rene Nyffenegger
 License: zlib
 
-Files: Framework/Orthanc/Resources/ThirdParty/VisualStudio/*
+Files: Resources/Orthanc/Resources/ThirdParty/VisualStudio/*
 Copyright: 2006-2013 Alexander Chemeris
 License: BSD-3-clause
 
diff --git a/debian/patches/cmake b/debian/patches/cmake
index b4855bc..e4ccb4e 100644
--- a/debian/patches/cmake
+++ b/debian/patches/cmake
@@ -2,11 +2,11 @@ Description: Fix the version of the shared library
 Author: Sebastien Jodogne <s.jodo...@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWSI-1.0/ViewerPlugin/CMakeLists.txt
+Index: OrthancWSI-0.2/ViewerPlugin/CMakeLists.txt
 ===
 OrthancWSI-1.0.orig/ViewerPlugin/CMakeLists.txt
-+++ OrthancWSI-1.0/ViewerPlugin/CMakeLists.txt
-@@ -227,9 +227,10 @@ add_library(OrthancWSI SHARED
+--- OrthancWSI-0.2.orig/ViewerPlugin/CMakeLists.txt
 OrthancWSI-0.2/ViewerPlugin/CMakeLists.txt
+@@ -233,9 +233,10 @@ add_library(OrthancWSI SHARED
)
  
  message("Setting the version of the library to ${ORTHANC_WSI_VERSION}")

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc-wsi.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 01/03: fix issue #844835

2016-11-20 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 33bd9ec3408cb7dc91b61813654568a2734e81ed
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Sun Nov 20 15:22:14 2016 +0100

fix issue #844835
---
 debian/changelog | 7 +++
 debian/control   | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 622ce3e..9df0117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+orthanc (1.1.0+dfsg-3) UNRELEASED; urgency=medium
+
+  [ Gert Wollny and Sebastien Jodogne]
+  * Let the dcmtk package take care of importing libssl-dev. Closes: #844835
+
+ -- Sebastien Jodogne <s.jodo...@gmail.com>  Sun, 20 Nov 2016 15:14:12 +0100
+
 orthanc (1.1.0+dfsg-2) unstable; urgency=medium
 
   [ Gianfranco Costamagna and Sebastien Jodogne ]
diff --git a/debian/control b/debian/control
index 3741d90..c56cb89 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: cmake,
libpng-dev,
libpugixml-dev,
libsqlite3-dev,
-   libssl-dev,
libwrap0-dev,
unzip,
uuid-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (e70815e -> 9d0aaf7)

2016-11-20 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  e70815e   Upload to unstable
   new  33bd9ec   fix issue #844835
   new  57de92c   Fix to use the new version of Google Test in Debian
   new  9d0aaf7   Add dependency on lsb-base

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   | 11 +++
 debian/control |  2 +-
 debian/patches/google-test | 48 ++
 debian/patches/series  |  1 +
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/google-test

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 02/03: Fix to use the new version of Google Test in Debian

2016-11-20 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 57de92c2cfd79e7700d2a45925efc6414eff687e
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Sun Nov 20 21:59:56 2016 +0100

Fix to use the new version of Google Test in Debian
---
 debian/changelog   |  3 +++
 debian/patches/google-test | 48 ++
 debian/patches/series  |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9df0117..4da16d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ orthanc (1.1.0+dfsg-3) UNRELEASED; urgency=medium
   [ Gert Wollny and Sebastien Jodogne]
   * Let the dcmtk package take care of importing libssl-dev. Closes: #844835
 
+  [ Sebastien Jodogne ]
+  * Fix to use the new version of Google Test in Debian.
+
  -- Sebastien Jodogne <s.jodo...@gmail.com>  Sun, 20 Nov 2016 15:14:12 +0100
 
 orthanc (1.1.0+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/google-test b/debian/patches/google-test
new file mode 100644
index 000..26d48fa
--- /dev/null
+++ b/debian/patches/google-test
@@ -0,0 +1,48 @@
+Description: Fix to use the new version of Google Test in Debian
+Author: Sebastien Jodogne <s.jodo...@gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.1.0/Resources/CMake/GoogleTestConfiguration.cmake
+===
+--- Orthanc-1.1.0.orig/Resources/CMake/GoogleTestConfiguration.cmake
 Orthanc-1.1.0/Resources/CMake/GoogleTestConfiguration.cmake
+@@ -1,9 +1,26 @@
+ if (USE_GTEST_DEBIAN_SOURCE_PACKAGE)
+-  set(GTEST_SOURCES /usr/src/gtest/src/gtest-all.cc)
+-  include_directories(/usr/src/gtest)
++  find_path(GTEST_DEBIAN_SOURCES_DIR
++NAMES src/gtest-all.cc
++PATHS
++/usr/src/gtest
++/usr/src/googletest/googletest
++PATH_SUFFIXES src
++)
++
++  find_path(GTEST_DEBIAN_INCLUDE_DIR
++NAMES gtest.h
++PATHS
++/usr/include/gtest
++)
+ 
+-  if (NOT EXISTS /usr/include/gtest/gtest.h OR
+-  NOT EXISTS ${GTEST_SOURCES})
++  message("Path to the Debian Google Test sources: 
${GTEST_DEBIAN_SOURCES_DIR}")
++  message("Path to the Debian Google Test includes: 
${GTEST_DEBIAN_INCLUDE_DIR}")
++
++  set(GTEST_SOURCES ${GTEST_DEBIAN_SOURCES_DIR}/src/gtest-all.cc)
++  include_directories(${GTEST_DEBIAN_SOURCES_DIR})
++
++  if (NOT EXISTS ${GTEST_SOURCES} OR
++  NOT EXISTS ${GTEST_DEBIAN_INCLUDE_DIR}/gtest.h)
+ message(FATAL_ERROR "Please install the libgtest-dev package")
+   endif()
+ 
+@@ -28,6 +45,8 @@ elseif (STATIC_BUILD OR NOT USE_SYSTEM_G
+ add_definitions(/D _VARIADIC_MAX=10)
+   endif()
+ 
++  source_group(ThirdParty\\GoogleTest REGULAR_EXPRESSION 
${GTEST_SOURCES_DIR}/.*)
++
+ else()
+   include(FindGTest)
+   if (NOT GTEST_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 2c63196..db9a37c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 cmake-dcmtk
+google-test

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 03/03: Add dependency on lsb-base

2016-11-20 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 9d0aaf7160fe7671a6b901011856c85323926921
Author: jodogne-guest <s.jodo...@gmail.com>
Date:   Sun Nov 20 22:06:20 2016 +0100

Add dependency on lsb-base
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4da16d2..296216e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ orthanc (1.1.0+dfsg-3) UNRELEASED; urgency=medium
 
   [ Sebastien Jodogne ]
   * Fix to use the new version of Google Test in Debian.
+  * Add dependency on lsb-base.
 
  -- Sebastien Jodogne <s.jodo...@gmail.com>  Sun, 20 Nov 2016 15:14:12 +0100
 
diff --git a/debian/control b/debian/control
index c56cb89..16d6a80 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Package: orthanc
 Architecture: any
 Depends: adduser,
  dcmtk,
+lsb-base,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Lightweight, RESTful DICOM server for medical imaging

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] r22964 - in trunk/packages/orthanc-wsi/trunk/debian: . docs

2016-10-28 Thread Sebastien Jodogne

Author: jodogne-guest
Date: 2016-10-28 13:33:39 + (Fri, 28 Oct 2016)
New Revision: 22964

Modified:
   trunk/packages/orthanc-wsi/trunk/debian/control
   trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomToTiff.1
   trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomizer.1
   trunk/packages/orthanc-wsi/trunk/debian/watch
Log:
orthanc-wsi 0.1

Modified: trunk/packages/orthanc-wsi/trunk/debian/control
===
--- trunk/packages/orthanc-wsi/trunk/debian/control 2016-10-28 11:50:50 UTC 
(rev 22963)
+++ trunk/packages/orthanc-wsi/trunk/debian/control 2016-10-28 13:33:39 UTC 
(rev 22964)
@@ -7,6 +7,8 @@
 Build-Depends: cmake,
debhelper (>= 9),
libboost-all-dev,
+   libcurl4-openssl-dev | libcurl4-dev,
+   libdcmtk-dev,
libjpeg-dev,
libjsoncpp-dev,
libopenjp2-7-dev,

Modified: trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomToTiff.1
===
--- trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomToTiff.1
2016-10-28 11:50:50 UTC (rev 22963)
+++ trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomToTiff.1
2016-10-28 13:33:39 UTC (rev 22964)
@@ -37,7 +37,7 @@
 tiles (e.g. "255,0,0")
 .TP
 \fB\-\-reencode\fR arg
-Whether to reencode each tile in JPEG
+Whether to re\-encode each tile in JPEG
 (no transcoding, much slower) (Boolean)
 .TP
 \fB\-\-jpeg\-quality\fR arg
@@ -46,7 +46,7 @@
 Written by Sebastien Jodogne <s.jodo...@gmail.com>
 .SH COPYRIGHT
 Copyright \(co 2012\-2016 Sebastien Jodogne, Medical Physics Department, 
University Hospital of Liege (Belgium)
-Licensing AGPL: GNU AGPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+Licensing AGPL: GNU AGPL version 3 or later 
<http://gnu.org/licenses/agpl.html>.
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.

Modified: trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomizer.1
===
--- trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomizer.1  
2016-10-28 11:50:50 UTC (rev 22963)
+++ trunk/packages/orthanc-wsi/trunk/debian/docs/OrthancWSIDicomizer.1  
2016-10-28 13:33:39 UTC (rev 22964)
@@ -38,7 +38,7 @@
 dataset in JSON format, then exit
 .TP
 \fB\-\-reencode\fR arg
-Whether to reencode each tile (no
+Whether to re\-encode each tile (no
 transcoding, much slower) (Boolean)
 .TP
 \fB\-\-repaint\fR arg
@@ -139,7 +139,7 @@
 Written by Sebastien Jodogne <s.jodo...@gmail.com>
 .SH COPYRIGHT
 Copyright \(co 2012\-2016 Sebastien Jodogne, Medical Physics Department, 
University Hospital of Liege (Belgium)
-Licensing AGPL: GNU AGPL version 3 or later <http://gnu.org/licenses/gpl.html>.
+Licensing AGPL: GNU AGPL version 3 or later 
<http://gnu.org/licenses/agpl.html>.
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.

Modified: trunk/packages/orthanc-wsi/trunk/debian/watch
===
--- trunk/packages/orthanc-wsi/trunk/debian/watch   2016-10-28 11:50:50 UTC 
(rev 22963)
+++ trunk/packages/orthanc-wsi/trunk/debian/watch   2016-10-28 13:33:39 UTC 
(rev 22964)
@@ -1,3 +1,3 @@
 version=3
 
opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g,repack,compression=xz"
 \
-http://www.orthanc-server.com/browse.php?path=/wsi 
downloads/get\.php\?path=/wsi/OrthancWSI-(\d\S*)\.tar\.gz
+http://www.orthanc-server.com/browse.php?path=/whole-slide-imaging 
downloads/get\.php\?path=/whole-slide-imaging/OrthancWSI-(\d\S*)\.tar\.gz


___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] 04/04: update configuration files

2016-12-13 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 1c21e13f8ae096ef0d563ff04d488583c17010bb
Author: jodogne-guest 
Date:   Tue Dec 13 20:53:03 2016 +0100

update configuration files
---
 debian/configuration/orthanc.json  | 47 +++---
 debian/docs/Orthanc.1  |  2 +-
 debian/docs/OrthancRecoverCompressedFile.8 |  2 +-
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/debian/configuration/orthanc.json 
b/debian/configuration/orthanc.json
index e185d7a..6dec6e8 100644
--- a/debian/configuration/orthanc.json
+++ b/debian/configuration/orthanc.json
@@ -88,10 +88,11 @@
   "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", "Windows1251", "Arabic", "Greek", "Hebrew", "Thai",
-  // "Japanese", and "Chinese".
+  // "SpecificCharacterSet" DICOM tag, and that is used when answering
+  // C-Find requests (including worklists). The allowed values are
+  // "Ascii", "Utf8", "Latin1", "Latin2", "Latin3", "Latin4",
+  // "Latin5", "Cyrillic", "Windows1251", "Arabic", "Greek", "Hebrew",
+  // "Thai", "Japanese", and "Chinese".
   "DefaultEncoding" : "Latin1",
 
   // The transfer syntaxes that are accepted by Orthanc C-Store SCP
@@ -107,6 +108,11 @@
   // SOP classes (aka. "promiscuous mode")
   "UnknownSopClassAccepted": false,
 
+  // Set the timeout (in seconds) after which the DICOM associations
+  // are closed by the Orthanc SCP (server) if no further DIMSE
+  // command is received from the SCU (client).
+  "DicomScpTimeout" : 30,
+
 
 
   /**
@@ -159,6 +165,11 @@
 // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },
 
+  // The timeout (in seconds) after which the DICOM associations are
+  // considered as closed by the Orthanc SCU (client) if the remote
+  // DICOM SCP (server) does not answer.
+  "DicomScuTimeout" : 10,
+
   // The list of the known Orthanc peers
   "OrthancPeers" : {
 /**
@@ -217,7 +228,8 @@
 
   // Dictionary of symbolic names for the user-defined metadata. Each
   // entry must map an unique string to an unique number between 1024
-  // and 65535.
+  // and 65535. Reserved values:
+  //  - The Orthanc whole-slide imaging plugin uses metadata 4200
   "UserMetadata" : {
 // "Sample" : 1024
   },
@@ -303,18 +315,33 @@
  }
**/
   
-  // If set to "true", Orthanc will handle "SOP Classes in Study"
-  // (0008,0062) in C-FIND requests. This option is turned off by
-  // default, as it requires intensive accesses to the hard drive.
+  // If set to "true", Orthanc will still handle "SOP Classes in
+  // Study" (0008,0062) in C-FIND requests, even if the "SOP Class
+  // UID" metadata is not available in the database (which is the case
+  // if the DB was previously used by Orthanc <= 1.1.0). This option
+  // is turned off by default, as it requires intensive accesses to
+  // the hard drive.
   "AllowFindSopClassesInStudy" : false,
 
+  // If set to "false", Orthanc will not load its default dictionary
+  // of private tags. This might be necessary if you cannot import a
+  // DICOM file encoded using the Implicit VR Endian transfer syntax,
+  // and containing private tags: Such an import error might stem from
+  // a bad dictionary. You can still list your private tags of
+  // interest in the "Dictionary" configuration option below.
+  "LoadPrivateDictionary" : true,
+
   // Register a new tag in the dictionary of DICOM tags that are known
   // to Orthanc. Each line must contain the tag (formatted as 2
   // hexadecimal numbers), the value representation (2 upcase
   // characters), a nickname for the tag, possibly the minimum
-  // multiplicity (> 0 with defaults to 1), and possibly the maximum
-  // multiplicity (0 means arbitrary multiplicity, defaults to 1).
+  // multiplicity (> 0 with defaults to 1), possibly the maximum
+  // multiplicity (0 means arbitrary multiplicity, defaults to 1), and
+  // possibly the Private Creator (for private tags).
   "Dictionary" : {
 // "0014,1020" : [ "DA", "ValidationExpiryDate", 1, 1 ]
+// "00e1,10c2" : [ "UI", "PET-CT Multi Modality Name", 1, 1, "ELSCINT1" ]
+// "7053,1003" : [ "ST", "Original Image Filename", 1, 1, "Philips PET 
Private Group" ]
+// "2001,5f" : [ "SQ", "StackSequence", 1, 1, "Philips Imaging DD 001" ]
   }
 }
diff --git a/debian/docs/Orthanc.1 b/debian/docs/Orthanc.1
index 02cef59..0562b0f 100644
--- a/debian/docs/Orthanc.1
+++ b/debian/docs/Orthanc.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ORTHANC "1" "June 2016" "Orthanc 1.1.0" "User Commands"
+.TH ORTHANC "1" "December 2016" "Orthanc 1.2.0" "User Commands"
 .SH NAME
 Orthanc \- Lightweight,

[med-svn] [orthanc] 02/04: Merge tag 'upstream/1.2.0+dfsg'

2016-12-13 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 5a904195a9903d2e5749e50022c9d83d4828007e
Merge: 378c38b 2fdcb05
Author: jodogne-guest 
Date:   Tue Dec 13 20:39:42 2016 +0100

Merge tag 'upstream/1.2.0+dfsg'

Upstream version 1.2.0+dfsg

 .hg_archival.txt   |6 +-
 CMakeLists.txt |   41 +-
 Core/Cache/SharedArchive.cpp   |5 +-
 Core/DicomFormat/DicomArray.h  |2 +-
 Core/DicomFormat/DicomImageInformation.h   |2 +-
 Core/DicomFormat/DicomMap.h|2 +-
 Core/DicomFormat/DicomTag.h|2 +
 Core/DicomFormat/DicomValue.cpp|2 +-
 Core/DicomFormat/DicomValue.h  |7 +-
 Core/Enumerations.cpp  |   20 +-
 Core/Enumerations.h|8 +-
 Core/FileStorage/FilesystemStorage.cpp |   66 +-
 Core/FileStorage/FilesystemStorage.h   |2 +-
 Core/FileStorage/StorageAccessor.cpp   |4 +-
 Core/HttpClient.cpp|   84 +-
 Core/HttpClient.h  |   24 +
 Core/HttpServer/FilesystemHttpHandler.cpp  |5 +-
 Core/HttpServer/FilesystemHttpSender.h |4 +-
 Core/HttpServer/HttpOutput.cpp |3 +-
 Core/HttpServer/HttpOutput.h   |9 +-
 Core/HttpServer/HttpStreamTranscoder.h |1 +
 Core/HttpServer/IHttpHandler.h |2 +-
 Core/HttpServer/MongooseServer.cpp |  153 +-
 Core/Images/Font.cpp   |3 +-
 Core/{Pkcs11.h => Images/IImageWriter.cpp} |   30 +-
 Core/Images/IImageWriter.h |   16 +-
 .../Semaphore.cpp => Images/Image.cpp} |   38 +-
 Core/Images/Image.h|   10 +-
 Core/Images/ImageAccessor.cpp  |   18 +
 Core/Images/ImageAccessor.h|2 +
 Core/Images/ImageBuffer.cpp|   14 +-
 Core/Images/ImageBuffer.h  |5 +-
 Core/Images/ImageProcessing.cpp|   76 +
 Core/Images/ImageProcessing.h  |6 +
 Core/Images/JpegReader.cpp |   14 +-
 Core/Images/JpegReader.h   |6 +
 Core/Images/JpegWriter.cpp |   11 +-
 Core/Images/JpegWriter.h   |2 +
 Core/Images/PngReader.cpp  |   11 +-
 Core/Images/PngReader.h|6 +
 Core/Images/PngWriter.cpp  |9 +-
 Core/Images/PngWriter.h|2 +
 Core/Logging.cpp   |  197 +-
 Core/Logging.h |   16 +
 Core/Lua/LuaContext.cpp|4 +
 Core/Lua/LuaFunctionCall.cpp   |   22 +
 Core/Lua/LuaFunctionCall.h |7 +
 Core/MultiThreading/BagOfTasksProcessor.cpp|   41 +-
 Core/MultiThreading/BagOfTasksProcessor.h  |   13 +-
 Core/MultiThreading/ReaderWriterLock.cpp   |5 +-
 Core/MultiThreading/RunnableWorkersPool.cpp|   26 +-
 Core/MultiThreading/RunnableWorkersPool.h  |2 +-
 Core/MultiThreading/Semaphore.cpp  |4 -
 Core/MultiThreading/Semaphore.h|   18 +
 Core/MultiThreading/SharedMessageQueue.cpp |   20 +
 Core/MultiThreading/SharedMessageQueue.h   |2 +
 Core/OrthancException.h|2 +-
 Core/Pkcs11.cpp|   12 +-
 Core/Pkcs11.h  |   18 +-
 Core/PrecompiledHeaders.h  |3 +-
 Core/RestApi/RestApi.cpp   |2 +-
 Core/RestApi/RestApiOutput.cpp |7 +-
 Core/SystemToolbox.cpp |  539 
 Core/{OrthancException.h => SystemToolbox.h}   |   98 +-
 Core/{Uuid.h => TemporaryFile.cpp} |   82 +-
 Core/{Images/JpegReader.h => TemporaryFile.h}  |   31 +-
 Core/Toolbox.cpp   |  641 ++---
 Core/Toolbox.h |  105 +-
 Core/Uuid.cpp  |  162 --
 Core/WebServiceParameters.cpp  |   12 +-
 Core/WebServiceParameters.h|6 +
 DarwinCompilation.txt  |6 +-
 INSTALL|   15 +-
 LinuxCompilation.txt   |   43 +-
 NEWS   |

[med-svn] [orthanc] 01/01: pristine-tar data for orthanc_1.2.0+dfsg.orig.tar.xz

2016-12-13 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a commit to branch pristine-tar
in repository orthanc.

commit 1362f35bda19a46bfde21205728703a4f18a6499
Author: jodogne-guest 
Date:   Tue Dec 13 20:39:41 2016 +0100

pristine-tar data for orthanc_1.2.0+dfsg.orig.tar.xz
---
 orthanc_1.2.0+dfsg.orig.tar.xz.delta | Bin 0 -> 18970 bytes
 orthanc_1.2.0+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/orthanc_1.2.0+dfsg.orig.tar.xz.delta 
b/orthanc_1.2.0+dfsg.orig.tar.xz.delta
new file mode 100644
index 000..dd5771b
Binary files /dev/null and b/orthanc_1.2.0+dfsg.orig.tar.xz.delta differ
diff --git a/orthanc_1.2.0+dfsg.orig.tar.xz.id 
b/orthanc_1.2.0+dfsg.orig.tar.xz.id
new file mode 100644
index 000..4069f8a
--- /dev/null
+++ b/orthanc_1.2.0+dfsg.orig.tar.xz.id
@@ -0,0 +1 @@
+346c2fda23339a54d3013f480d8e8b207063cc8b

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

[med-svn] [orthanc] branch master updated (378c38b -> 1c21e13)

2016-12-13 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch master
in repository orthanc.

  from  378c38b   Upload to unstable
   new  2fdcb05   New upstream version 1.2.0+dfsg
   new  5a90419   Merge tag 'upstream/1.2.0+dfsg'
   new  3d34565   preparing for 1.2.0+dfsg-1
   new  1c21e13   update configuration files

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |6 +-
 CMakeLists.txt |   41 +-
 Core/Cache/SharedArchive.cpp   |5 +-
 Core/DicomFormat/DicomArray.h  |2 +-
 Core/DicomFormat/DicomImageInformation.h   |2 +-
 Core/DicomFormat/DicomMap.h|2 +-
 Core/DicomFormat/DicomTag.h|2 +
 Core/DicomFormat/DicomValue.cpp|2 +-
 Core/DicomFormat/DicomValue.h  |7 +-
 Core/Enumerations.cpp  |   20 +-
 Core/Enumerations.h|8 +-
 Core/FileStorage/FilesystemStorage.cpp |   66 +-
 Core/FileStorage/FilesystemStorage.h   |2 +-
 Core/FileStorage/StorageAccessor.cpp   |4 +-
 Core/HttpClient.cpp|   84 +-
 Core/HttpClient.h  |   24 +
 Core/HttpServer/FilesystemHttpHandler.cpp  |5 +-
 Core/HttpServer/FilesystemHttpSender.h |4 +-
 Core/HttpServer/HttpOutput.cpp |3 +-
 Core/HttpServer/HttpOutput.h   |9 +-
 Core/HttpServer/HttpStreamTranscoder.h |1 +
 Core/HttpServer/IHttpHandler.h |2 +-
 Core/HttpServer/MongooseServer.cpp |  153 +-
 Core/Images/Font.cpp   |3 +-
 Core/{Pkcs11.h => Images/IImageWriter.cpp} |   30 +-
 Core/Images/IImageWriter.h |   16 +-
 Core/{Cache/MemoryCache.h => Images/Image.cpp} |   43 +-
 Core/Images/Image.h|   10 +-
 Core/Images/ImageAccessor.cpp  |   18 +
 Core/Images/ImageAccessor.h|2 +
 Core/Images/ImageBuffer.cpp|   14 +-
 Core/Images/ImageBuffer.h  |5 +-
 Core/Images/ImageProcessing.cpp|   76 +
 Core/Images/ImageProcessing.h  |6 +
 Core/Images/JpegReader.cpp |   14 +-
 Core/Images/JpegReader.h   |6 +
 Core/Images/JpegWriter.cpp |   11 +-
 Core/Images/JpegWriter.h   |2 +
 Core/Images/PngReader.cpp  |   11 +-
 Core/Images/PngReader.h|6 +
 Core/Images/PngWriter.cpp  |9 +-
 Core/Images/PngWriter.h|2 +
 Core/Logging.cpp   |  197 +-
 Core/Logging.h |   16 +
 Core/Lua/LuaContext.cpp|4 +
 Core/Lua/LuaFunctionCall.cpp   |   22 +
 Core/Lua/LuaFunctionCall.h |7 +
 Core/MultiThreading/BagOfTasksProcessor.cpp|   41 +-
 Core/MultiThreading/BagOfTasksProcessor.h  |   13 +-
 Core/MultiThreading/ReaderWriterLock.cpp   |5 +-
 Core/MultiThreading/RunnableWorkersPool.cpp|   26 +-
 Core/MultiThreading/RunnableWorkersPool.h  |2 +-
 Core/MultiThreading/Semaphore.cpp  |4 -
 Core/MultiThreading/Semaphore.h|   18 +
 Core/MultiThreading/SharedMessageQueue.cpp |   20 +
 Core/MultiThreading/SharedMessageQueue.h   |2 +
 Core/OrthancException.h|2 +-
 Core/Pkcs11.cpp|   12 +-
 Core/Pkcs11.h  |   18 +-
 Core/PrecompiledHeaders.h  |3 +-
 Core/RestApi/RestApi.cpp   |2 +-
 Core/RestApi/RestApiOutput.cpp |7 +-
 Core/SystemToolbox.cpp |  539 
 Core/{Uuid.h => SystemToolbox.h}   |   86 +-
 Core/{ChunkedBuffer.cpp => TemporaryFile.cpp}  |   78 +-
 Core/{ChunkedBuffer.h => TemporaryFile.h}  |   39 +-
 Core/Toolbox.cpp   |  641 ++---
 Core/Toolbox.h |  105 +-
 Core/Uuid.cpp  |  162 --
 Core/WebServiceParameters.cpp  |   12 +-
 Core/WebServiceParameters.h

[med-svn] [orthanc] branch upstream updated (d00e231 -> 2fdcb05)

2016-12-13 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch upstream
in repository orthanc.

  from  d00e231   Imported Upstream version 1.1.0+dfsg
   new  2fdcb05   New upstream version 1.2.0+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .hg_archival.txt   |6 +-
 CMakeLists.txt |   41 +-
 Core/Cache/SharedArchive.cpp   |5 +-
 Core/DicomFormat/DicomArray.h  |2 +-
 Core/DicomFormat/DicomImageInformation.h   |2 +-
 Core/DicomFormat/DicomMap.h|2 +-
 Core/DicomFormat/DicomTag.h|2 +
 Core/DicomFormat/DicomValue.cpp|2 +-
 Core/DicomFormat/DicomValue.h  |7 +-
 Core/Enumerations.cpp  |   20 +-
 Core/Enumerations.h|8 +-
 Core/FileStorage/FilesystemStorage.cpp |   66 +-
 Core/FileStorage/FilesystemStorage.h   |2 +-
 Core/FileStorage/StorageAccessor.cpp   |4 +-
 Core/HttpClient.cpp|   84 +-
 Core/HttpClient.h  |   24 +
 Core/HttpServer/FilesystemHttpHandler.cpp  |5 +-
 Core/HttpServer/FilesystemHttpSender.h |4 +-
 Core/HttpServer/HttpOutput.cpp |3 +-
 Core/HttpServer/HttpOutput.h   |9 +-
 Core/HttpServer/HttpStreamTranscoder.h |1 +
 Core/HttpServer/IHttpHandler.h |2 +-
 Core/HttpServer/MongooseServer.cpp |  153 +-
 Core/Images/Font.cpp   |3 +-
 Core/{Pkcs11.h => Images/IImageWriter.cpp} |   30 +-
 Core/Images/IImageWriter.h |   16 +-
 Core/{Cache/MemoryCache.h => Images/Image.cpp} |   43 +-
 Core/Images/Image.h|   10 +-
 Core/Images/ImageAccessor.cpp  |   18 +
 Core/Images/ImageAccessor.h|2 +
 Core/Images/ImageBuffer.cpp|   14 +-
 Core/Images/ImageBuffer.h  |5 +-
 Core/Images/ImageProcessing.cpp|   76 +
 Core/Images/ImageProcessing.h  |6 +
 Core/Images/JpegReader.cpp |   14 +-
 Core/Images/JpegReader.h   |6 +
 Core/Images/JpegWriter.cpp |   11 +-
 Core/Images/JpegWriter.h   |2 +
 Core/Images/PngReader.cpp  |   11 +-
 Core/Images/PngReader.h|6 +
 Core/Images/PngWriter.cpp  |9 +-
 Core/Images/PngWriter.h|2 +
 Core/Logging.cpp   |  197 +-
 Core/Logging.h |   16 +
 Core/Lua/LuaContext.cpp|4 +
 Core/Lua/LuaFunctionCall.cpp   |   22 +
 Core/Lua/LuaFunctionCall.h |7 +
 Core/MultiThreading/BagOfTasksProcessor.cpp|   41 +-
 Core/MultiThreading/BagOfTasksProcessor.h  |   13 +-
 Core/MultiThreading/ReaderWriterLock.cpp   |5 +-
 Core/MultiThreading/RunnableWorkersPool.cpp|   26 +-
 Core/MultiThreading/RunnableWorkersPool.h  |2 +-
 Core/MultiThreading/Semaphore.cpp  |4 -
 Core/MultiThreading/Semaphore.h|   18 +
 Core/MultiThreading/SharedMessageQueue.cpp |   20 +
 Core/MultiThreading/SharedMessageQueue.h   |2 +
 Core/OrthancException.h|2 +-
 Core/Pkcs11.cpp|   12 +-
 Core/Pkcs11.h  |   18 +-
 Core/PrecompiledHeaders.h  |3 +-
 Core/RestApi/RestApi.cpp   |2 +-
 Core/RestApi/RestApiOutput.cpp |7 +-
 Core/SystemToolbox.cpp |  539 
 Core/{Uuid.h => SystemToolbox.h}   |   86 +-
 Core/{ChunkedBuffer.cpp => TemporaryFile.cpp}  |   78 +-
 Core/{ChunkedBuffer.h => TemporaryFile.h}  |   39 +-
 Core/Toolbox.cpp   |  641 ++---
 Core/Toolbox.h |  105 +-
 Core/Uuid.cpp  |  162 --
 Core/WebServiceParameters.cpp  |   12 +-
 Core/WebServiceParameters.h|6 +
 DarwinCompilation.txt  |6 +-
 INSTALL

[med-svn] [orthanc] branch pristine-tar updated (05c4f53 -> 1362f35)

2016-12-13 Thread Sebastien Jodogne

This is an automated email from the git hooks/post-receive script.

jodogne-guest pushed a change to branch pristine-tar
in repository orthanc.

  from  05c4f53   pristine-tar data for orthanc_1.1.0+dfsg.orig.tar.xz
   new  1362f35   pristine-tar data for orthanc_1.2.0+dfsg.orig.tar.xz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 orthanc_1.2.0+dfsg.orig.tar.xz.delta | Bin 0 -> 18970 bytes
 orthanc_1.2.0+dfsg.orig.tar.xz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 orthanc_1.2.0+dfsg.orig.tar.xz.delta
 create mode 100644 orthanc_1.2.0+dfsg.orig.tar.xz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/orthanc.git

___
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

< 1 2 3 4 5 6 7 8 9 >

101 - 200 of 804 matches

Mail list logo