This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gdal-grass.
commit 80c23c40e65826fcadc5bdb673dee6eb605d2529
Merge: ac4cad9 82abdf3
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Aug 23 21:21:33 2015 +0200
Merge branch 'experimental'
Conflicts:
debian/changelog
debian/copyright
VERSION | 2 +-
debian/changelog | 56 ++++++++++++++++++++++++++
debian/control | 17 ++++----
debian/control.in | 17 ++++----
debian/copyright | 13 +-----
debian/libgdal1-1.10.1-grass.lintian-overrides | 3 --
debian/libgdal1-1.11.2-grass.lintian-overrides | 3 ++
debian/lintian-overrides.in | 6 +--
debian/patches/environment-typo | 9 +++--
debian/patches/grass7-configure | 48 ++++++++++++++++++++++
debian/patches/grass7-configure-postgres | 52 ++++++++++++++++++++++++
debian/patches/grass7-makefile | 22 ++++++++++
debian/patches/hardening | 10 +++--
debian/patches/rpath | 4 +-
debian/patches/series | 3 ++
debian/rules | 17 +++++---
grass57dataset.cpp | 18 ++++++---
ogrgrassdatasource.cpp | 11 ++++-
ogrgrasslayer.cpp | 5 ++-
19 files changed, 258 insertions(+), 58 deletions(-)
diff --cc debian/changelog
index cdf20c9,45ab6aa..89b4f62
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,59 +1,66 @@@
+ libgdal-grass (1.11.2-1~exp3) experimental; urgency=medium
+
+ * Don't require at minimum GRASS version 7.0.0, 6.4.0~rc5 is suffient.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 19 Jun 2015 02:09:06 +0200
+
+ libgdal-grass (1.11.2-1~exp2) experimental; urgency=medium
+
+ * Bump minimum GRASS version to 7.0.0.
+ * Update patches for GRASS 7.0.0.
+ * Add patches by Martin Landa:
+ - grass7-configure improve GRASS version detection
+ - grass7-configure-postgres add configure support for postgres includes
+ libpq-dev is now a dependency to query the includedir with pq_config
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 18 Mar 2015 22:16:08 +0100
+
+ libgdal-grass (1.11.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update my email to @debian.org address.
+ * Refresh patches.
+ * Update Vcs-Browser URL to use cgit instead of gitweb.
+ * Update copyright file, group files & copyright by license.
+ * Add patch to support GRASS 7.0.0RC2.
+ * Add path to add include directory for libpq.h required for GRASS with
+ PostgreSQL support.
+ * Bump minimum GRASS version to 7.0.0~rc2.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 20 Feb 2015 15:44:50 +0100
+
+ libgdal-grass (1.11.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Refresh patches.
+ * Bump Standards-Version to 3.9.6, no changes.
+ * Set experimental branch in Vcs-Git and gbp.conf.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sun, 12 Oct 2014 16:16:47 +0200
+
+ libgdal-grass (1.11.0-1~exp2) experimental; urgency=medium
+
+ * Update for GRASS 6.4.4.
+ * Include default Files section from gdal copyright file.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sun, 07 Sep 2014 12:03:30 +0200
+
+ libgdal-grass (1.11.0-1~exp1) experimental; urgency=low
+
+ * New upstream release.
+ * Update copyright file.
+ * Move GDAL version check to configure target, to allow pbuilder builds
+ without requiring a matching GDAL installed outside the build environment.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sun, 04 May 2014 14:43:12 +0200
+
+libgdal-grass (1.10.1-3) unstable; urgency=medium
+
+ * Update for GRASS 6.4.4.
+ * Include default Files section from gdal copyright file.
+
+ -- Bas Couwenberg <sebas...@xs4all.nl> Sun, 07 Sep 2014 12:02:33 +0200
+
libgdal-grass (1.10.1-2) unstable; urgency=medium
* Add myself to Uploaders.
diff --cc debian/control
index 146b0c8,aab6b73..f5d1629
--- a/debian/control
+++ b/debian/control
@@@ -5,19 -5,20 +5,20 @@@ Uploaders: Francesco Paolo Lovergine <f
Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
d-shlibs,
- libgdal-dev (>= 1.10.1-0~),
- pkg-config,
- grass-dev (>= 6.4.0~rc5),
grass (>= 6.4.0~rc5),
+ grass-dev (>= 6.4.0~rc5),
+ libgdal-dev (>= 1.11.2-1~),
libproj-dev,
- dh-autoreconf
- Standards-Version: 3.9.5
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal-grass.git
+ libpq-dev,
+ pkg-config
+ Standards-Version: 3.9.6
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal-grass.git -b experimental
+Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal-grass.git
Homepage: http://www.gdal.org/
- Package: libgdal1-1.10.1-grass
+ Package: libgdal1-1.11.2-grass
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
diff --cc debian/control.in
index 07468ae,028a9e9..0e86603
--- a/debian/control.in
+++ b/debian/control.in
@@@ -5,19 -5,20 +5,20 @@@ Uploaders: Francesco Paolo Lovergine <f
Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
d-shlibs,
- libgdal-dev (>= 1.10.1-0~),
- pkg-config,
- grass-dev (>= 6.4.0~rc5),
grass (>= 6.4.0~rc5),
+ grass-dev (>= 6.4.0~rc5),
+ libgdal-dev (>= 1.11.2-1~),
libproj-dev,
- dh-autoreconf
- Standards-Version: 3.9.5
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal-grass.git
+ libpq-dev,
+ pkg-config
+ Standards-Version: 3.9.6
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal-grass.git -b experimental
+Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal-grass.git
Homepage: http://www.gdal.org/
- Package: libgdal1-1.10.1-grass
+ Package: libgdal1-1.11.2-grass
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
--
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
