Author: tille Date: 2009-01-05 23:24:18 +0000 (Mon, 05 Jan 2009) New Revision: 2901
Added: trunk/packages/gnumed-client/tags/0.3.8-2/ trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client.conf trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client_public.conf Removed: trunk/packages/gnumed-client/trunk/debian/conf/client.conf trunk/packages/gnumed-client/trunk/debian/conf/gnumed-public.conf trunk/packages/gnumed-client/trunk/debian/conf/gnumed.conf Modified: trunk/packages/gnumed-client/trunk/debian/changelog trunk/packages/gnumed-client/trunk/debian/gnumed-common.config trunk/packages/gnumed-client/trunk/debian/tools/gnumed Log: Config name is now gnumed-client.conf Copied: trunk/packages/gnumed-client/tags/0.3.8-2 (from rev 2887, trunk/packages/gnumed-client/trunk/debian) Property changes on: trunk/packages/gnumed-client/tags/0.3.8-2 ___________________________________________________________________ Name: mergeWithUpstream + 1 Name: svn:mergeinfo + Modified: trunk/packages/gnumed-client/trunk/debian/changelog =================================================================== --- trunk/packages/gnumed-client/trunk/debian/changelog 2009-01-05 22:17:14 UTC (rev 2900) +++ trunk/packages/gnumed-client/trunk/debian/changelog 2009-01-05 23:24:18 UTC (rev 2901) @@ -1,3 +1,13 @@ +gnumed-client (0.3.8-3) unstable; urgency=low + + * GNUmed client parses /etc/gnumed/gnumed-client.conf instead of + /etc/gnumed/gnumed.conf + * debian/gnumed-common.config: no explicite path in addgroup + * debian/tools/gnumed: make sure the wrapper parses the right + config file + + -- Andreas Tille <[email protected]> Mon, 05 Jan 2009 10:06:02 +0100 + gnumed-client (0.3.8-2) unstable; urgency=low * Recommends: xdg-utils Deleted: trunk/packages/gnumed-client/trunk/debian/conf/client.conf =================================================================== --- trunk/packages/gnumed-client/trunk/debian/conf/client.conf 2009-01-05 22:17:14 UTC (rev 2900) +++ trunk/packages/gnumed-client/trunk/debian/conf/client.conf 2009-01-05 23:24:18 UTC (rev 2901) @@ -1,6 +0,0 @@ -### currently not used !!! - -# Configuration for gnumed client -# SERVER is the host which is running the GnuMed database. -# The default host is localhost. -#SERVER=localhost Added: trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client.conf =================================================================== --- trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client.conf (rev 0) +++ trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client.conf 2009-01-05 23:24:18 UTC (rev 2901) @@ -0,0 +1,56 @@ +# GNUmed system-wide configuration file + +[workplace] + +# This name is used to describe the workstation at the +# business logic level, eg. "ultrasound room machine 1", +# +# Many configuration options stored in the backend +# are tied to this name. +name = GNUmed Default + + + +[backend] + +# during login the user can chose from several +# profiles defining which GNUmed database server +# to connect to, +# +# the profiles themselves are defined further below +# +profiles = $profiles$ +local GNUmed database +public GNUmed database +$profiles$ + + +[profile local GNUmed database] +host = +port = 5432 +database = gnumed_v9 +#encoding = UTF8 +help desk = Your own IT support <needs configuration> + + +[profile public GNUmed database] +host = salaam.homeunix.com +port = 5432 +database = gnumed_v9 +#encoding = UTF8 + +# this option controls whether the database is in-production +# storing real patient data or is a public database with +# open access for testing and development +# +# among other things it controls whether log files are by +# default attached to bug reports mailed out to developers, +# for real patient databases set this to 0 +public/open access = 1 + +# this option defines who is in charge of tech support +# for this GNUmed database, +# public databases are serviced on the mailing list, +# set this to an internal staff address for real +# patient databases +help desk = GNUmed Development List <[email protected]> Added: trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client_public.conf =================================================================== --- trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client_public.conf (rev 0) +++ trunk/packages/gnumed-client/trunk/debian/conf/gnumed-client_public.conf 2009-01-05 23:24:18 UTC (rev 2901) @@ -0,0 +1,49 @@ +# GNUmed system-wide configuration file + +[workplace] + +# This name is used to describe the workstation at the +# business logic level, eg. "ultrasound room machine 1", +# +# Many configuration options stored in the backend +# are tied to this name. +name = GNUmed Default + + + +[backend] + +# during login the user can chose from several +# profiles defining which GNUmed database server +# to connect to, +# +# the profiles themselves are defined further below +# +profiles = $profiles$ +public GNUmed database +$profiles$ + + + +[profile public GNUmed database] +host = salaam.homeunix.com +port = 5432 +database = gnumed_v9 +#encoding = UTF8 + +# this option controls whether the database is in-production +# storing real patient data or is a public database with +# open access for testing and development +# +# among other things it controls whether log files are by +# default attached to bug reports mailed out to developers, +# for real patient databases set this to 0 +public/open access = 1 + +# this option defines who is in charge of tech support +# for this GNUmed database, +# public databases are serviced on the mailing list, +# set this to an internal staff address for real +# patient databases +help desk = GNUmed Development List <[email protected]> + Deleted: trunk/packages/gnumed-client/trunk/debian/conf/gnumed-public.conf =================================================================== --- trunk/packages/gnumed-client/trunk/debian/conf/gnumed-public.conf 2009-01-05 22:17:14 UTC (rev 2900) +++ trunk/packages/gnumed-client/trunk/debian/conf/gnumed-public.conf 2009-01-05 23:24:18 UTC (rev 2901) @@ -1,55 +0,0 @@ -# GNUmed system-wide configuration file for public server -# ------------------------------------------------------------- -# -# see also: http://wiki.gnumed.de/bin/view/Gnumed/ConfigFiles -# -# ------------------------------------------------------------- - - -[workplace] - -# This name is used to describe the workstation at the -# business logic level, eg. "ultrasound room machine 1", -# -# Many configuration options stored in the backend -# are tied to this name. -name = GNUmed Default - - - -[backend] - -# during login the user can chose from several -# profiles defining which GNUmed database server -# to connect to, -# -# the profiles themselves are defined further below -# -profiles = $profiles$ -public GNUmed database -$profiles$ - - - -[profile public GNUmed database] -host = salaam.homeunix.com -port = 5432 -database = gnumed_v9 -#encoding = UTF8 - -# this option controls whether the database is in-production -# storing real patient data or is a public database with -# open access for testing and development -# -# among other things it controls whether log files are by -# default attached to bug reports mailed out to developers, -# for real patient databases set this to 0 -public/open access = 1 - -# this option defines who is in charge of tech support -# for this GNUmed database, -# public databases are serviced on the mailing list, -# set this to an internal staff address for real -# patient databases -help desk = GNUmed Development List <[email protected]> - Deleted: trunk/packages/gnumed-client/trunk/debian/conf/gnumed.conf =================================================================== --- trunk/packages/gnumed-client/trunk/debian/conf/gnumed.conf 2009-01-05 22:17:14 UTC (rev 2900) +++ trunk/packages/gnumed-client/trunk/debian/conf/gnumed.conf 2009-01-05 23:24:18 UTC (rev 2901) @@ -1,82 +0,0 @@ -# GNUmed system-wide configuration file -# ------------------------------------------------------------- -# -# see also: http://wiki.gnumed.de/bin/view/Gnumed/ConfigFiles -# -# ------------------------------------------------------------- - - -[workplace] - -# This name is used to describe the workstation at the -# business logic level, eg. "ultrasound room machine 1", -# -# Many configuration options stored in the backend -# are tied to this name. -name = GNUmed Default - - - -[backend] - -# during login the user can chose from several -# profiles defining which GNUmed database server -# to connect to, -# -# the profiles themselves are defined further below -# -profiles = $profiles$ -public GNUmed database -local GNUmed database -$profiles$ - - - -[profile public GNUmed database] -host = salaam.homeunix.com -port = 5432 -database = gnumed_v9 -#encoding = UTF8 - -# this option controls whether the database is in-production -# storing real patient data or is a public database with -# open access for testing and development -# -# among other things it controls whether log files are by -# default attached to bug reports mailed out to developers, -# for real patient databases set this to 0 -public/open access = 1 - -# this option defines who is in charge of tech support -# for this GNUmed database, -# public databases are serviced on the mailing list, -# set this to an internal staff address for real -# patient databases -help desk = GNUmed Development List <[email protected]> - - -[profile local GNUmed database] -host = localhost -port = 5432 -database = gnumed_v9 -#encoding = UTF8 - -# this option controls whether the database is in-production -# storing real patient data or is a public database with -# open access for testing and development -# -# among other things it controls whether log files are by -# default attached to bug reports mailed out to developers, -# for real patient databases set this to 0 -public/open access = 0 - -# this option defines who is in charge of tech support -# for this GNUmed database, -# public databases are serviced on the mailing list, -# set this to an internal staff address for real -# patient databases -# -# Debian: FIXME: This needs to be configurable via debconf -# Something like Your own IT support <needs configuration> -help desk = GNUmed Development List <[email protected]> - Modified: trunk/packages/gnumed-client/trunk/debian/gnumed-common.config =================================================================== --- trunk/packages/gnumed-client/trunk/debian/gnumed-common.config 2009-01-05 22:17:14 UTC (rev 2900) +++ trunk/packages/gnumed-client/trunk/debian/gnumed-common.config 2009-01-05 23:24:18 UTC (rev 2901) @@ -15,7 +15,7 @@ ## This returns the group including the members of the group which are needed later TESTGROUP=`getent group ${GROUP}` || true if [ -z "${TESTGROUP}" ] ; then - /usr/sbin/addgroup --system "${GROUP}" >/dev/null + addgroup --system "${GROUP}" >/dev/null # if the group was just created it can not have any users ... PROGUSERS="none" fi Modified: trunk/packages/gnumed-client/trunk/debian/tools/gnumed =================================================================== --- trunk/packages/gnumed-client/trunk/debian/tools/gnumed 2009-01-05 22:17:14 UTC (rev 2900) +++ trunk/packages/gnumed-client/trunk/debian/tools/gnumed 2009-01-05 23:24:18 UTC (rev 2901) @@ -5,8 +5,6 @@ # /usr/bin/ and should be run to start a GNUmed # client. # -# $Source: /sources/gnumed/gnumed/gnumed/dists/Linux/gnumed,v $ -# $Id: gnumed,v 1.9 2007/09/24 18:37:45 ncq Exp $ # license: GPL # Karsten Hilbert, Sebastian Hilbert, Andreas Tille #-------------------------------------------------- @@ -28,7 +26,7 @@ # The config file that is actually used is named like the executable # This enables symlinking to differently named executables and # starting with different options. -SYSCONF="/etc/gnumed/${name}.conf" +SYSCONF="/etc/gnumed/"`echo ${name} | sed 's/\(gnumed\)\([-_.]*\)/\1-client\2/'`".conf" if [ ! -e ${SYSCONF} ] ; then echo "Global config file ${SYSCONF} missing." exit 1 @@ -74,32 +72,3 @@ # now run the client python ${GNUMEDDIR}/gnumed.py ${CONFFILE} ${OPTIONS} -#================================================== -# $Log: gnumed,v $ -# Revision 1.9 2007/09/24 18:37:45 ncq -# - fix startup script directory error as noticed by Andreas -# -# Revision 1.8 2007/05/22 13:49:52 ncq -# - exit with 1 when something goes wrong -# -# Revision 1.7 2007/04/27 13:30:07 ncq -# - better location for user-local shell include -# -# Revision 1.6 2007/04/05 17:21:18 ncq -# - pull in some logic from Debian startup script -# - cleanup for system-wide config file -# -# Revision 1.5 2007/03/26 17:18:04 ncq -# - no more --unicode-gettext -# - no more copying /etc/gnumed/gnumed.conf -# -# Revision 1.4 2005/07/11 16:55:27 ncq -# - allow systemwide startup extension shell script, too -# -# Revision 1.3 2005/07/11 16:53:03 ncq -# - include user-local startup shell script -# - use cp -R -# -# Revision 1.2 2005/07/11 16:46:41 ncq -# - make more dumb but more robust -# _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
