[med-svn] r3148 - in trunk/packages/gnumed-client/trunk/debian: . tools
tille at alioth.debian.org
tille at alioth.debian.org
Mon Mar 2 21:37:44 UTC 2009
Author: tille
Date: 2009-03-02 21:37:44 +0000 (Mon, 02 Mar 2009)
New Revision: 3148
Modified:
trunk/packages/gnumed-client/trunk/debian/changelog
trunk/packages/gnumed-client/trunk/debian/tools/gnumed
Log:
New upstream version uploaded
Modified: trunk/packages/gnumed-client/trunk/debian/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog 2009-03-02 14:51:44 UTC (rev 3147)
+++ trunk/packages/gnumed-client/trunk/debian/changelog 2009-03-02 21:37:44 UTC (rev 3148)
@@ -1,10 +1,16 @@
-gnumed-client (0.3.12-1) UNRELEASED; urgency=low
+gnumed-client (0.3.12-1) unstable; urgency=low
* New upstream version
* Watch file now parses developer release page to work around
unsifficient uscan - watch file magic which is not sufficient
to ignore RC releases of upcoming new version (Thanks to Paul
Wise)
+ * New /usr/bin/gnumed according to a suggestion of Josselin
+ Mouette and Karsten Hilbert to work better with new python-support
+ Closes: #516037
+ (Remark: The GNUmed Python modules do remain for the moment in
+ usr/share/python-support/gnumed-client do keep compatibility with
+ Lenny for some time.)
-- Andreas Tille <tille at debian.org> Mon, 02 Mar 2009 15:46:15 +0100
Modified: trunk/packages/gnumed-client/trunk/debian/tools/gnumed
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/tools/gnumed 2009-03-02 14:51:44 UTC (rev 3147)
+++ trunk/packages/gnumed-client/trunk/debian/tools/gnumed 2009-03-02 21:37:44 UTC (rev 3148)
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
#==================================================
# This shell script is intended to be placed in
# /usr/bin/ and should be run to start a GNUmed
# client.
#
+# $Source: /sources/gnumed/gnumed/gnumed/dists/Linux/gnumed,v $
+# $Id: gnumed,v 1.21 2009/02/20 10:45:44 ncq Exp $
# license: GPL
# Karsten Hilbert, Sebastian Hilbert, Andreas Tille
#--------------------------------------------------
@@ -14,61 +16,29 @@
OPTIONS=$@
-# Verify the name of the script for the appendix "-debug"
-# If it is symlinked to a file with this name use --debug as option
-name=`basename $0`
-if echo $name | grep -q -- "-debug" ; then
- name=`echo $name | sed 's/-debug//'`
- OPTIONS="$OPTIONS --debug"
-fi
-# The system-wide configuration file for backend profiles
-# 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/"`echo ${name} | sed 's/\(gnumed\)\([-_.]*\)/\1-client\2/'`".conf"
+# The system-wide configuration file for backend profiles.
+SYSCONF="/etc/gnumed/gnumed-client.conf"
if [ ! -e ${SYSCONF} ] ; then
echo "Global config file ${SYSCONF} missing."
exit 1
fi
-# There has to be a user config file (even if empty).
-if [ ! -e ${HOME}/.gnumed/${name}.conf ] ; then
- touch ${HOME}/.gnumed/${name}.conf
-fi
-## Different ways to obtain the version number of the running Python interpreter
-## store this here just for the purpose of education :-)
-# PYVER=`python -V 2>&1 | sed 's/Python[[:space:]]\+\([0-9]\+\.[0-9]\+\).*/\1/'`
-# PYVER=`pyversions -vd`
-# PYVER=`python -c 'import platform; print platform.python_version()'`
-PYVER=`python -c 'import sys; print sys.version[:3]'`
-
-# this is where the gnumed.py Python script actually lives
-GNUMEDDIR=/var/lib/python-support/python${PYVER}/Gnumed/wxpython
-
-# check for explicit --conf-file option
-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
- echo "Given config file ${CONFFILE} missing."
- exit 1
- fi
- CONFFILE="--conf-file=${CONFFILE}"
- OPTIONS=`echo $OPTIONS | sed -e 's/--conf-file[[:space:]]*=[[:space:]]*[^[:space:]]\+//'`
-fi
-
# source systemwide startup extension shell script if it exists
if [ -r /etc/gnumed/gnumed-startup-local.sh ] ; then
. /etc/gnumed/gnumed-startup-local.sh
fi
+
# source local startup extension shell script if it exists
if [ -r ${HOME}/.gnumed/scripts/gnumed-startup-local.sh ] ; then
. ${HOME}/.gnumed/scripts/gnumed-startup-local.sh
fi
+
# now run the client
-python ${GNUMEDDIR}/gnumed.py ${CONFFILE} ${OPTIONS}
+python -m Gnumed.wxpython.gnumed ${OPTIONS}
+# sync the discs just in case
+sync
More information about the debian-med-commit
mailing list