[med-svn] r1363 - in trunk/packages/gnumed-client: tags tags/0.2.8.3-2 tags/0.2.8.3-2/patches trunk/debian trunk/debian/patches
tille at alioth.debian.org
tille at alioth.debian.org
Tue Feb 12 16:33:56 UTC 2008
Author: tille
Date: 2008-02-12 16:33:53 +0000 (Tue, 12 Feb 2008)
New Revision: 1363
Added:
trunk/packages/gnumed-client/tags/0.2.8.3-2/
trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/
trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/01_SOAPWidgets.patch
trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/series
trunk/packages/gnumed-client/trunk/debian/patches/
trunk/packages/gnumed-client/trunk/debian/patches/01_SOAPWidgets.patch
trunk/packages/gnumed-client/trunk/debian/patches/series
Modified:
trunk/packages/gnumed-client/tags/0.2.8.3-2/changelog
trunk/packages/gnumed-client/tags/0.2.8.3-2/control
trunk/packages/gnumed-client/tags/0.2.8.3-2/rules
trunk/packages/gnumed-client/trunk/debian/changelog
trunk/packages/gnumed-client/trunk/debian/control
trunk/packages/gnumed-client/trunk/debian/rules
Log:
Tagged 0.2.8.3-2
Copied: trunk/packages/gnumed-client/tags/0.2.8.3-2 (from rev 1356, trunk/packages/gnumed-client/trunk/debian)
Modified: trunk/packages/gnumed-client/tags/0.2.8.3-2/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog 2008-02-11 10:16:58 UTC (rev 1356)
+++ trunk/packages/gnumed-client/tags/0.2.8.3-2/changelog 2008-02-12 16:33:53 UTC (rev 1363)
@@ -1,5 +1,6 @@
-gnumed-client (0.2.8.3-2) UNRELEASED; urgency=low
+gnumed-client (0.2.8.3-2) unstable; urgency=low
+ [ David Paleino ]
* debian/control:
- added myself to Uploaders
- wrapped long lines
@@ -15,8 +16,12 @@
- removed unused dh_* calls
- merged duplicated targets
- -- David Paleino <d.paleino at gmail.com> Mon, 11 Feb 2008 09:35:02 +0100
+ [ Andreas Tille ]
+ * Added a patch supplied by upstream
+ * Make usage of quilt
+ -- Andreas Tille <tille at debian.org> Tue, 12 Feb 2008 13:47:29 +0100
+
gnumed-client (0.2.8.3-1) unstable; urgency=low
* New upstream version
Modified: trunk/packages/gnumed-client/tags/0.2.8.3-2/control
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/control 2008-02-11 10:16:58 UTC (rev 1356)
+++ trunk/packages/gnumed-client/tags/0.2.8.3-2/control 2008-02-12 16:33:53 UTC (rev 1363)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends: debhelper (>= 5.0.37.2), quilt
Build-Depends-Indep: po-debconf, python-support (>= 0.3.8), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gnumed-client/trunk/?rev=0&sc=0
Added: trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/01_SOAPWidgets.patch
===================================================================
--- trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/01_SOAPWidgets.patch (rev 0)
+++ trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/01_SOAPWidgets.patch 2008-02-12 16:33:53 UTC (rev 1363)
@@ -0,0 +1,115 @@
+--- GNUmed-0.2.8.3.orig/client/wxpython/gmSOAPWidgets.py
++++ GNUmed-0.2.8.3/client/wxpython/gmSOAPWidgets.py
+@@ -128,50 +128,81 @@
+ def add_editor(self, problem=None, allow_same_problem=False):
+ """Add a progress note editor page."""
+
+- label = _('new episode')
++ problem_to_add = problem
+
+- if problem is not None:
++ # determine label
++ if problem_to_add is None:
++ label = _('new episode')
++ else:
++ # normalize problem type
+ emr = self.__pat.get_emr()
+- if isinstance(problem, gmEMRStructItems.cEpisode):
+- problem = emr.episode2problem(episode = problem)
+- elif isinstance(problem, gmEMRStructItems.cHealthIssue):
+- problem = emr.health_issue2problem(issue = problem)
+- if not isinstance(problem, gmEMRStructItems.cProblem):
+- raise TypeError('cannot open progress note editor for [%s]' % str(problem))
+-
+- label = problem['problem']
+- # FIXME: configure length
++ if isinstance(problem_to_add, gmEMRStructItems.cEpisode):
++ problem_to_add = emr.episode2problem(episode = problem_to_add)
++ elif isinstance(problem_to_add, gmEMRStructItems.cHealthIssue):
++ problem_to_add = emr.health_issue2problem(issue = problem_to_add)
++ if not isinstance(problem_to_add, gmEMRStructItems.cProblem):
++ raise TypeError('cannot open progress note editor for [%s]' % problem_to_add)
++ label = problem_to_add['problem']
++ # FIXME: configure maximum length
+ if len(label) > 23:
+ label = label[:20] + '...'
+
+- if not allow_same_problem:
++ if allow_same_problem:
++ new_page = cResizingSoapPanel(parent = self, problem = problem_to_add)
++ result = self.AddPage (
++ page = new_page,
++ text = label,
++ select = True
++ )
++ return result
++
++ # new unassociated problem
++ if problem_to_add is None:
+ # check for dupes
+ for page_idx in range(self.GetPageCount()):
+ page = self.GetPage(page_idx)
+- existing_problem = page.get_problem()
+- # unassociated
+- if problem is None:
+- if existing_problem is None:
+- self.SetSelection(page_idx)
+- return True
+- continue
+- # episodes
+- if problem['type'] == 'episode':
+- if problem['pk_episode'] == existing_problem['pk_episode']:
+- self.SetSelection(page_idx)
+- return True
+- continue
+- if problem['type'] == 'issue':
+- if problem['pk_health_issue'] == existing_problem['pk_health_issue']:
+- self.SetSelection(page_idx)
+- return True
++ # found
++ if page.get_problem() is None:
++ self.SetSelection(page_idx)
++ return True
++ continue
++ # not found
++ new_page = cResizingSoapPanel(parent = self, problem = problem_to_add)
++ result = self.AddPage (
++ page = new_page,
++ text = label,
++ select = True
++ )
++ return result
+
+- new_page = cResizingSoapPanel(parent = self, problem = problem)
+- return self.AddPage (
++ # real problem
++ # - raise existing editor ?
++ for page_idx in range(self.GetPageCount()):
++ page = self.GetPage(page_idx)
++ problem_of_page = page.get_problem()
++ # editor is for unassociated new problem
++ if problem_of_page is None:
++ continue
++ # editor is for episode
++ if problem_of_page['type'] == 'episode':
++ if problem_of_page['pk_episode'] == problem_to_add['pk_episode']:
++ self.SetSelection(page_idx)
++ return True
++ continue
++ # editor is for health issue
++ if problem_of_page['type'] == 'issue':
++ if problem_of_page['pk_health_issue'] == problem_to_add['pk_health_issue']:
++ self.SetSelection(page_idx)
++ return True
++ continue
++ # - add new editor
++ new_page = cResizingSoapPanel(parent = self, problem = problem_to_add)
++ result = self.AddPage (
+ page = new_page,
+ text = label,
+ select = True
+ )
++ return result
+ #--------------------------------------------------------
+ # internal API
+ #--------------------------------------------------------
Added: trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/series
===================================================================
--- trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/series (rev 0)
+++ trunk/packages/gnumed-client/tags/0.2.8.3-2/patches/series 2008-02-12 16:33:53 UTC (rev 1363)
@@ -0,0 +1 @@
+01_SOAPWidgets.patch
Modified: trunk/packages/gnumed-client/tags/0.2.8.3-2/rules
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/rules 2008-02-11 10:16:58 UTC (rev 1356)
+++ trunk/packages/gnumed-client/tags/0.2.8.3-2/rules 2008-02-12 16:33:53 UTC (rev 1363)
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-# -*- makefile -*-
# debian/rules for GNUmed client.
# Andreas Tille, GPL
@@ -12,15 +11,19 @@
pkg=gnumed
client=$(pkg)-client
+# Make use of quilt
+include /usr/share/quilt/quilt.make
+
+
PYDEF=$(shell pyversions -d)
PYVERS=$(shell pyversions -r)
#Architecture
-build: build-arch build-indep
+build: patch build-arch build-indep
build-arch:
build-indep:
-clean:
+clean: unpatch
dh_testdir
dh_testroot
dh_clean
Modified: trunk/packages/gnumed-client/trunk/debian/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog 2008-02-12 14:39:43 UTC (rev 1362)
+++ trunk/packages/gnumed-client/trunk/debian/changelog 2008-02-12 16:33:53 UTC (rev 1363)
@@ -1,5 +1,6 @@
-gnumed-client (0.2.8.3-2) UNRELEASED; urgency=low
+gnumed-client (0.2.8.3-2) unstable; urgency=low
+ [ David Paleino ]
* debian/control:
- added myself to Uploaders
- wrapped long lines
@@ -15,8 +16,12 @@
- removed unused dh_* calls
- merged duplicated targets
- -- David Paleino <d.paleino at gmail.com> Mon, 11 Feb 2008 09:35:02 +0100
+ [ Andreas Tille ]
+ * Added a patch supplied by upstream
+ * Make usage of quilt
+ -- Andreas Tille <tille at debian.org> Tue, 12 Feb 2008 13:47:29 +0100
+
gnumed-client (0.2.8.3-1) unstable; urgency=low
* New upstream version
Modified: trunk/packages/gnumed-client/trunk/debian/control
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/control 2008-02-12 14:39:43 UTC (rev 1362)
+++ trunk/packages/gnumed-client/trunk/debian/control 2008-02-12 16:33:53 UTC (rev 1363)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends: debhelper (>= 5.0.37.2), quilt
Build-Depends-Indep: po-debconf, python-support (>= 0.3.8), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gnumed-client/trunk/?rev=0&sc=0
Added: trunk/packages/gnumed-client/trunk/debian/patches/01_SOAPWidgets.patch
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/patches/01_SOAPWidgets.patch (rev 0)
+++ trunk/packages/gnumed-client/trunk/debian/patches/01_SOAPWidgets.patch 2008-02-12 16:33:53 UTC (rev 1363)
@@ -0,0 +1,115 @@
+--- GNUmed-0.2.8.3.orig/client/wxpython/gmSOAPWidgets.py
++++ GNUmed-0.2.8.3/client/wxpython/gmSOAPWidgets.py
+@@ -128,50 +128,81 @@
+ def add_editor(self, problem=None, allow_same_problem=False):
+ """Add a progress note editor page."""
+
+- label = _('new episode')
++ problem_to_add = problem
+
+- if problem is not None:
++ # determine label
++ if problem_to_add is None:
++ label = _('new episode')
++ else:
++ # normalize problem type
+ emr = self.__pat.get_emr()
+- if isinstance(problem, gmEMRStructItems.cEpisode):
+- problem = emr.episode2problem(episode = problem)
+- elif isinstance(problem, gmEMRStructItems.cHealthIssue):
+- problem = emr.health_issue2problem(issue = problem)
+- if not isinstance(problem, gmEMRStructItems.cProblem):
+- raise TypeError('cannot open progress note editor for [%s]' % str(problem))
+-
+- label = problem['problem']
+- # FIXME: configure length
++ if isinstance(problem_to_add, gmEMRStructItems.cEpisode):
++ problem_to_add = emr.episode2problem(episode = problem_to_add)
++ elif isinstance(problem_to_add, gmEMRStructItems.cHealthIssue):
++ problem_to_add = emr.health_issue2problem(issue = problem_to_add)
++ if not isinstance(problem_to_add, gmEMRStructItems.cProblem):
++ raise TypeError('cannot open progress note editor for [%s]' % problem_to_add)
++ label = problem_to_add['problem']
++ # FIXME: configure maximum length
+ if len(label) > 23:
+ label = label[:20] + '...'
+
+- if not allow_same_problem:
++ if allow_same_problem:
++ new_page = cResizingSoapPanel(parent = self, problem = problem_to_add)
++ result = self.AddPage (
++ page = new_page,
++ text = label,
++ select = True
++ )
++ return result
++
++ # new unassociated problem
++ if problem_to_add is None:
+ # check for dupes
+ for page_idx in range(self.GetPageCount()):
+ page = self.GetPage(page_idx)
+- existing_problem = page.get_problem()
+- # unassociated
+- if problem is None:
+- if existing_problem is None:
+- self.SetSelection(page_idx)
+- return True
+- continue
+- # episodes
+- if problem['type'] == 'episode':
+- if problem['pk_episode'] == existing_problem['pk_episode']:
+- self.SetSelection(page_idx)
+- return True
+- continue
+- if problem['type'] == 'issue':
+- if problem['pk_health_issue'] == existing_problem['pk_health_issue']:
+- self.SetSelection(page_idx)
+- return True
++ # found
++ if page.get_problem() is None:
++ self.SetSelection(page_idx)
++ return True
++ continue
++ # not found
++ new_page = cResizingSoapPanel(parent = self, problem = problem_to_add)
++ result = self.AddPage (
++ page = new_page,
++ text = label,
++ select = True
++ )
++ return result
+
+- new_page = cResizingSoapPanel(parent = self, problem = problem)
+- return self.AddPage (
++ # real problem
++ # - raise existing editor ?
++ for page_idx in range(self.GetPageCount()):
++ page = self.GetPage(page_idx)
++ problem_of_page = page.get_problem()
++ # editor is for unassociated new problem
++ if problem_of_page is None:
++ continue
++ # editor is for episode
++ if problem_of_page['type'] == 'episode':
++ if problem_of_page['pk_episode'] == problem_to_add['pk_episode']:
++ self.SetSelection(page_idx)
++ return True
++ continue
++ # editor is for health issue
++ if problem_of_page['type'] == 'issue':
++ if problem_of_page['pk_health_issue'] == problem_to_add['pk_health_issue']:
++ self.SetSelection(page_idx)
++ return True
++ continue
++ # - add new editor
++ new_page = cResizingSoapPanel(parent = self, problem = problem_to_add)
++ result = self.AddPage (
+ page = new_page,
+ text = label,
+ select = True
+ )
++ return result
+ #--------------------------------------------------------
+ # internal API
+ #--------------------------------------------------------
Added: trunk/packages/gnumed-client/trunk/debian/patches/series
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/patches/series (rev 0)
+++ trunk/packages/gnumed-client/trunk/debian/patches/series 2008-02-12 16:33:53 UTC (rev 1363)
@@ -0,0 +1 @@
+01_SOAPWidgets.patch
Modified: trunk/packages/gnumed-client/trunk/debian/rules
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/rules 2008-02-12 14:39:43 UTC (rev 1362)
+++ trunk/packages/gnumed-client/trunk/debian/rules 2008-02-12 16:33:53 UTC (rev 1363)
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-# -*- makefile -*-
# debian/rules for GNUmed client.
# Andreas Tille, GPL
@@ -12,15 +11,19 @@
pkg=gnumed
client=$(pkg)-client
+# Make use of quilt
+include /usr/share/quilt/quilt.make
+
+
PYDEF=$(shell pyversions -d)
PYVERS=$(shell pyversions -r)
#Architecture
-build: build-arch build-indep
+build: patch build-arch build-indep
build-arch:
build-indep:
-clean:
+clean: unpatch
dh_testdir
dh_testroot
dh_clean
More information about the debian-med-commit
mailing list