This is an automated email from the git hooks/post-receive script. martinl-guest pushed a commit to branch ubuntu/xenial in repository gdal-grass.
commit 2a002df2c7fd46ec0018f0b19c80ee6f2ec5ea3e Author: Martin Landa <landa.mar...@gmail.com> Date: Sun Nov 19 22:31:13 2017 +0100 Rebuild 2.2.2 for xenial --- debian/patches/grass72.patch | 30 ------------------------------ debian/patches/series | 1 - 2 files changed, 31 deletions(-) diff --git a/debian/patches/grass72.patch b/debian/patches/grass72.patch deleted file mode 100644 index f9c2db6..0000000 --- a/debian/patches/grass72.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Add libraries for GRASS 7.2. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://trac.osgeo.org/gdal/ticket/6785 - ---- 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/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 Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel