[med-svn] [conquest-dicom-server] 13/17: Prepare to patch BaseDir in dgate.cpp

[Pablo Lorenzzoni]

This is an automated email from the git hooks/post-receive script.

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit 651b28268b7024cac78102be2e1e28fa20e965d6
Author: Pablo Lorenzzoni <spectra at debian.org>
Date:   Sat Feb 1 18:48:24 2014 +0000

    Prepare to patch BaseDir in dgate.cpp
---
 debian/TODO                       | 3 +--
 debian/conquest-dicom-server.init | 2 +-
 debian/make-manpage               | 2 +-
 debian/manparts/files.h2m         | 9 ++++-----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index aba3332..526f269 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -3,9 +3,8 @@
 [  ] Add support for PostgreSQL
 [  ] Replace get-orig-source
 [  ] Bind to 127.0.0.1 by default (probably have to patch source code)
-[  ] Change the expected path for dicom.ini by default (probably have to
-     patch source code)
 
+[**] Change the expected path for dicom.ini by default
 [**] Add Manpage
 [**] Convert Repository layout to git-buildpackage
 [**] Run as non-root user
diff --git a/debian/conquest-dicom-server.init b/debian/conquest-dicom-server.init
index f240244..cfb879b 100755
--- a/debian/conquest-dicom-server.init
+++ b/debian/conquest-dicom-server.init
@@ -20,7 +20,7 @@ USER=_conquest
 GROUP=_conquest
 NAME=dgate
 DAEMON=/usr/bin/$NAME # Introduce the server's location here
-DAEMON_ARGS="-w$ETCDIR -^$LOGDIR/dgate.log" # Arguments to run the daemon with
+DAEMON_ARGS="-^$LOGDIR/dgate.log" # Arguments to run the daemon with
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
diff --git a/debian/make-manpage b/debian/make-manpage
index 89a6c53..fd16241 100755
--- a/debian/make-manpage
+++ b/debian/make-manpage
@@ -3,7 +3,7 @@
 PACKAGE=conquest-dicom-server
 VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
 
-help2man -h "-?" -N -s 1 -n "UCDMC/NKI DICOM server thread and PACS utility application" \
+help2man -h "-w$PWD -?" -N -s 1 -n "UCDMC/NKI DICOM server thread and PACS utility application" \
          --no-discard-stderr --version-string $VERSION -m "ConQuest DICOM server" -S \
          "Netherlands Cancer Institute" \
          --include debian/manparts/synopsis.h2m \
diff --git a/debian/manparts/files.h2m b/debian/manparts/files.h2m
index 8f8a261..d46d9c5 100644
--- a/debian/manparts/files.h2m
+++ b/debian/manparts/files.h2m
@@ -1,12 +1,11 @@
 [files]
 All of the locations below can be configured in
 .B dicom.ini
-file. By default,
+file. By default, in this package
 .B ConQuest
-expects dicom.ini to be present in the same path as
-the executable. In this package, this behaviour was changed by using
-.B -w/etc/conquest-dicom-server
-option. Please consider this while messing with the files below:
+expects dicom.ini to be present in the
+.B /etc/conquest-dicom-server.
+Please consider this while messing with the files below:
 .TP 15
 /etc/conquest-dicom-server/dicom.ini
 Several self-explanatory configuration parameters for the server.

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