[Debian-med-packaging] [Git][med-team/gnumed-client][upstream] New upstream version 1.7.1+dfsg
Andreas Tille
gitlab at salsa.debian.org
Thu Apr 12 19:38:50 BST 2018
Andreas Tille pushed to branch upstream at Debian Med / gnumed-client
Commits:
c3225d71 by Andreas Tille at 2018-04-12T19:50:49+02:00
New upstream version 1.7.1+dfsg
- - - - -
9 changed files:
- client/CHANGELOG
- client/business/gmExportArea.py
- client/doc/schema/gnumed-entire_schema.html
- client/gnumed.py
- client/timelinelib/meta/version.py
- client/timelinelib/wxgui/components/timelinepanel.py
- external-tools/check-prerequisites.py
- external-tools/check-prerequisites.sh
- + external-tools/gnumed-completion.bash
Changes:
=====================================
client/CHANGELOG
=====================================
--- a/client/CHANGELOG
+++ b/client/CHANGELOG
@@ -6,6 +6,14 @@
# rel-1-7-patches
------------------------------------------------
+ 1.7.1
+
+NEW: add bash completion script
+
+IMPROVED: make DWV optional
+IMPROVED: prerequisites check tool
+IMPROVED: update timeline code to 1.17.0 release
+
1.7.0
NEW: link document to procedure
@@ -1933,6 +1941,12 @@ FIX: missing cast to ::text in dem.date_trunc_utc() calls
# gnumed_v22
------------------------------------------------
+ 22.1
+
+IMPROVED: concurrency robustness of backup/restore scripts
+
+ 22.0
+
NEW: revalidate constraints during database upgrade
NEW: deprecate gm-backup_* in favor of gm-backup
NEW: deprecate gm-restore_* in favor of gm-restore
=====================================
client/business/gmExportArea.py
=====================================
--- a/client/business/gmExportArea.py
+++ b/client/business/gmExportArea.py
@@ -604,16 +604,17 @@ class cExportArea(object):
if u'DICOMDIR' in os.listdir(media_base_dir):
_html_start_data[u'browse_dicomdir'] = u'<li><a href="./DICOMDIR">%s</a></li>' % _(u'show DICOMDIR file')
# copy DWV into target dir
- dwv_target_dir = os.path.join(media_base_dir, u'dwv')
- gmTools.rmdir(dwv_target_dir)
dwv_src_dir = os.path.join(gmTools.gmPaths().local_base_dir, u'dwv4export')
if not os.path.isdir(dwv_src_dir):
dwv_src_dir = os.path.join(gmTools.gmPaths().system_app_data_dir, u'dwv4export')
- try:
- shutil.copytree(dwv_src_dir, dwv_target_dir)
- _html_start_data[u'run_dicom_viewer'] = u'<li><a href="./dwv/viewers/mobile-local/index.html">%s</a></li>' % _(u'run Radiology Images (DICOM) Viewer')
- except shutil.Error, OSError:
- _log.exception('cannot include DWV, skipping')
+ if os.path.isdir(dwv_src_dir):
+ dwv_target_dir = os.path.join(media_base_dir, u'dwv')
+ gmTools.rmdir(dwv_target_dir)
+ try:
+ shutil.copytree(dwv_src_dir, dwv_target_dir)
+ _html_start_data[u'run_dicom_viewer'] = u'<li><a href="./dwv/viewers/mobile-local/index.html">%s</a></li>' % _(u'run Radiology Images (DICOM) Viewer')
+ except shutil.Error, OSError:
+ _log.exception('cannot include DWV, skipping')
# index.html
# - header
=====================================
client/doc/schema/gnumed-entire_schema.html
=====================================
--- a/client/doc/schema/gnumed-entire_schema.html
+++ b/client/doc/schema/gnumed-entire_schema.html
@@ -112,7 +112,7 @@
<body>
<!-- Primary Index -->
- <p><br><br>Dumped on 2018-03-18</p>
+ <p><br><br>Dumped on 2018-04-05</p>
<h1><a name="index">Index of database - gnumed_v22</a></h1>
<ul>
=====================================
client/gnumed.py
=====================================
--- a/client/gnumed.py
+++ b/client/gnumed.py
@@ -96,7 +96,7 @@ against. Please run GNUmed as a non-root user.
sys.exit(1)
#----------------------------------------------------------
-current_client_version = u'1.7.0'
+current_client_version = u'1.7.1'
current_client_branch = u'1.7'
_log = None
=====================================
client/timelinelib/meta/version.py
=====================================
--- a/client/timelinelib/meta/version.py
+++ b/client/timelinelib/meta/version.py
@@ -21,9 +21,9 @@ TYPE_BETA = "beta"
TYPE_FINAL = ""
VERSION = (1, 17, 0)
-TYPE = TYPE_DEV
-REVISION_HASH = ""
-REVISION_DATE = ""
+TYPE = TYPE_FINAL
+REVISION_HASH = "cb821d29f002"
+REVISION_DATE = "2018-03-25"
def get_full_version():
=====================================
client/timelinelib/wxgui/components/timelinepanel.py
=====================================
--- a/client/timelinelib/wxgui/components/timelinepanel.py
+++ b/client/timelinelib/wxgui/components/timelinepanel.py
@@ -292,9 +292,10 @@ class TimelinePanelGuiCreator(wx.Panel):
menuid += 1
menu_definitions.append((_("Goto URL"), self._context_menu_on_goto_hyperlink_event, imp))
menu = wx.Menu()
+ mid = 0
for menu_definition in menu_definitions:
text, method, imp = menu_definition
- menu_item = wx.MenuItem(menu, wx.NewId(), text)
+ menu_item = wx.MenuItem(menu, mid, text)
if imp is not None:
for menu_item in imp.GetMenuItems():
self.Bind(wx.EVT_MENU, method, id=menu_item.GetId())
@@ -302,6 +303,7 @@ class TimelinePanelGuiCreator(wx.Panel):
else:
self.Bind(wx.EVT_MENU, method, id=menu_item.GetId())
menu.AppendItem(menu_item)
+ mid += 1
self.PopupMenu(menu)
menu.Destroy()
=====================================
external-tools/check-prerequisites.py
=====================================
--- a/external-tools/check-prerequisites.py
+++ b/external-tools/check-prerequisites.py
@@ -50,7 +50,7 @@ else:
import wxversion
print "found"
print " selecting unicode enabled version >= 2.8...",
- wxversion.select(versions='2.8-unicode', optionsRequired=True)
+ wxversion.select(versions = ['3.0', '2.8-unicode'], optionsRequired = True)
print "success"
except ImportError:
missing = True
@@ -86,18 +86,18 @@ except ImportError:
print " INFO : wxPython is available from http://www.wxpython.org"
print " INFO : on Mac OSX Panther you may have to use 'export DISPLAY=:0'"
-print " uno...",
-try:
- import uno
- print "found"
-except ImportError:
- missing = True
- print ""
- print " ERROR: uno not installed"
- print " INFO : this is needed for form and letter handling"
- print " INFO : GNUmed will work but you will be unable"
- print " INFO : to use OpenOffice to write letters and"
- print " INFO : fill in forms"
+#print " uno...",
+#try:
+# import uno
+# print "found"
+#except ImportError:
+# missing = True
+# print ""
+# print " ERROR: uno not installed"
+# print " INFO : this is needed for form and letter handling"
+# print " INFO : GNUmed will work but you will be unable"
+# print " INFO : to use OpenOffice to write letters and"
+# print " INFO : fill in forms"
print " Gnuplot...",
try:
=====================================
external-tools/check-prerequisites.sh
=====================================
--- a/external-tools/check-prerequisites.sh
+++ b/external-tools/check-prerequisites.sh
@@ -64,6 +64,7 @@ echo "make working with GNUmed more productive but"
echo "are not strictly required for standard operation."
read -p "Press <RETURN> key to continue."
echo "-------------------------------"
+echo "Client tools:"
echo -n " 'file' command... "
BIN=`which file`
@@ -170,7 +171,7 @@ echo -n " 'kprinter4' command... "
BIN=`which kprinter4`
if [ "x${BIN}x" == "xx" ]; then
echo ""
- echo " INFO : You don't seem to have the 'kprinter' command installed."
+ echo " INFO : You don't seem to have the 'kprinter4' command installed."
echo " INFO : It is used to print files from KDE."
echo " INFO : On Windows it is not needed."
else
@@ -259,7 +260,7 @@ BIN=`which iec16022`
if [ "x${BIN}x" == "xx" ]; then
echo ""
echo " INFO : You don't seem to have the 'iec16022' command installed."
- echo " INFO : It can be used by GNUmed to create the datamatrix QR code"
+ echo " INFO : It can be used by GNUmed to create the datamatrix BMP code"
echo " INFO : of a text file from within GNUmed."
else
echo "found"
@@ -345,6 +346,43 @@ else
echo "found"
fi
+
+echo ""
+read -p "Press <RETURN> key to continue."
+echo "-------------------------------"
+echo "Server tools:"
+
+echo -n " 'tar' command... "
+BIN=`which tar`
+if [ "x${BIN}x" == "xx" ]; then
+ echo ""
+ echo " INFO : You don't seem to have the 'tar' command installed."
+ echo " INFO : It is used by GNUmed to backup databases."
+else
+ echo "found"
+fi
+
+echo -n " 'bzip2' command... "
+BIN=`which bzip2`
+if [ "x${BIN}x" == "xx" ]; then
+ echo ""
+ echo " INFO : You don't seem to have the 'bzip2' command installed."
+ echo " INFO : It is used by GNUmed to backup databases."
+else
+ echo "found"
+fi
+
+echo -n " 'flock' command... "
+BIN=`which flock`
+if [ "x${BIN}x" == "xx" ]; then
+ echo ""
+ echo " INFO : You don't seem to have the 'flock' command installed."
+ echo " INFO : It is used by GNUmed when backing up databases."
+else
+ echo "found"
+fi
+
+
#=================================================================
# obsolete
=====================================
external-tools/gnumed-completion.bash
=====================================
--- /dev/null
+++ b/external-tools/gnumed-completion.bash
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# bash completions for GNUmed
+
+
+_gnumed_completion()
+{
+ COMPREPLY=()
+ OPTS="--quiet --debug --slave --override-schema-check --local-import --help --version -V -h -? --tool= --text-domain= --log-file= --conf-file= --lang-gettext= --ui= --wxp="
+ CURR="${COMP_WORDS[COMP_CWORD]}"
+ PREV="${COMP_WORDS[COMP_CWORD-1]}"
+ PREVPREV="${COMP_WORDS[COMP_CWORD-2]}"
+
+ case "${CURR}" in
+ "=")
+ case "${PREV}" in
+ "--tool")
+ TOOLS="check_enc_epi_xref export_pat_emr_structure"
+ COMPREPLY=($(compgen -W "${TOOLS}"))
+ return 0
+ ;;
+ esac
+ ;;
+ esac
+
+ case "${PREV}" in
+ "=")
+ case "${PREVPREV}" in
+ "--tool")
+ TOOLS="check_enc_epi_xref export_pat_emr_structure"
+ COMPREPLY=($(compgen -W "${TOOLS}" -- ${CURR}))
+ return 0
+ ;;
+ esac
+ ;;
+ esac
+
+ COMPREPLY=($(compgen -W "${OPTS}" -- ${CURR}))
+ return 0
+}
+
+
+complete -o nospace -F _gnumed_completion gnumed
View it on GitLab: https://salsa.debian.org/med-team/gnumed-client/commit/c3225d717ad1145cdab68643b11a1c374bedfb3a
---
View it on GitLab: https://salsa.debian.org/med-team/gnumed-client/commit/c3225d717ad1145cdab68643b11a1c374bedfb3a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-packaging/attachments/20180412/0ff2a306/attachment-0001.html>
More information about the Debian-med-packaging
mailing list