[SCM] saga branch, master, updated. c56be0411c4d3e501b7997f7f0a01320c78441d7

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit c56be0411c4d3e501b7997f7f0a01320c78441d7
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Jun 23 17:32:39 2011 -0400

    Use debian version of grib2

diff --git a/debian/patches/0006-Use-debian-version-of-grib2.patch b/debian/patches/0006-Use-debian-version-of-grib2.patch
new file mode 100644
index 0000000..c495783
--- /dev/null
+++ b/debian/patches/0006-Use-debian-version-of-grib2.patch
@@ -0,0 +1,22 @@
+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/series b/debian/patches/series
index d7e74ab..59e42ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Use-debian-version-of-grib2.patch
 0004-Run-autoreconf-fi.patch
 0005-Fix-GCC-build-issue.patch
+0006-Use-debian-version-of-grib2.patch

-- 
Saga GIS