[med-svn] [orthanc] 03/04: preparing for 1.2.0+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.

commit 3d345659cb7f975c391a14411aca3d7808e54f43
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Tue Dec 13 20:41:49 2016 +0100

    preparing for 1.2.0+dfsg-1
---
 debian/changelog           |  6 ++++++
 debian/patches/cmake-dcmtk | 18 -----------------
 debian/patches/google-test | 48 ----------------------------------------------
 debian/patches/series      |  2 --
 4 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 099a7a3..1d46fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.2.0+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Tue, 13 Dec 2016 20:39:57 +0100
+
 orthanc (1.1.0+dfsg-3) unstable; urgency=medium
 
   [ Gert Wollny and Sebastien Jodogne]
diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk
deleted file mode 100644
index ba010f2..0000000
--- a/debian/patches/cmake-dcmtk
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix for cmake to find new versions of dcmtk
-Author: Sebastien Jodogne <s.jodogne at 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.000000000 +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/google-test b/debian/patches/google-test
deleted file mode 100644
index 26d48fa..0000000
--- a/debian/patches/google-test
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix to use the new version of Google Test in Debian
-Author: Sebastien Jodogne <s.jodogne at 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 db9a37c..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-cmake-dcmtk
-google-test

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