The following commit has been merged in the master branch:
commit e4bb4a02a23ababd7468be4d08fddb6c645be4b0
Author: Johan Van de Wauw
Date: Thu Feb 25 17:46:34 2010 +0100
Use libgrib2c from debian instead of own version
diff --git a/debian/control b/debian/control
index 15d9935..dd17bec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Johan Van de Wauw , Francesco Paolo
Lovergine
-Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
libogdi3.2-dev, libproj-dev , cdbs, debhelper(>=7)
+Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
libogdi3.2-dev,
+ libproj-dev, cdbs, debhelper(>=7), libgrib2c-dev
Standards-Version: 3.8.4
Homepage: http://www.saga-gis.org/
Vcs-Git: git://git.debian.org/pkg-grass/saga.git
diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am
b/src/modules_io/grid/io_grid_grib2/Makefile.am
index 7501979..6fc14fe 100644
--- a/src/modules_io/grid/io_grid_grib2/Makefile.am
+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am
@@ -7,6 +7,7 @@ endif
if SAGA_UNICODE
UC_DEFS = -D_SAGA_UNICODE
endif
+DEP_LIBS = -lgrib2c
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
-DUSE_JPEG2000 -DUSE_PNG
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS= -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS)
@@ -14,54 +15,6 @@ AM_CXXFLAGS= -fPIC $(CXX_INCS) $(DEF_SAGA)
$(UC_DEFS) $(DBGFLAGS)
AM_LDFLAGS = -fPIC -shared -ljasper
pkglib_LTLIBRARIES = libio_grid_grib2.la
libio_grid_grib2_la_SOURCES =\
-./g2clib-1.0.4/cmplxpack.c\
-./g2clib-1.0.4/compack.c\
-./g2clib-1.0.4/comunpack.c\
-./g2clib-1.0.4/dec_jpeg2000.c\
-./g2clib-1.0.4/dec_png.c\
-./g2clib-1.0.4/drstemplates.c\
-./g2clib-1.0.4/enc_jpeg2000.c\
-./g2clib-1.0.4/enc_png.c\
-./g2clib-1.0.4/g2_addfield.c\
-./g2clib-1.0.4/g2_addgrid.c\
-./g2clib-1.0.4/g2_addlocal.c\
-./g2clib-1.0.4/g2_create.c\
-./g2clib-1.0.4/g2_free.c\
-./g2clib-1.0.4/g2_getfld.c\
-./g2clib-1.0.4/g2_gribend.c\
-./g2clib-1.0.4/g2_info.c\
-./g2clib-1.0.4/g2_miss.c\
-./g2clib-1.0.4/g2_unpack1.c\
-./g2clib-1.0.4/g2_unpack2.c\
-./g2clib-1.0.4/g2_unpack3.c\
-./g2clib-1.0.4/g2_unpack4.c\
-./g2clib-1.0.4/g2_unpack5.c\
-./g2clib-1.0.4/g2_unpack6.c\
-./g2clib-1.0.4/g2_unpack7.c\
-./g2clib-1.0.4/gbits.c\
-./g2clib-1.0.4/getdim.c\
-./g2clib-1.0.4/getpoly.c\
-./g2clib-1.0.4/gridtemplates.c\
-./g2clib-1.0.4/int_power.c\
-./g2clib-1.0.4/jpcpack.c\
-./g2clib-1.0.4/jpcunpack.c\
-./g2clib-1.0.4/misspack.c\
-./g2clib-1.0.4/mkieee.c\
-./g2clib-1.0.4/pack_gp.c\
-./g2clib-1.0.4/pdstemplates.c\
-./g2clib-1.0.4/pngpack.c\
-./g2clib-1.0.4/pngunpack.c\
-./g2clib-1.0.4/rdieee.c\
-./g2clib-1.0.4/reduce.c\
-./g2clib-1.0.4/seekgb.c\
-./g2clib-1.0.4/simpack.c\
-./g2clib-1.0.4/simunpack.c\
-./g2clib-1.0.4/specpack.c\
-./g2clib-1.0.4/specunpack.c\
-./g2clib-1.0.4/drstemplates.h\
-./g2clib-1.0.4/grib2.h\
-./g2clib-1.0.4/gridtemplates.h\
-./g2clib-1.0.4/pdstemplates.h\
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.in
b/src/modules_io/grid/io_grid_grib2/Makefile.in
index 63e23e7..f51a2e1 100644
--- a/src/modules_io/grid/io_grid_grib2/Makefile.in
+++ b/src/modules_io/grid/io_grid_grib2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -69,31 +69,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libio_grid_grib2_la_DEPENDENCIES = \
$(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
-am_libio_grid_grib2_la_OBJECTS = cmplxpack.lo compack.lo comunpack.lo \
- dec_jpeg2000.lo dec_png.lo drstemplates.lo enc_jpeg2000.lo \
- enc_png.lo g2_addfield.lo g2_addgrid.lo g2_addlocal.lo \
- g2_create.lo g2_free.lo g2_getfld.lo g2_gribend.lo g2_info.lo \
- g2_miss.lo g2_unpack1.lo g2_unpack2.lo g2_unpack3.lo \
- g2_unpack4.lo g2_unpack5.lo g2_unpack6.lo g2_unpack7.lo \
- gbits.lo getdim.lo getpoly.lo gridtemplates.lo int_power.lo \
- jpcpack.lo jpcunpack.lo misspack.lo mkieee.lo pack_gp.lo \
- pdstemplates.lo pngpack.lo pngunpack.lo rdieee.lo reduce.lo \
- seekgb.lo simpack.lo simunpack.lo specpack.lo specunpack.lo \
- grib2_import.lo MLB_Interface.lo
+am_libio_grid_grib2_la_OBJECTS = grib2_import.lo MLB_Interface.lo
libio_grid_grib2_la_OBJECTS = $(am_libio_grid_grib2_la_OBJECTS)
DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INC
