The following commit has been merged in the master branch:
commit 26e19d0e0affa566dc1a601f6eca822f230b040d
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Thu Nov 14 21:16:08 2013 -0500

    Update patches

diff --git a/debian/patches/0001-Remove-references-to-libfire.patch 
b/debian/patches/0001-Remove-references-to-libfire.patch
index 73f1c56..83173b4 100644
--- a/debian/patches/0001-Remove-references-to-libfire.patch
+++ b/debian/patches/0001-Remove-references-to-libfire.patch
@@ -1,10 +1,7 @@
 From: Johan Van de Wauw <johan.vandew...@gmail.com>
-Date: Thu, 14 Nov 2013 17:02:01 -0500
+Date: Thu, 14 Nov 2013 20:58:08 -0500
 Subject: Remove references to libfire
 
-Remove libfire
-
-Remove references to libfire
 ---
  configure.in                       | 2 --
  src/modules_simulation/Makefile.am | 2 +-
@@ -24,9 +21,9 @@ index 69eb6fd..7837a32 100755
        src/modules_terrain_analysis/terrain_analysis/Makefile \
        src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile \
 diff --git a/src/modules_simulation/Makefile.am 
b/src/modules_simulation/Makefile.am
-index 431dee5..cd4594c 100644
+index 431dee5..0d38f09 100644
 --- a/src/modules_simulation/Makefile.am
 +++ b/src/modules_simulation/Makefile.am
 @@ -1 +1 @@
 -SUBDIRS = hydrology fire ecosystems cellular_automata erosion
-+SUBDIRS = hydrology ecosystems cellular_automata
++SUBDIRS = hydrology ecosystems cellular_automata erosion
diff --git a/debian/patches/0002-Use-debian-version-of-grib2.patch 
b/debian/patches/0002-Use-debian-version-of-grib2.patch
index 150a56f..5d7121c 100644
--- a/debian/patches/0002-Use-debian-version-of-grib2.patch
+++ b/debian/patches/0002-Use-debian-version-of-grib2.patch
@@ -1,5 +1,5 @@
 From: Johan Van de Wauw <johan.vandew...@gmail.com>
-Date: Thu, 14 Nov 2013 17:03:54 -0500
+Date: Thu, 14 Nov 2013 21:00:49 -0500
 Subject: Use debian version of grib2
 
 ---
diff --git a/debian/patches/0003-Autoreconf.patch 
b/debian/patches/0003-Autoconf-fi-result.patch
similarity index 99%
rename from debian/patches/0003-Autoreconf.patch
rename to debian/patches/0003-Autoconf-fi-result.patch
index 4c37c51..a541bba 100644
--- a/debian/patches/0003-Autoreconf.patch
+++ b/debian/patches/0003-Autoconf-fi-result.patch
@@ -1,12 +1,11 @@
 From: Johan Van de Wauw <johan.vandew...@gmail.com>
-Date: Thu, 14 Nov 2013 17:15:36 -0500
-Subject: Autoreconf
+Date: Thu, 14 Nov 2013 21:02:10 -0500
+Subject: Autoconf -fi result
 
 ---
  INSTALL                                            |    15 +-
  Makefile.in                                        |   396 +-
  aclocal.m4                                         |   739 +-
- compile                                            |   347 +
  config.guess                                       |   405 +-
  config.h.in                                        |     3 +
  config.sub                                         |   286 +-
@@ -127,15 +126,14 @@ Subject: Autoreconf
  .../terrain_analysis/ta_preprocessor/Makefile.in   |   288 +-
  .../terrain_analysis/ta_profiles/Makefile.in       |   288 +-
  src/saga_core/Makefile.in                          |   292 +-
- src/saga_core/saga_api/Makefile.in                 |   396 +-
+ src/saga_core/saga_api/Makefile.in                 |   392 +-
  src/saga_core/saga_cmd/Makefile.in                 |   388 +-
  src/saga_core/saga_cmd/man/Makefile.in             |   162 +-
  src/saga_core/saga_gdi/Makefile.in                 |   290 +-
  src/saga_core/saga_gui/Makefile.in                 |   388 +-
  src/saga_core/saga_gui/man/Makefile.in             |   162 +-
  src/saga_core/saga_odbc/Makefile.in                |   290 +-
- 131 files changed, 34983 insertions(+), 24219 deletions(-)
- create mode 100755 compile
+ 130 files changed, 34634 insertions(+), 24217 deletions(-)
  mode change 100755 => 100644 ltmain.sh
 
 diff --git a/INSTALL b/INSTALL
@@ -2051,359 +2049,6 @@ index c31f506..70cf5a4 100644
  AC_SUBST([am__tar])
  AC_SUBST([am__untar])
  ]) # _AM_PROG_TAR
-diff --git a/compile b/compile
-new file mode 100755
-index 0000000..531136b
---- /dev/null
-+++ b/compile
-@@ -0,0 +1,347 @@
-+#! /bin/sh
-+# Wrapper for compilers which do not understand '-c -o'.
-+
-+scriptversion=2012-10-14.11; # UTC
-+
-+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-+# Written by Tom Tromey <tro...@cygnus.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-autom...@gnu.org> or send patches to
-+# <automake-patc...@gnu.org>.
-+
-+nl='
-+'
-+
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent tools from complaining about whitespace usage.
-+IFS=" ""      $nl"
-+
-+file_conv=
-+
-+# func_file_conv build_file lazy
-+# Convert a $build file to $host form and store it in $file
-+# Currently only supports Windows hosts. If the determined conversion
-+# type is listed in (the comma separated) LAZY, no conversion will
-+# take place.
-+func_file_conv ()
-+{
-+  file=$1
-+  case $file in
-+    / | /[!/]*) # absolute file, and not a UNC file
-+      if test -z "$file_conv"; then
-+      # lazily determine how to convert abs files
-+      case `uname -s` in
-+        MINGW*)
-+          file_conv=mingw
-+          ;;
-+        CYGWIN*)
-+          file_conv=cygwin
-+          ;;
-+        *)
-+          file_conv=wine
-+          ;;
-+      esac
-+      fi
-+      case $file_conv/,$2, in
-+      *,$file_conv,*)
-+        ;;
-+      mingw/*)
-+        file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-+        ;;
-+      cygwin/*)
-+        file=`cygpath -m "$file" || echo "$file"`
-+        ;;
-+      wine/*)
-+        file=`winepath -w "$file" || echo "$file"`
-+        ;;
-+      esac
-+      ;;
-+  esac
-+}
-+
-+# func_cl_dashL linkdir
-+# Make cl look for libraries in LINKDIR
-+func_cl_dashL ()
-+{
-+  func_file_conv "$1"
-+  if test -z "$lib_path"; then
-+    lib_path=$file
-+  else
-+    lib_path="$lib_path;$file"
-+  fi
-+  linker_opts="$linker_opts -LIBPATH:$file"
-+}
-+
-+# func_cl_dashl library
-+# Do a library search-path lookup for cl
-+func_cl_dashl ()
-+{
-+  lib=$1
-+  found=no
-+  save_IFS=$IFS
-+  IFS=';'
-+  for dir in $lib_path $LIB
-+  do
-+    IFS=$save_IFS
-+    if $shared && test -f "$dir/$lib.dll.lib"; then
-+      found=yes
-+      lib=$dir/$lib.dll.lib
-+      break
-+    fi
-+    if test -f "$dir/$lib.lib"; then
-+      found=yes
-+      lib=$dir/$lib.lib
-+      break
-+    fi
-+    if test -f "$dir/lib$lib.a"; then
-+      found=yes
-+      lib=$dir/lib$lib.a
-+      break
-+    fi
-+  done
-+  IFS=$save_IFS
-+
-+  if test "$found" != yes; then
-+    lib=$lib.lib
-+  fi
-+}
-+
-+# func_cl_wrapper cl arg...
-+# Adjust compile command to suit cl
-+func_cl_wrapper ()
-+{
-+  # Assume a capable shell
-+  lib_path=
-+  shared=:
-+  linker_opts=
-+  for arg
-+  do
-+    if test -n "$eat"; then
-+      eat=
-+    else
-+      case $1 in
-+      -o)
-+        # configure might choose to run compile as 'compile cc -o foo foo.c'.
-+        eat=1
-+        case $2 in
-+          *.o | *.[oO][bB][jJ])
-+            func_file_conv "$2"
-+            set x "$@" -Fo"$file"
-+            shift
-+            ;;
-+          *)
-+            func_file_conv "$2"
-+            set x "$@" -Fe"$file"
-+            shift
-+            ;;
-+        esac
-+        ;;
-+      -I)
-+        eat=1
-+        func_file_conv "$2" mingw
-+        set x "$@" -I"$file"
-+        shift
-+        ;;
-+      -I*)
-+        func_file_conv "${1#-I}" mingw
-+        set x "$@" -I"$file"
-+        shift
-+        ;;
-+      -l)
-+        eat=1
-+        func_cl_dashl "$2"
-+        set x "$@" "$lib"
-+        shift
-+        ;;
-+      -l*)
-+        func_cl_dashl "${1#-l}"
-+        set x "$@" "$lib"
-+        shift
-+        ;;
-+      -L)
-+        eat=1
-+        func_cl_dashL "$2"
-+        ;;
-+      -L*)
-+        func_cl_dashL "${1#-L}"
-+        ;;
-+      -static)
-+        shared=false
-+        ;;
-+      -Wl,*)
-+        arg=${1#-Wl,}
-+        save_ifs="$IFS"; IFS=','
-+        for flag in $arg; do
-+          IFS="$save_ifs"
-+          linker_opts="$linker_opts $flag"
-+        done
-+        IFS="$save_ifs"
-+        ;;
-+      -Xlinker)
-+        eat=1
-+        linker_opts="$linker_opts $2"
-+        ;;
-+      -*)
-+        set x "$@" "$1"
-+        shift
-+        ;;
-+      *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-+        func_file_conv "$1"
-+        set x "$@" -Tp"$file"
-+        shift
-+        ;;
-+      *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-+        func_file_conv "$1" mingw
-+        set x "$@" "$file"
-+        shift
-+        ;;
-+      *)
-+        set x "$@" "$1"
-+        shift
-+        ;;
-+      esac
-+    fi
-+    shift
-+  done
-+  if test -n "$linker_opts"; then
-+    linker_opts="-link$linker_opts"
-+  fi
-+  exec "$@" $linker_opts
-+  exit 1
-+}
-+
-+eat=
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand '-c -o'.
-+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file 'INSTALL'.
-+
-+Report bugs to <bug-autom...@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "compile $scriptversion"
-+    exit $?
-+    ;;
-+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-+    func_cl_wrapper "$@"      # Doesn't return...
-+    ;;
-+esac
-+
-+ofile=
-+cfile=
-+
-+for arg
-+do
-+  if test -n "$eat"; then
-+    eat=
-+  else
-+    case $1 in
-+      -o)
-+      # configure might choose to run compile as 'compile cc -o foo foo.c'.
-+      # So we strip '-o arg' only if arg is an object.
-+      eat=1
-+      case $2 in
-+        *.o | *.obj)
-+          ofile=$2
-+          ;;
-+        *)
-+          set x "$@" -o "$2"
-+          shift
-+          ;;
-+      esac
-+      ;;
-+      *.c)
-+      cfile=$1
-+      set x "$@" "$1"
-+      shift
-+      ;;
-+      *)
-+      set x "$@" "$1"
-+      shift
-+      ;;
-+    esac
-+  fi
-+  shift
-+done
-+
-+if test -z "$ofile" || test -z "$cfile"; then
-+  # If no '-o' option was seen then we might have been invoked from a
-+  # pattern rule where we don't need one.  That is ok -- this is a
-+  # normal compilation that the losing compiler can handle.  If no
-+  # '.c' file was seen then we are probably linking.  That is also
-+  # ok.
-+  exec "$@"
-+fi
-+
-+# Name of file we expect compiler to create.
-+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-+
-+# Create the lock directory.
-+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-+# that we are using for the .o file.  Also, base the name on the expected
-+# object file name, since that is what matters with a parallel build.
-+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-+while true; do
-+  if mkdir "$lockdir" >/dev/null 2>&1; then
-+    break
-+  fi
-+  sleep 1
-+done
-+# FIXME: race condition here if user kills between mkdir and trap.
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
-+
-+# Run the compile.
-+"$@"
-+ret=$?
-+
-+if test -f "$cofile"; then
-+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-+fi
-+
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
 diff --git a/config.guess b/config.guess
 index dc84c68..b79252d 100755
 --- a/config.guess
@@ -78705,7 +78350,7 @@ index 1129603..5924ff9 100644
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
 diff --git a/src/modules_simulation/Makefile.in 
b/src/modules_simulation/Makefile.in
-index b807e70..4cedd2c 100644
+index b807e70..144b4ea 100644
 --- a/src/modules_simulation/Makefile.in
 +++ b/src/modules_simulation/Makefile.in
 @@ -1,9 +1,8 @@
@@ -78903,7 +78548,7 @@ index b807e70..4cedd2c 100644
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = hydrology fire ecosystems cellular_automata erosion
-+SUBDIRS = hydrology ecosystems cellular_automata
++SUBDIRS = hydrology ecosystems cellular_automata erosion
  all: all-recursive
  
  .SUFFIXES:
@@ -87116,7 +86761,7 @@ index 305cba9..48351dc 100644
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
 diff --git a/src/saga_core/saga_api/Makefile.in 
b/src/saga_core/saga_api/Makefile.in
-index 93a3f34..3bb0054 100644
+index 93a3f34..e91ccfa 100644
 --- a/src/saga_core/saga_api/Makefile.in
 +++ b/src/saga_core/saga_api/Makefile.in
 @@ -1,9 +1,8 @@
@@ -87372,17 +87017,6 @@ index 93a3f34..3bb0054 100644
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -280,8 +395,8 @@ top_srcdir = @top_srcdir@
- @SAGA_PYTHON_TRUE@SAGAPYTHONFLAGS = -D_SAGA_PYTHON
- @SAGA_UNICODE_FALSE@AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no 
--cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS 
$(DISABLELIBHARU) $(DBGFLAGS) $(GOMPFLAGS)
- @SAGA_UNICODE_TRUE@AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes 
--cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD 
-D_SAGA_API_EXPORTS $(DISABLELIBHARU) $(DBGFLAGS) $(SAGAPYTHONFLAGS) 
$(GOMPFLAGS)
--@SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no 
--libs` $(HARU_LIB)
--@SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes 
--libs` $(HARU_LIB) $(SAGAPYTHONFLAGS)
-+@SAGA_UNICODE_FALSE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no 
--libs --toolkit=base` $(HARU_LIB)
-+@SAGA_UNICODE_TRUE@AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes 
--libs --toolkit=base` $(HARU_LIB) $(SAGAPYTHONFLAGS)
- libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION)
- lib_LTLIBRARIES = libsaga_api.la
- libsaga_api_la_SOURCES = \
 @@ -409,9 +524,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
diff --git a/debian/patches/series b/debian/patches/series
index 9abd8f7..9fd442d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 0001-Remove-references-to-libfire.patch
 0002-Use-debian-version-of-grib2.patch
-0003-Autoreconf.patch
+0003-Autoconf-fi-result.patch

-- 
Saga GIS

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to