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

Fri Oct 26 15:04:55 UTC 2012

Author: jodogne-guest
Date: 2012-10-26 15:04:55 +0000 (Fri, 26 Oct 2012)
New Revision: 12469

Removed:
   trunk/packages/orthanc/trunk/debian/patches/
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/rules
Log:
new upstream version (0.2.3)

Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================

--- trunk/packages/orthanc/trunk/debian/changelog	2012-10-26 08:35:21 UTC (rev 12468)
+++ trunk/packages/orthanc/trunk/debian/changelog	2012-10-26 15:04:55 UTC (rev 12469)
@@ -1,3 +1,9 @@
+orthanc (0.2.3-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 26 Oct 2012 16:35:11 +0200
+
 orthanc (0.2.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #689029)

Modified: trunk/packages/orthanc/trunk/debian/configuration/orthanc.json
===================================================================
--- trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2012-10-26 08:35:21 UTC (rev 12468)
+++ trunk/packages/orthanc/trunk/debian/configuration/orthanc.json	2012-10-26 15:04:55 UTC (rev 12469)
@@ -4,10 +4,14 @@
      **/
 
     // Path to the directory that holds the database
-    "StorageDirectory" : "/var/lib/orthanc/0.2.2",
+    "StorageDirectory" : "/var/lib/orthanc/0.2.3",
 
+    // The logical name of this instance of Orthanc. This one is
+    // displayed in Orthanc Explorer and at the URI "/system".
+    "Name" : "Orthanc",
 
 
+
     /**
      * Configuration of the HTTP server
      **/

Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control	2012-10-26 08:35:21 UTC (rev 12468)
+++ trunk/packages/orthanc/trunk/debian/control	2012-10-26 15:04:55 UTC (rev 12469)
@@ -5,7 +5,7 @@
 Priority: optional
 Standards-Version: 3.9.3
 Homepage: https://code.google.com/p/orthanc/
-Build-Depends: debhelper (>= 9), cmake (>= 2.8), initscripts (>= 2.88dsf-13.3), unzip, uuid-dev, libssl-dev, zlib1g-dev, libpng-dev, libboost-all-dev, libwrap0-dev, libgoogle-glog-dev, libcurl4-openssl-dev | libcurl4-dev, libdcmtk2-dev, libsqlite3-dev, libjsoncpp-dev
+Build-Depends: debhelper (>= 9), cmake (>= 2.8), initscripts (>= 2.88dsf-13.3), unzip, uuid-dev, libssl-dev, zlib1g-dev, libpng-dev, libboost-all-dev, libwrap0-dev, libgoogle-glog-dev, libcurl4-openssl-dev | libcurl4-dev, libdcmtk2-dev, libsqlite3-dev, libjsoncpp-dev, libgtest-dev
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/orthanc/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/orthanc/trunk/
 

Modified: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2012-10-26 08:35:21 UTC (rev 12468)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2012-10-26 15:04:55 UTC (rev 12469)
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
-.TH ORTHANC "1" "October 2012" "Orthanc 0.2.2" "User Commands"
+.TH ORTHANC "1" "October 2012" "Orthanc 0.2.3" "User Commands"
 .SH NAME
 Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
 .SH SYNOPSIS
@@ -11,6 +11,30 @@
 If no configuration file is given on the command line, a set of default parameters
 is used. Please refer to the Orthanc homepage for the full instructions about how to use Orthanc
 <https://code.google.com/p/orthanc/wiki/OrthancCookbook>.
+.SS "Command-line options:"
+.TP
+\fB\-\-verbose\fR
+be verbose in logs
+.TP
+\fB\-\-trace\fR
+highest verbosity in logs (for debug)
+.TP
+\fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-\-version\fR
+output version information and exit
+.TP
+\fB\-\-logdir\fR=\fI[dir]\fR
+directory where to store the log files
+(if not used, the logs are dumped to stderr)
+.SS "Exit status:"
+.TP
+0
+if OK,
+.TP
+\fB\-1\fR
+if error (have a look at the logs).
 .SH AUTHOR
 Written by Sebastien Jodogne <s.jodogne at gmail.com>
 .SH COPYRIGHT

Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules	2012-10-26 08:35:21 UTC (rev 12468)
+++ trunk/packages/orthanc/trunk/debian/rules	2012-10-26 15:04:55 UTC (rev 12469)
@@ -4,21 +4,14 @@
 	dh $@ --parallel --builddirectory=Build
 
 override_dh_auto_configure:
-	# This fixes an error in the case of two filenames
-	if [ -f $(CURDIR)/OrthancExplorer/libs/jquery.blockUI.js ]; then \
-		mv $(CURDIR)/OrthancExplorer/libs/jquery.blockUI.js \
-		$(CURDIR)/OrthancExplorer/libs/jquery.blockui.js; \
-	fi
-	if [ -f $(CURDIR)/OrthancExplorer/images/Unsupported.png ]; then \
-		mv $(CURDIR)/OrthancExplorer/images/Unsupported.png \
-		$(CURDIR)/OrthancExplorer/images/unsupported.png; \
-	fi
-
 	# Put 3rd party packages where the cmake build system expects them
 	mkdir -p ThirdPartyDownloads
 	( cd ThirdPartyDownloads; cp ../debian/ThirdPartyDownloads/* . )
-	dh_auto_configure -- -DDEBIAN_HARDENING:BOOL=ON -DSTATIC_BUILD=OFF -DSTANDALONE_BUILD=ON -DBUILD_UNIT_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DUSE_DYNAMIC_JSONCPP=1
+	dh_auto_configure -- -DSTATIC_BUILD:BOOL=OFF -DSTANDALONE_BUILD:BOOL=ON -DUSE_DYNAMIC_JSONCPP:BOOL=ON -DDEBIAN_USE_GTEST_SOURCE_PACKAGE:BOOL=ON -DCMAKE_BUILD_TYPE=Release
 
+override_dh_auto_test:
+	( cd $(CURDIR)/Build; ./UnitTests )
+
 override_dh_clean:
 	rm -rf ThirdPartyDownloads
 


