This is an automated email from the git hooks/post-receive script.
hamish-guest pushed a commit to branch master
in repository grass.
commit 3e122e8a5395aeee1294d456411542f01ec5cbe6
Author: M. Hamish Bowman <hamis...@yahoo.com>
Date: Mon Aug 11 18:11:13 2014 +1200
add patch to fix help-about name parsing, change my email addr
---
debian/changelog | 3 ++-
debian/patches/help_about_names | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 6702835..f35cb4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,13 @@ grass (6.4.4-1) UNRELEASED; urgency=low
[ M. Hamish Bowman ]
* Packaged new upstream version, drop redundant patches.
* Dropped version dependency on libgdal-dev for easier backports.
+ * Added patch to fix Help-About parsing.
[ Francesco Paolo Lovergine ]
* Debhelper level set to 9.
* Vcs-* fields are now canonical to make lintian happy.
- -- M. Hamish Bowman <hamis...@yahoo.com> Sun, 03 Aug 2014 18:33:07 +1200
+ -- M. Hamish Bowman <hamish.webm...@gmail.com> Mon, 11 Aug 2014 18:09:42
+1200
grass (6.4.3-3) unstable; urgency=medium
diff --git a/debian/patches/help_about_names b/debian/patches/help_about_names
new file mode 100644
index 0000000..713d260
--- /dev/null
+++ b/debian/patches/help_about_names
@@ -0,0 +1,21 @@
+Index: grass/gui/wxpython/gui_core/ghelp.py
+===================================================================
+--- grass.orig/gui/wxpython/gui_core/ghelp.py (revision 58704)
++++ grass/gui/wxpython/gui_core/ghelp.py (revision 61335)
+@@ -605,15 +605,15 @@
+ contribFile = codecs.open(contribfile, encoding = 'utf-8', mode =
'r')
+ contribs = list()
+ errLines = list()
+ for line in contribFile.readlines()[1:]:
+ line = line.rstrip('\n')
+ try:
+ if extra:
+- name, email, rfc2_agreed = line.split(',')
++ name, email, country, rfc2_agreed = line.split(',')
+ else:
+ cvs_id, name, email, country, osgeo_id, rfc2_agreed =
line.split(',')
+ except ValueError:
+ errLines.append(line)
+ continue
+ if extra:
+ contribs.append((name, email))
diff --git a/debian/patches/series b/debian/patches/series
index e7797bd..05819e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pager
xterm
instdir
check4dev
+help_about_names
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
