[med-svn] r1051 - in trunk/packages/gnumed-client/trunk/debian: . tools

[tille at alioth.debian.org]

Author: tille
Date: 2007-12-30 18:54:20 +0100 (dom, 30 dic 2007)
New Revision: 1051

Modified:
   trunk/packages/gnumed-client/trunk/debian/changelog
   trunk/packages/gnumed-client/trunk/debian/rules
   trunk/packages/gnumed-client/trunk/debian/tools/gnumed
Log:
Added dh_desktop; do not force --conf-file option to gnumed call


Modificato: trunk/packages/gnumed-client/trunk/debian/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog	2007-12-30 17:46:05 UTC (rev 1050)
+++ trunk/packages/gnumed-client/trunk/debian/changelog	2007-12-30 17:54:20 UTC (rev 1051)
@@ -11,6 +11,8 @@
   * gnumed-client: Recommends -> Suggets: libchipcard3-tools
   * libchipcard3-tools -> libchipcard-tools | libchipcard3-tools 
     Closes: #457485
+  * Added dh_desktop call
+  * debian/tools/gnumed: Do not force --conf-file option any more
 
   [ Charles Plessy ]
   * XS-DM-Upload-Allowed: Yes

Modificato: trunk/packages/gnumed-client/trunk/debian/rules
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/rules	2007-12-30 17:46:05 UTC (rev 1050)
+++ trunk/packages/gnumed-client/trunk/debian/rules	2007-12-30 17:54:20 UTC (rev 1051)
@@ -134,6 +134,7 @@
 #	dh_installlogrotate	
 #	dh_installcron
 	dh_installman
+	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress 

Modificato: trunk/packages/gnumed-client/trunk/debian/tools/gnumed
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/tools/gnumed	2007-12-30 17:46:05 UTC (rev 1050)
+++ trunk/packages/gnumed-client/trunk/debian/tools/gnumed	2007-12-30 17:54:20 UTC (rev 1051)
@@ -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.4 2005/07/11 16:55:27 ncq Exp $
 # license: GPL
 # Karsten Hilbert, Sebastian Hilbert, Andreas Tille
 #--------------------------------------------------
@@ -40,6 +38,7 @@
 
 # check for explicite conffile option
 # in this case we forget the name magic from above
+CONFFILE=""
 if echo $OPTIONS | grep -q -- "--conf-file[[:space:]]*=" ; then
 	CONFFILE=`echo $OPTIONS | sed -e 's/^.*--conf-file[[:space:]]*=[[:space:]]*\([^[:space:]]\+\).*/\1/'`
 	if [ ! -s ${CONFFILE} ] ; then
@@ -48,19 +47,6 @@
 	fi
 	CONFFILE="--conf-file=${CONFFILE}"
 	OPTIONS=`echo $OPTIONS | sed -e 's/--conf-file[[:space:]]*=[[:space:]]*[^[:space:]]\+//'`
-else
-	# copy global config file to user directory because /etc/gnumed is not writable
-	if [ ! -e ${HOME}/.gnumed/${name}.conf ] ; then
-    		if [ ! -e ${SYSCONF} ] ; then
-			echo "Global config file ${SYSCONF} missing."
-			exit -1
-		fi
-		if [ ! -d ${HOME}/.gnumed ] ; then
-			mkdir -p ${HOME}/.gnumed
-		fi
-    		# cp -a ${SYSCONF} ${HOME}/.gnumed/${name}.conf
-	fi
-	CONFFILE="--conf-file=${HOME}/.gnumed/${name}.conf"
 fi
 
 # source systemwide startup extension shell script if it exists