This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository gdal-grass.

commit ff89fed2e7b6988ce350437f1c8a6e691d622f35
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Wed Sep 23 21:18:18 2015 +0200

    Drop patches applied upstream, refresh remaining patches.
---
 debian/changelog                         |  1 +
 debian/patches/grass7-configure          | 48 -----------------------------
 debian/patches/grass7-configure-postgres | 52 --------------------------------
 debian/patches/grass7-makefile           | 22 --------------
 debian/patches/hardening                 | 33 --------------------
 debian/patches/rpath                     | 12 ++++----
 debian/patches/series                    |  4 ---
 7 files changed, 7 insertions(+), 165 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index deff8d9..b9b9a29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libgdal-grass (1.11.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches applied upstream, refresh remaining patches.
 
  -- Bas Couwenberg <sebas...@debian.org>  Wed, 23 Sep 2015 21:09:33 +0200
 
diff --git a/debian/patches/grass7-configure b/debian/patches/grass7-configure
deleted file mode 100644
index 933fd73..0000000
--- a/debian/patches/grass7-configure
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Improve GRASS version detection.
-Origin: 
http://trac.osgeo.org/gdal/attachment/ticket/5852/gdal-grass-configure.patch
-Bug: http://trac.osgeo.org/gdal/ticket/5852
-Author: Marin Landa <landa.mar...@gmail.com>
-Applied-Upstream: r28591, http://trac.osgeo.org/gdal/changeset/28591
-
---- a/configure.in
-+++ b/configure.in
-@@ -123,23 +123,26 @@ fi
- 
- if test "$with_grass" != "yes" ; then
- 
--  
AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib
 -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime 
-lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dgl 
-lgrass_dig2 -lgrass_rtree -lgrass_linkm)
-+  
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
-    
--  if test "$GRASS_SETTING" = "grass57+" ; then   
--    LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis 
-lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient 
-lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm $LIBS"
-+  if test "$GRASS_SETTING" != "no" ; then   
-+    if 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"
-+    else
-+      G_RASTLIBS="-lgrass_I"
-+      G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree 
-lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
-+      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj 
-lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
-+    fi
-     GRASS_INCLUDE="-I$with_grass/include"
-     GRASS_GISBASE="$with_grass"
-+    HAVE_GRASS=yes
-   else
--
--    # Check for GRASS >= 7.0
--    
AC_CHECK_LIB(grass_gis.7.0.svn,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib
 -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn 
-lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn 
-lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn 
-lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn 
-lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn)
--    if test "$GRASS_SETTING" = "grass7+" ; then
--        LIBS="-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn 
-lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn 
-lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn 
-lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn 
-lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn $LIBS"
--        GRASS_INCLUDE="-I$with_grass/include"
--        GRASS_GISBASE="$with_grass"
--    else
--        AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not 
found!  Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
--    fi
-+    AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not 
found!])
-   fi
- fi
- 
diff --git a/debian/patches/grass7-configure-postgres 
b/debian/patches/grass7-configure-postgres
deleted file mode 100644
index 0838a92..0000000
--- a/debian/patches/grass7-configure-postgres
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Add configure support for postgres includes as used by GRASS 7
-Origin: 
https://trac.osgeo.org/gdal/attachment/ticket/5852/grass-configure-postgres.patch
-Bug: https://trac.osgeo.org/gdal/ticket/5852
-Author: Marin Landa <landa.mar...@gmail.com>
-Applied-Upstream: r28598, https://trac.osgeo.org/gdal/changeset/28598
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4,7 +4,7 @@ CXX    =       @CXX@
- LD    =       @CXX@
- 
- CPPFLAGS = -DUSE_CPL -DGRASS_GISBASE=\"@GRASS_GISBASE@\" \
--        @GDAL_INC@ @GRASS_INCLUDE@ @CPPFLAGS@
-+        @GDAL_INC@ @GRASS_INCLUDE@ @PQ_INCLUDE@ @CPPFLAGS@
- CXXFLAGS = @CXX_WFLAGS@ @CXX_PIC@ 
- CFLAGS   = @CFLAGS@
- LDFLAGS  = @LDFLAGS@
---- a/configure.in
-+++ b/configure.in
-@@ -91,7 +91,7 @@ AC_SUBST(GDAL_INC,    $GDAL_INC)
- dnl 
---------------------------------------------------------------------------
- dnl Where to put driver?
- dnl 
---------------------------------------------------------------------------
--AC_ARG_WITH(autoload,[  --with-autoload[=DIR]      Directory for autoload 
drivers],,)
-+AC_ARG_WITH(autoload,[  --with-autoload[=DIR]     Directory for autoload 
drivers],,)
- 
- if test "$with_autoload" != "" ; then
-   AUTOLOAD_DIR=$with_autoload
-@@ -151,6 +151,23 @@ AC_SUBST(GRASS_GISBASE,$GRASS_GISBASE)
- 
- dnl 
---------------------------------------------------------------------------
- 
-+dnl 
---------------------------------------------------------------------------
-+dnl Find PostgreSQL (GRASS optional dependency)
-+dnl 
---------------------------------------------------------------------------
-+
-+AC_ARG_WITH(postgres_includes,[  --with-postgres-includes=DIR     use 
PostgreSQL icnludes in DIR], postgres_includes="$withval", postgres_includes=no)
-+
-+PQ_INCLUDE=
-+if test "x$postgres_includes" != "xno"; then
-+# With PostgreSQL includes directory
-+PQ_INCLUDE="-I$postgres_includes"
-+fi
-+
-+AC_SUBST(PQ_INCLUDE)
-+
-+dnl 
---------------------------------------------------------------------------
-+
-+
- rm -f conftest*
- 
- AC_OUTPUT(Makefile)
diff --git a/debian/patches/grass7-makefile b/debian/patches/grass7-makefile
deleted file mode 100644
index 467c0bc..0000000
--- a/debian/patches/grass7-makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Update GRASS support for 7.0.0, .tables files moved to etc/proj/
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: https://trac.osgeo.org/gdal/ticket/5852
-Applied-Upstream: r28591, http://trac.osgeo.org/gdal/changeset/28591
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,8 +30,12 @@ install:    default
-       cp $(OLIBNAME) $(AUTOLOAD_DIR)
-       test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR}
-       test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc
--      cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
--      cp @GRASS_GISBASE@/etc/datum.table 
@GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc
-+      test ! -e @GRASS_GISBASE@/etc/ellipse.table || cp 
@GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
-+      test ! -e @GRASS_GISBASE@/etc/datum.table || cp 
@GRASS_GISBASE@/etc/datum.table ${GRASSTABLES_DIR}/etc
-+      test ! -e @GRASS_GISBASE@/etc/datumtransform.table || cp 
@GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc
-+      test ! -e @GRASS_GISBASE@/etc/proj/ellipse.table || cp 
@GRASS_GISBASE@/etc/proj/ellipse.table ${GRASSTABLES_DIR}/etc
-+      test ! -e @GRASS_GISBASE@/etc/proj/datum.table || cp 
@GRASS_GISBASE@/etc/proj/datum.table ${GRASSTABLES_DIR}/etc
-+      test ! -e @GRASS_GISBASE@/etc/proj/datumtransform.table || cp 
@GRASS_GISBASE@/etc/proj/datumtransform.table ${GRASSTABLES_DIR}/etc
-       test -d ${GRASSTABLES_DIR}/driver || mkdir ${GRASSTABLES_DIR}/driver
-       test -d ${GRASSTABLES_DIR}/driver/db || mkdir 
${GRASSTABLES_DIR}/driver/db
-       cp -r @GRASS_GISBASE@/driver/db/* ${GRASSTABLES_DIR}/driver/db/
diff --git a/debian/patches/hardening b/debian/patches/hardening
deleted file mode 100644
index 06e9317..0000000
--- a/debian/patches/hardening
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Support hardening buildflags
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: https://trac.osgeo.org/gdal/ticket/5850
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -4,8 +4,10 @@ CXX   =       @CXX@
- LD    =       @CXX@
- 
- CPPFLAGS = -DUSE_CPL -DGRASS_GISBASE=\"@GRASS_GISBASE@\" \
--        @GDAL_INC@ @GRASS_INCLUDE@ @CPPFLAGS@ 
-+        @GDAL_INC@ @GRASS_INCLUDE@ @CPPFLAGS@
- CXXFLAGS = @CXX_WFLAGS@ @CXX_PIC@ 
-+CFLAGS   = @CFLAGS@
-+LDFLAGS  = @LDFLAGS@
- 
- RANLIB                =       @RANLIB@
- SO_EXT                =       @SO_EXT@
-@@ -42,11 +44,11 @@ distclean: clean
- 
- 
- $(GLIBNAME):  grass57dataset.o
--      $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) 
-Wl,-rpath,/usr/lib/grass70/lib
-+      $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) 
-Wl,-rpath,/usr/lib/grass70/lib
- 
- $(OLIBNAME):  ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
--      $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
$(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
-+      $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o 
ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
- 
- %.o:  %.cpp
--      $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
-+      $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
- 
diff --git a/debian/patches/rpath b/debian/patches/rpath
index d7e9fe5..474c1f5 100644
--- a/debian/patches/rpath
+++ b/debian/patches/rpath
@@ -4,16 +4,16 @@ Forwarded: not-needed
 Last-Update: 2013-12-24
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -42,10 +42,10 @@ distclean: clean
+@@ -47,10 +47,10 @@ distclean: clean
  
  
  $(GLIBNAME):  grass57dataset.o
--      $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME)
-+      $(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) 
-Wl,-rpath,/usr/lib/grass70/lib
+-      $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME)
++      $(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) 
-Wl,-rpath,/usr/lib/grass70/lib
  
  $(OLIBNAME):  ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
--      $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
$(LIBS) -o $(OLIBNAME)
-+      $(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
$(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
+-      $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o 
ogrgrasslayer.o $(LIBS) -o $(OLIBNAME)
++      $(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o 
ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass70/lib
  
  %.o:  %.cpp
-       $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
+       $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
diff --git a/debian/patches/series b/debian/patches/series
index 67819f6..fbc8415 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
 rpath
-hardening
 environment-typo
-grass7-makefile
-grass7-configure
-grass7-configure-postgres

-- 
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

Reply via email to