[SCM] saga branch, master, updated. 6f0f46531243365ca20a43a0d28d704a7ec9809c

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit 6f0f46531243365ca20a43a0d28d704a7ec9809c
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Dec 11 21:28:41 2012 -0500

    Remove obsolete patches from git

diff --git a/debian/patches/0004-Use-debian-version-of-grib2.patch b/debian/patches/0004-Use-debian-version-of-grib2.patch
deleted file mode 100644
index c495783..0000000
--- a/debian/patches/0004-Use-debian-version-of-grib2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 23 Jun 2011 17:31:11 -0400
-Subject: Use debian version of grib2
-
----
- src/modules_io/grid/io_grid_grib2/grib2_import.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules_io/grid/io_grid_grib2/grib2_import.h b/src/modules_io/grid/io_grid_grib2/grib2_import.h
-index ed9584e..fdcaecc 100644
---- a/src/modules_io/grid/io_grid_grib2/grib2_import.h
-+++ b/src/modules_io/grid/io_grid_grib2/grib2_import.h
-@@ -11,7 +11,7 @@
- 
- #include "MLB_Interface.h"
- extern "C" {
--#include "g2clib-1.0.4/grib2.h"
-+#include <grib2.h>
- }
- 
- 
--- 
diff --git a/debian/patches/0005-Fix-GCC-build-issue.patch b/debian/patches/0005-Fix-GCC-build-issue.patch
deleted file mode 100644
index ed1905c..0000000
--- a/debian/patches/0005-Fix-GCC-build-issue.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 16 Jun 2011 15:41:57 -0400
-Subject: Fix GCC build issue
-
----
- src/saga_core/saga_odbc/otlv4.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/saga_core/saga_odbc/otlv4.h b/src/saga_core/saga_odbc/otlv4.h
-index 2a37ba5..20b3d5b 100644
---- a/src/saga_core/saga_odbc/otlv4.h
-+++ b/src/saga_core/saga_odbc/otlv4.h
-@@ -47,6 +47,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <stddef.h>
- 
- //======================= CONFIGURATION #DEFINEs ===========================
- 
--- 
diff --git a/debian/patches/0006-Use-debian-version-of-grib2.patch b/debian/patches/0006-Use-debian-version-of-grib2.patch
deleted file mode 100644
index c495783..0000000
--- a/debian/patches/0006-Use-debian-version-of-grib2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 23 Jun 2011 17:31:11 -0400
-Subject: Use debian version of grib2
-
----
- src/modules_io/grid/io_grid_grib2/grib2_import.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules_io/grid/io_grid_grib2/grib2_import.h b/src/modules_io/grid/io_grid_grib2/grib2_import.h
-index ed9584e..fdcaecc 100644
---- a/src/modules_io/grid/io_grid_grib2/grib2_import.h
-+++ b/src/modules_io/grid/io_grid_grib2/grib2_import.h
-@@ -11,7 +11,7 @@
- 
- #include "MLB_Interface.h"
- extern "C" {
--#include "g2clib-1.0.4/grib2.h"
-+#include <grib2.h>
- }
- 
- 
--- 
diff --git a/debian/patches/0007-Fix-for-gcc-4.6.patch b/debian/patches/0007-Fix-for-gcc-4.6.patch
deleted file mode 100644
index 2988425..0000000
--- a/debian/patches/0007-Fix-for-gcc-4.6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 23 Jun 2011 18:51:07 -0400
-Subject: Fix for gcc 4.6
-
-(a bit dirty: passing -fpermissive to the compiler)
----
- src/modules_io/db/io_odbc/Makefile.am |    2 +-
- src/modules_io/db/io_odbc/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules_io/db/io_odbc/Makefile.am b/src/modules_io/db/io_odbc/Makefile.am
-index 58103fc..0a2ebc2 100644
---- a/src/modules_io/db/io_odbc/Makefile.am
-+++ b/src/modules_io/db/io_odbc/Makefile.am
-@@ -9,7 +9,7 @@ DEP_DEFS = -D_SAGA_UNICODE
- endif
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
- CXX_INCS           = -I$(top_srcdir)/src/saga_core
--AM_CXXFLAGS        = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
-+AM_CXXFLAGS        = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) -fpermissive
- AM_LDFLAGS         = $(DEP_LFLG) $(DEP_LIBS) -avoid-version
- pkglib_LTLIBRARIES = libio_odbc.la
- libio_odbc_la_SOURCES =\
-diff --git a/src/modules_io/db/io_odbc/Makefile.in b/src/modules_io/db/io_odbc/Makefile.in
-index 679bf54..452e91d 100644
---- a/src/modules_io/db/io_odbc/Makefile.in
-+++ b/src/modules_io/db/io_odbc/Makefile.in
-@@ -252,7 +252,7 @@ top_srcdir = @top_srcdir@
- @SAGA_UNICODE_TRUE at DEP_DEFS = -D_SAGA_UNICODE
- DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
- CXX_INCS = -I$(top_srcdir)/src/saga_core
--AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS)
-+AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) -fpermissive
- AM_LDFLAGS = $(DEP_LFLG) $(DEP_LIBS) -avoid-version
- pkglib_LTLIBRARIES = libio_odbc.la
- libio_odbc_la_SOURCES = \
--- 

-- 
Saga GIS