This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental-2.1 in repository gdal-grass.
commit 83f6ba74d72bb5148d0c063cb853770e34296b22 Author: Bas Couwenberg <[email protected]> Date: Fri Jan 20 10:44:32 2017 +0100 Drop grass72.patch, applied upstream. Refresh remaining patch. --- debian/changelog | 1 + debian/patches/grass72.patch | 31 ------------------------------- debian/patches/rpath | 2 +- debian/patches/series | 1 - 4 files changed, 2 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index c9298e8..1953e50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libgdal-grass (2.1.3~rc1-1) UNRELEASED; urgency=medium * New upstream release candidate. + * Drop grass72.patch, applied upstream. Refresh remaining patch. -- Bas Couwenberg <[email protected]> Fri, 20 Jan 2017 10:39:22 +0100 diff --git a/debian/patches/grass72.patch b/debian/patches/grass72.patch deleted file mode 100644 index 7d2db24..0000000 --- a/debian/patches/grass72.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Add libraries for GRASS 7.2. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://trac.osgeo.org/gdal/ticket/6785 -Applied-Upstream: http://trac.osgeo.org/gdal/changeset/37161 - ---- a/configure.in -+++ b/configure.in -@@ -123,13 +123,20 @@ fi - - if test "$with_grass" != "yes" ; then - -- AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) -+ AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) - if test "$GRASS_SETTING" = "no" ; then -- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) -+ AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) -+ if test "$GRASS_SETTING" = "no" ; then -+ AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) -+ fi - fi - - if test "$GRASS_SETTING" != "no" ; then -- if test "$GRASS_SETTING" = "grass70+" ; then -+ if test "$GRASS_SETTING" = "grass72+" ; then -+ G_RASTLIBS="-lgrass_raster -lgrass_imagery" -+ G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" -+ LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS" -+ elif test "$GRASS_SETTING" = "grass70+" ; then - G_RASTLIBS="-lgrass_raster -lgrass_imagery" - G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" - LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" diff --git a/debian/patches/rpath b/debian/patches/rpath index 47e9bd1..2b7b059 100644 --- a/debian/patches/rpath +++ b/debian/patches/rpath @@ -4,7 +4,7 @@ Forwarded: not-needed --- a/Makefile.in +++ b/Makefile.in -@@ -47,10 +47,10 @@ distclean: clean +@@ -34,10 +34,10 @@ distclean: clean $(GLIBNAME): grass57dataset.o diff --git a/debian/patches/series b/debian/patches/series index 15e9dda..81ffa4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ rpath -grass72.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
