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

[Andreas Tille]

Author: tille
Date: 2014-10-13 11:52:52 +0000 (Mon, 13 Oct 2014)
New Revision: 18274

Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk
   trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
Log:
Addapted to new upstream version - please test!


Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog	2014-10-11 16:14:07 UTC (rev 18273)
+++ trunk/packages/orthanc/trunk/debian/changelog	2014-10-13 11:52:52 UTC (rev 18274)
@@ -1,3 +1,9 @@
+orthanc (0.8.4+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Andreas Tille <tille at debian.org>  Mon, 13 Oct 2014 11:50:53 +0200
+
 orthanc (0.8.3+dfsg-1) unstable; urgency=medium
 
   * New upstream version: 0.8.3

Modified: trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk	2014-10-11 16:14:07 UTC (rev 18273)
+++ trunk/packages/orthanc/trunk/debian/patches/install-plugin-sdk	2014-10-13 11:52:52 UTC (rev 18274)
@@ -2,52 +2,14 @@
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.8.3/CMakeLists.txt
-===================================================================
---- Orthanc-0.8.3.orig/CMakeLists.txt	2014-09-11 16:07:31.000000000 +0200
-+++ Orthanc-0.8.3/CMakeLists.txt	2014-09-12 15:15:41.324023583 +0200
-@@ -3,7 +3,7 @@
+--- 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.8.3")
+-set(ORTHANC_VERSION "0.8.4")
 +set(ORTHANC_VERSION "mainline")
  
  
  #####################################################################
-@@ -476,7 +476,9 @@
-     )
- 
-   install(
--    FILES ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h 
-+    FILES
-+    ${ORTHANC_ROOT}/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h 
-+    ${ORTHANC_ROOT}/Plugins/OrthancCPlugin/OrthancCPlugin.h 
-     DESTINATION include/orthanc
-     )
- endif()
-@@ -502,12 +504,21 @@
- 
-   add_custom_target(doc
-     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen
--    COMMAND
--    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "Generating internal documentation with Doxygen" VERBATIM
-     )
- 
-+  add_custom_command(TARGET Orthanc
-+    POST_BUILD
-+    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+    COMMENT "Generating plugin documentation with Doxygen" VERBATIM
-+    )
-+
-+  install(
-+    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/OrthancPluginDocumentation/doc/
-+    DESTINATION share/doc/orthanc/OrthancPlugin
-+    )
-+
-   if (BUILD_CLIENT_LIBRARY)
-     configure_file(
-       ${CMAKE_SOURCE_DIR}/Resources/OrthancClient.doxygen

Modified: trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version	2014-10-11 16:14:07 UTC (rev 18273)
+++ trunk/packages/orthanc/trunk/debian/patches/remove-jquery-version	2014-10-13 11:52:52 UTC (rev 18274)
@@ -2,10 +2,8 @@
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.8.3/OrthancExplorer/explorer.html
-===================================================================
---- Orthanc-0.8.3.orig/OrthancExplorer/explorer.html
-+++ Orthanc-0.8.3/OrthancExplorer/explorer.html
+--- a/OrthancExplorer/explorer.html
++++ b/OrthancExplorer/explorer.html
 @@ -6,15 +6,15 @@
      <meta name="viewport" content="width=device-width, initial-scale=1">
      <title>Orthanc Explorer</title>