[SCM] saga branch, master, updated. 08b232abd95eade351be2c8eb199e95f23c28a14

Francesco P. Lovergine francesco at lovergine.com
Wed Feb 8 08:02:43 UTC 2012


The following commit has been merged in the master branch:
commit 08b232abd95eade351be2c8eb199e95f23c28a14
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Tue Feb 7 23:03:42 2012 +0100

    Fixed 0003-Use-debian-version-of-grib2.patch

diff --git a/debian/patches/0003-Use-debian-version-of-grib2.patch b/debian/patches/0003-Use-debian-version-of-grib2.patch
index e834baf..73a5c5e 100644
--- a/debian/patches/0003-Use-debian-version-of-grib2.patch
+++ b/debian/patches/0003-Use-debian-version-of-grib2.patch
@@ -8,8 +8,8 @@ Subject: Use debian version of grib2
 
 Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.am
 ===================================================================
---- saga.orig/src/modules_io/grid/io_grid_grib2/Makefile.am	2012-01-09 14:10:56.000000000 +0100
-+++ saga/src/modules_io/grid/io_grid_grib2/Makefile.am	2012-01-09 14:13:43.000000000 +0100
+--- saga.orig/src/modules_io/grid/io_grid_grib2/Makefile.am	2012-02-07 23:02:06.000000000 +0100
++++ saga/src/modules_io/grid/io_grid_grib2/Makefile.am	2012-02-07 23:02:16.000000000 +0100
 @@ -14,54 +14,6 @@
  AM_LDFLAGS         = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
  pkglib_LTLIBRARIES = libio_grid_grib2.la
@@ -65,3 +65,16 @@ Index: saga/src/modules_io/grid/io_grid_grib2/Makefile.am
  grib2_import.cpp\
  MLB_Interface.cpp\
  grib2_import.h\
+Index: saga/src/modules_io/grid/io_grid_grib2/grib2_import.h
+===================================================================
+--- saga.orig/src/modules_io/grid/io_grid_grib2/grib2_import.h	2012-02-07 19:40:21.000000000 +0100
++++ saga/src/modules_io/grid/io_grid_grib2/grib2_import.h	2012-02-07 23:03:05.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ #include "MLB_Interface.h"
+ extern "C" {
+-#include "g2clib-1.0.4/grib2.h"
++#include <grib2.h>
+ }
+ 
+ 

-- 
Saga GIS



More information about the Pkg-grass-devel mailing list