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

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-12-10 14:00:39 +0000 (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.jodogne at 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/control	2015-12-10 13:00:26 UTC (rev 20709)
+++ trunk/packages/orthanc-dicomweb/trunk/debian/control	2015-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.jodogne at 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()