[med-svn] r15408 - in trunk/packages/orthanc/trunk/debian: . configuration docs patches

Sebastien Jodogne jodogne-guest at moszumanska.debian.org
Tue Dec 3 11:32:02 UTC 2013


Author: jodogne-guest
Date: 2013-12-03 11:32:02 +0000 (Tue, 03 Dec 2013)
New Revision: 15408

Added:
   trunk/packages/orthanc/trunk/debian/liborthancclient0.7.README.Debian
   trunk/packages/orthanc/trunk/debian/liborthancclient0.7.install
Removed:
   trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian
   trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install
   trunk/packages/orthanc/trunk/debian/patches/soname
Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
   trunk/packages/orthanc/trunk/debian/control
   trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
   trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery
   trunk/packages/orthanc/trunk/debian/patches/series
   trunk/packages/orthanc/trunk/debian/rules
Log:
preparing for new upstream version

Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/changelog	2013-12-03 11:32:02 UTC (rev 15408)
@@ -1,3 +1,10 @@
+orthanc (0.7.2-1) UNRELEASED; urgency=low
+
+  * New upstream version: 0.7.2
+  * Support big-endian architectures. Closes: #728822
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Tue, 03 Dec 2013 11:30:41 +0100
+
 orthanc (0.6.2-1) unstable; urgency=low
 
   [ Sebastien Jodogne ]

Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2013-12-03 11:32:02 UTC (rev 15408)
@@ -100,8 +100,8 @@
     /**
      * A fourth parameter is available to enable patches for a
      * specific PACS manufacturer. The allowed values are currently
-     * "Generic" (default value) and "ClearCanvas". This parameter is
-     * case-sensitive.
+     * "Generic" (default value), "ClearCanvas" and "MedInria". This
+     * parameter is case-sensitive.
      **/
     // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },

Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/control	2013-12-03 11:32:02 UTC (rev 15408)
@@ -45,7 +45,7 @@
  Orthanc lets its users focus on the content of the DICOM files,
  hiding the complexity of the DICOM format and of the DICOM protocol.
 
-Package: liborthancclient0.6
+Package: liborthancclient0.7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -59,7 +59,7 @@
 Package: liborthancclient-dev
 Architecture: any
 Section: libdevel
-Depends: liborthancclient0.6 (= ${binary:Version}), ${misc:Depends}
+Depends: liborthancclient0.7 (= ${binary:Version}), ${misc:Depends}
 Description: Orthanc Client development files
  Orthanc Client is a library to access the content of a remote
  instance of Orthanc. Orthanc is a lightweight, RESTful DICOM server

Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2013-12-03 11:32:02 UTC (rev 15408)
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH ORTHANC "1" "October 2013" "Orthanc 0.6.2" "User Commands"
+.TH ORTHANC "1" "December 2013" "Orthanc 0.7.2" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
 .SH SYNOPSIS

Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian	2013-12-03 11:32:02 UTC (rev 15408)
@@ -1,2 +0,0 @@
-This is the "Orthanc Client" library to access the content of a remote
-instance of Orthanc from third-party code.

Deleted: trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install	2013-12-03 11:32:02 UTC (rev 15408)
@@ -1 +0,0 @@
-usr/lib/libOrthancClient.so.*

Copied: trunk/packages/orthanc/trunk/debian/liborthancclient0.7.README.Debian (from rev 15405, trunk/packages/orthanc/trunk/debian/liborthancclient0.6.README.Debian)
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.7.README.Debian	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.7.README.Debian	2013-12-03 11:32:02 UTC (rev 15408)
@@ -0,0 +1,2 @@
+This is the "Orthanc Client" library to access the content of a remote
+instance of Orthanc from third-party code.

Copied: trunk/packages/orthanc/trunk/debian/liborthancclient0.7.install (from rev 15405, trunk/packages/orthanc/trunk/debian/liborthancclient0.6.install)
===================================================================
--- trunk/packages/orthanc/trunk/debian/liborthancclient0.7.install	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/liborthancclient0.7.install	2013-12-03 11:32:02 UTC (rev 15408)
@@ -0,0 +1 @@
+usr/lib/libOrthancClient.so.*

Modified: trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/patches/doxygen-jquery	2013-12-03 11:32:02 UTC (rev 15408)
@@ -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: Orthanc-0.6.2/Resources/OrthancClient.doxygen
+Index: Orthanc-0.7.2/Resources/OrthancClient.doxygen
 ===================================================================
---- Orthanc-0.6.2.orig/Resources/OrthancClient.doxygen	2013-10-04 16:33:53.000000000 +0200
-+++ Orthanc-0.6.2/Resources/OrthancClient.doxygen	2013-10-07 14:39:36.403680209 +0200
-@@ -1141,7 +1141,7 @@
+--- Orthanc-0.7.2.orig/Resources/OrthancClient.doxygen	2013-11-08 16:08:14.000000000 +0100
++++ Orthanc-0.7.2/Resources/OrthancClient.doxygen	2013-12-03 12:02:07.153131137 +0100
+@@ -1197,7 +1197,7 @@
  # typically be disabled. For large projects the javascript based search engine
  # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
  

Modified: trunk/packages/orthanc/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/series	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/patches/series	2013-12-03 11:32:02 UTC (rev 15408)
@@ -1,2 +1,2 @@
 doxygen-jquery
-soname
+

Deleted: trunk/packages/orthanc/trunk/debian/patches/soname
===================================================================
--- trunk/packages/orthanc/trunk/debian/patches/soname	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/patches/soname	2013-12-03 11:32:02 UTC (rev 15408)
@@ -1,59 +0,0 @@
-Description: Patch to include the proper SONAME in the Orthanc Client library
-Author: Sebastien Jodogne <s.jodogne at gmail.com>
-Origin: upstream
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: Orthanc-0.6.2/CMakeLists.txt
-===================================================================
---- Orthanc-0.6.2.orig/CMakeLists.txt	2013-10-04 16:33:53.000000000 +0200
-+++ Orthanc-0.6.2/CMakeLists.txt	2013-10-07 12:43:30.879856165 +0200
-@@ -3,9 +3,7 @@
- project(Orthanc)
- 
- # Version of the build, should always be "mainline" except in release branches
--add_definitions(
--  -DORTHANC_VERSION="0.6.2"
--  )
-+set(ORTHANC_VERSION "0.6.2")
- 
- 
- #####################################################################
-@@ -120,6 +118,10 @@
- ## Build the core of Orthanc
- #####################################################################
- 
-+add_definitions(
-+  -DORTHANC_VERSION="${ORTHANC_VERSION}"
-+  )
-+
- list(LENGTH OPENSSL_SOURCES OPENSSL_SOURCES_LENGTH)
- if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
-   add_library(OpenSSL STATIC ${OPENSSL_SOURCES})
-@@ -337,6 +339,18 @@
-     message(FATAL_ERROR "Support your platform here")
-   endif()
- 
-+
-+  # Set the version of the shared library for releases
-+  string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" ORTHANC_IS_RELEASE ${ORTHANC_VERSION})
-+  if (ORTHANC_IS_RELEASE)
-+    string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\1.\\2" ORTHANC_RELEASE ${ORTHANC_VERSION})
-+    message("This is a release build, setting the version of the library to ${ORTHANC_RELEASE}")
-+    set_target_properties(OrthancClient PROPERTIES VERSION ${ORTHANC_RELEASE} SOVERSION ${ORTHANC_RELEASE})
-+  else()
-+    message("This is not a release build")
-+  endif()
-+
-+
-   install(
-     TARGETS OrthancClient
-     RUNTIME DESTINATION lib    # Destination for Windows
-@@ -350,6 +364,8 @@
- endif()
- 
- 
-+        
-+
- #####################################################################
- ## Generate the documentation if Doxygen is present
- #####################################################################

Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules	2013-12-03 10:49:03 UTC (rev 15407)
+++ trunk/packages/orthanc/trunk/debian/rules	2013-12-03 11:32:02 UTC (rev 15408)
@@ -10,10 +10,8 @@
 	-DCMAKE_SKIP_RPATH=ON \
 	-DSTATIC_BUILD:BOOL=OFF \
 	-DSTANDALONE_BUILD:BOOL=ON \
-	-DUSE_DYNAMIC_JSONCPP:BOOL=ON \
-	-DUSE_DYNAMIC_LUA:BOOL=ON \
-	-DUSE_DYNAMIC_MONGOOSE:BOOL=OFF \
-	-DDEBIAN_USE_GTEST_SOURCE_PACKAGE:BOOL=ON \
+	-DUSE_SYSTEM_MONGOOSE:BOOL=OFF \
+	-DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \
 	-DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk2 \
 	-DCMAKE_BUILD_TYPE=""   # The build type must be left empty, see #711515
 




More information about the debian-med-commit mailing list