[med-svn] r12378 - in trunk/packages/orthanc/trunk/debian: . docs source

Thu Oct 11 08:22:15 UTC 2012

Author: malat
Date: 2012-10-11 08:22:15 +0000 (Thu, 11 Oct 2012)
New Revision: 12378

Added:
   trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/
   trunk/packages/orthanc/trunk/debian/docs/Orthanc.1
Removed:
   trunk/packages/orthanc/trunk/debian/docs/orthanc.1
Modified:
   trunk/packages/orthanc/trunk/debian/orthanc.dirs
   trunk/packages/orthanc/trunk/debian/orthanc.init
   trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides
   trunk/packages/orthanc/trunk/debian/orthanc.manpages
   trunk/packages/orthanc/trunk/debian/rules
   trunk/packages/orthanc/trunk/debian/source/include-binaries
Log:
Rework package

Copied: trunk/packages/orthanc/trunk/debian/docs/Orthanc.1 (from rev 12375, trunk/packages/orthanc/trunk/debian/docs/orthanc.1)
===================================================================

--- trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/docs/Orthanc.1	2012-10-11 08:22:15 UTC (rev 12378)
@@ -0,0 +1,21 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
+.TH ORTHANC "1" "October 2012" "Orthanc 0.2.2" "User Commands"
+.SH NAME
+Orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
+.SH SYNOPSIS
+.B Orthanc
+[\fIOPTION\fR]... [\fICONFIGURATION\fR]
+.SH DESCRIPTION
+Start Orthanc, a lightweight, RESTful DICOM server for healthcare and medical research.
+.PP
+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>.
+.SH AUTHOR
+Written by Sebastien Jodogne <s.jodogne at gmail.com>
+.SH COPYRIGHT
+Copyright \(co 2012 Medical Physics Department, CHU of Liege (Belgium)
+Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception.
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.

Deleted: trunk/packages/orthanc/trunk/debian/docs/orthanc.1
===================================================================
--- trunk/packages/orthanc/trunk/debian/docs/orthanc.1	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/docs/orthanc.1	2012-10-11 08:22:15 UTC (rev 12378)
@@ -1,21 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.12.
-.TH ORTHANC "1" "October 2012" "orthanc 0.2.2" "User Commands"
-.SH NAME
-orthanc \- Lightweight, RESTful DICOM server for healthcare and medical research
-.SH SYNOPSIS
-.B orthanc
-[\fIOPTION\fR]... [\fICONFIGURATION\fR]
-.SH DESCRIPTION
-Start Orthanc, a lightweight, RESTful DICOM server for healthcare and medical research.
-.PP
-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>.
-.SH AUTHOR
-Written by Sebastien Jodogne <s.jodogne at gmail.com>
-.SH COPYRIGHT
-Copyright \(co 2012 Medical Physics Department, CHU of Liege (Belgium)
-Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception.
-.br
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.

Modified: trunk/packages/orthanc/trunk/debian/orthanc.dirs
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc.dirs	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/orthanc.dirs	2012-10-11 08:22:15 UTC (rev 12378)
@@ -1,5 +1,5 @@
 etc/init.d
 etc/orthanc
-usr/bin
+usr/sbin
 usr/share/doc/orthanc
 var/lib/orthanc

Modified: trunk/packages/orthanc/trunk/debian/orthanc.init
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc.init	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/orthanc.init	2012-10-11 08:22:15 UTC (rev 12378)
@@ -19,7 +19,7 @@
 # You can modify the variables below
 DESC="Orthanc"
 NAME=orthanc
-DAEMON=/usr/bin/Orthanc
+DAEMON=/usr/sbin/Orthanc
 LOGDIR=/var/log/orthanc
 DAEMON_ARGS="--logdir=$LOGDIR /etc/orthanc/orthanc.json"
 PIDFILE=/run/$NAME.pid

Modified: trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/orthanc.lintian-overrides	2012-10-11 08:22:15 UTC (rev 12378)
@@ -1,2 +1,2 @@
 # The following overrides a misspelling in jQuery File Upload
-spelling-error-in-binary usr/bin/orthanc allows to allows one to
+spelling-error-in-binary usr/sbin/Orthanc allows to allows one to

Modified: trunk/packages/orthanc/trunk/debian/orthanc.manpages
===================================================================
--- trunk/packages/orthanc/trunk/debian/orthanc.manpages	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/orthanc.manpages	2012-10-11 08:22:15 UTC (rev 12378)
@@ -1 +1 @@
-debian/docs/orthanc.1
+debian/docs/Orthanc.1

Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/rules	2012-10-11 08:22:15 UTC (rev 12378)
@@ -3,23 +3,17 @@
 %:
 	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=OFF -DSTANDALONE_BUILD=ON -DBUILD_UNIT_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DUSE_DYNAMIC_JSONCPP=1
+override_dh_clean:
+	rm -rf ThirdPartyDownloads
 
-
 override_dh_auto_install:
-	cp $(CURDIR)/Build/Orthanc $(CURDIR)/debian/orthanc/usr/bin
+	dh_install Build/Orthanc usr/sbin
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k $(CURDIR)/NEWS

Modified: trunk/packages/orthanc/trunk/debian/source/include-binaries
===================================================================
--- trunk/packages/orthanc/trunk/debian/source/include-binaries	2012-10-11 07:57:53 UTC (rev 12377)
+++ trunk/packages/orthanc/trunk/debian/source/include-binaries	2012-10-11 08:22:15 UTC (rev 12378)
@@ -1,3 +1 @@
-ThirdPartyDownloads/mongoose-3.1.tgz
-ThirdPartyDownloads/sqlite-amalgamation-3071300.zip
-ThirdPartyDownloads/jsoncpp-src-0.5.0.tar.gz
+debian/ThirdPartyDownloads/mongoose-3.1.tgz


