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

[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.jodogne at 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.jodogne at 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