← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/help_about_names

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/help_about_names
1
 
Description: Fix help-about name parsingix help-about name parsing.
2
 
Author: M. Hamish Bowman <hamish.webmail@gmail.com>
3
 
 
4
 
--- a/gui/wxpython/gui_core/ghelp.py
5
 
+++ b/gui/wxpython/gui_core/ghelp.py
6
 
@@ -609,7 +609,7 @@ class AboutWindow(wx.Frame):
7
 
                 line = line.rstrip('\n')
8
 
                 try:
9
 
                     if extra:
10
 
-                        name, email, rfc2_agreed = line.split(',')
11
 
+                        name, email, country, rfc2_agreed = line.split(',')
12
 
                     else:
13
 
                         cvs_id, name, email, country, osgeo_id, rfc2_agreed = line.split(',')
14
 
                 except ValueError: