[med-svn] [orthanc] 03/03: preparing for 1.3.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 9852e57fa38f30e4d3ed40f725db2bf8390e454c
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Thu Jul 20 08:53:19 2017 +0200

    preparing for 1.3.0+dfsg-1
---
 debian/changelog               |  6 ++++++
 debian/patches/fix-dcmtk-3.6.1 | 44 ---------------------------------------
 debian/patches/series          |  2 --
 debian/patches/sqlite          | 47 ------------------------------------------
 4 files changed, 6 insertions(+), 93 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1acf188..94bd2d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.3.0+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Thu, 20 Jul 2017 08:52:24 +0200
+
 orthanc (1.2.0+dfsg-3) unstable; urgency=medium
 
   * Fix FTBFS with libsqlite3-dev >= 3.19.0. Closes: #867782
diff --git a/debian/patches/fix-dcmtk-3.6.1 b/debian/patches/fix-dcmtk-3.6.1
deleted file mode 100644
index 6e9bc3f..0000000
--- a/debian/patches/fix-dcmtk-3.6.1
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Fix FTBFS with libdcmtk-dev 3.6.1~20170228-2
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-1.2.0/OrthancServer/FromDcmtkBridge.cpp
-===================================================================
---- Orthanc-1.2.0.orig/OrthancServer/FromDcmtkBridge.cpp
-+++ Orthanc-1.2.0/OrthancServer/FromDcmtkBridge.cpp
-@@ -1680,7 +1680,7 @@ namespace Orthanc
-           throw OrthancException(ErrorCode_BadParameterType);
-         }
- 
--        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size());
-+        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key);
-         element.reset(sequence);
-         
-         for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
-Index: Orthanc-1.2.0/Resources/CMake/DcmtkConfiguration.cmake
-===================================================================
---- Orthanc-1.2.0.orig/Resources/CMake/DcmtkConfiguration.cmake
-+++ Orthanc-1.2.0/Resources/CMake/DcmtkConfiguration.cmake
-@@ -270,6 +270,8 @@ else()
-     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")
-+  elseif (EXISTS "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h")  # This is for Debian Buster
-+    set(DCMTK_CONFIGURATION_FILE "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h")
-   else()
-     message(FATAL_ERROR "Please install libdcmtk*-dev")
-   endif()
-@@ -309,6 +311,13 @@ if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES)
-       /usr/share/libdcmtk7
-       /usr/share/libdcmtk8
-       /usr/share/libdcmtk9
-+      /usr/share/libdcmtk10
-+      /usr/share/libdcmtk11
-+      /usr/share/libdcmtk12
-+      /usr/share/libdcmtk13
-+      /usr/share/libdcmtk14
-+      /usr/share/libdcmtk15
-+      /usr/share/libdcmtk16
-       /usr/local/share/dcmtk
-       )
- 
diff --git a/debian/patches/series b/debian/patches/series
index 00d5d53..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix-dcmtk-3.6.1
-sqlite
diff --git a/debian/patches/sqlite b/debian/patches/sqlite
deleted file mode 100644
index 7f40ba1..0000000
--- a/debian/patches/sqlite
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix FTBFS with libsqlite3-dev 3.19.3-3
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-1.2.0/Core/SQLite/FunctionContext.cpp
-===================================================================
---- Orthanc-1.2.0.orig/Core/SQLite/FunctionContext.cpp
-+++ Orthanc-1.2.0/Core/SQLite/FunctionContext.cpp
-@@ -49,7 +49,7 @@ namespace Orthanc
-   {
-     FunctionContext::FunctionContext(struct sqlite3_context* context,
-                                      int argc,
--                                     struct ::Mem** argv)
-+                                     struct sqlite3_value** argv)
-     {
-       assert(context != NULL);
-       assert(argc >= 0);
-Index: Orthanc-1.2.0/Core/SQLite/FunctionContext.h
-===================================================================
---- Orthanc-1.2.0.orig/Core/SQLite/FunctionContext.h
-+++ Orthanc-1.2.0/Core/SQLite/FunctionContext.h
-@@ -37,7 +37,7 @@
- #include "Statement.h"
- 
- struct sqlite3_context;
--struct Mem;  // This corresponds to the opaque type "sqlite3_value"
-+struct sqlite3_value;
-  
- namespace Orthanc
- {
-@@ -50,14 +50,14 @@ namespace Orthanc
-     private:
-       struct sqlite3_context* context_;
-       unsigned int argc_;
--      struct ::Mem** argv_;
-+      struct sqlite3_value** argv_;
- 
-       void CheckIndex(unsigned int index) const;
- 
-     public:
-       FunctionContext(struct sqlite3_context* context,
-                       int argc,
--                      struct ::Mem** argv);
-+                      struct sqlite3_value** argv);
- 
-       ColumnType GetColumnType(unsigned int index) const;
-  

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