This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository grass.
commit 286b7fc2f9d08e3b59740dd4111798488cd1ce12 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Aug 20 02:50:02 2014 +0200 Refresh patches. --- debian/patches/check4dev | 8 +++----- debian/patches/help_about_names | 32 +++++++++++--------------------- debian/patches/htmlgen-fakeroot | 8 +++----- debian/patches/instdir | 14 +++++--------- debian/patches/pager | 8 +++----- debian/patches/www-browser | 8 +++----- debian/patches/xterm | 6 ++---- 7 files changed, 30 insertions(+), 54 deletions(-) diff --git a/debian/patches/check4dev b/debian/patches/check4dev index 0c905e5..7386cf2 100644 --- a/debian/patches/check4dev +++ b/debian/patches/check4dev @@ -1,8 +1,6 @@ -Index: grass/scripts/g.extension/g.extension -=================================================================== ---- grass.orig/scripts/g.extension/g.extension 2012-02-24 18:06:25.980494464 +1300 -+++ grass/scripts/g.extension/g.extension 2012-02-24 18:08:03.756783834 +1300 -@@ -75,6 +75,14 @@ +--- a/scripts/g.extension/g.extension ++++ b/scripts/g.extension/g.extension +@@ -75,6 +75,14 @@ if [ "$1" != "@ARGS_PARSED@" ] ; then exec g.parser "$0" "$@" fi diff --git a/debian/patches/help_about_names b/debian/patches/help_about_names index 713d260..0caced4 100644 --- a/debian/patches/help_about_names +++ b/debian/patches/help_about_names @@ -1,21 +1,11 @@ -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)) +--- a/gui/wxpython/gui_core/ghelp.py ++++ b/gui/wxpython/gui_core/ghelp.py +@@ -609,7 +609,7 @@ class AboutWindow(wx.Frame): + 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: diff --git a/debian/patches/htmlgen-fakeroot b/debian/patches/htmlgen-fakeroot index e61af5f..e4fd4ab 100644 --- a/debian/patches/htmlgen-fakeroot +++ b/debian/patches/htmlgen-fakeroot @@ -1,8 +1,6 @@ -Index: grass/include/Make/Html.make -=================================================================== ---- grass.orig/include/Make/Html.make 2011-02-14 17:15:01.000000000 +0100 -+++ grass/include/Make/Html.make 2011-02-14 17:27:03.000000000 +0100 -@@ -34,7 +34,7 @@ +--- a/include/Make/Html.make ++++ b/include/Make/Html.make +@@ -34,7 +34,7 @@ htmldesc = \ GISBASE=$(RUN_GISBASE) \ PATH="$(BIN):$$PATH" \ $(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \ diff --git a/debian/patches/instdir b/debian/patches/instdir index 755172b..d88a4ae 100644 --- a/debian/patches/instdir +++ b/debian/patches/instdir @@ -1,8 +1,6 @@ -Index: grass/configure -=================================================================== ---- grass.orig/configure 2011-02-14 17:15:00.000000000 +0100 -+++ grass/configure 2011-02-14 17:28:52.000000000 +0100 -@@ -1392,7 +1392,7 @@ +--- a/configure ++++ b/configure +@@ -1432,7 +1432,7 @@ fi if test -n "$MACOSX_APP" ; then INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS" else @@ -11,10 +9,8 @@ Index: grass/configure fi -Index: grass/grass.pc.in -=================================================================== ---- grass.orig/grass.pc.in 2011-02-14 17:15:00.000000000 +0100 -+++ grass/grass.pc.in 2011-02-14 17:28:52.000000000 +0100 +--- a/grass.pc.in ++++ b/grass.pc.in @@ -1,12 +1,12 @@ # Package Information for pkg-config diff --git a/debian/patches/pager b/debian/patches/pager index 379b8cd..2eeecd4 100644 --- a/debian/patches/pager +++ b/debian/patches/pager @@ -1,8 +1,6 @@ -Index: grass/lib/init/init.sh -=================================================================== ---- grass.orig/lib/init/init.sh 2011-02-14 17:28:01.000000000 +0100 -+++ grass/lib/init/init.sh 2011-02-14 17:28:23.000000000 +0100 -@@ -276,10 +276,12 @@ +--- a/lib/init/init.sh ++++ b/lib/init/init.sh +@@ -301,10 +301,12 @@ export GRASS_LD_LIBRARY_PATH # Set some environment variables if they are not set if [ ! "$GRASS_PAGER" ] ; then diff --git a/debian/patches/www-browser b/debian/patches/www-browser index 1743798..f452d98 100644 --- a/debian/patches/www-browser +++ b/debian/patches/www-browser @@ -1,8 +1,6 @@ -Index: grass/lib/init/init.sh -=================================================================== ---- grass.orig/lib/init/init.sh 2011-02-14 17:15:01.000000000 +0100 -+++ grass/lib/init/init.sh 2011-02-14 17:28:01.000000000 +0100 -@@ -325,53 +325,13 @@ +--- a/lib/init/init.sh ++++ b/lib/init/init.sh +@@ -350,53 +350,13 @@ fi # try and find a web browser if one isn't already specified if [ ! "$GRASS_HTML_BROWSER" ] ; then diff --git a/debian/patches/xterm b/debian/patches/xterm index 32fb67f..12f6acf 100644 --- a/debian/patches/xterm +++ b/debian/patches/xterm @@ -1,7 +1,5 @@ -Index: grass/lib/init/grass-xterm-wrapper -=================================================================== ---- grass.orig/lib/init/grass-xterm-wrapper 2011-02-14 17:15:01.000000000 +0100 -+++ grass/lib/init/grass-xterm-wrapper 2011-02-14 17:28:38.000000000 +0100 +--- a/lib/init/grass-xterm-wrapper ++++ b/lib/init/grass-xterm-wrapper @@ -3,7 +3,7 @@ if [ -z "$GRASS_XTERM" ] ; then -- 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