[gdal-grass] 01/01: Rebuild 2.2.2 for trusty
Martin Landa
martinl-guest at moszumanska.debian.org
Sun Jan 28 19:23:05 UTC 2018
This is an automated email from the git hooks/post-receive script.
martinl-guest pushed a commit to branch ubuntu/trusty
in repository gdal-grass.
commit 8cfef0c08581f3faedcaabce4c8b71901f99a819
Merge: f6a3ee3 73e208e
Author: Martin Landa <landa.martin at gmail.com>
Date: Sun Jan 28 20:22:22 2018 +0100
Rebuild 2.2.2 for trusty
Makefile.in | 13 -
README | 18 +-
VERSION | 2 +-
aclocal.m4 | 16 +-
configure | 70 +-
configure.in | 15 +-
debian/changelog | 201 ++++++
debian/control | 26 +-
debian/control.in | 24 +-
debian/libgdal20-2.1.0-grass.lintian-overrides | 3 -
debian/lintian-overrides | 5 +-
debian/patches/grass72.patch | 30 -
debian/patches/rpath | 2 +-
debian/patches/series | 1 -
debian/rules | 2 +-
debian/tests/control | 3 +
grass57dataset.cpp | 462 ++++++-------
ogrgrass.h | 137 ++--
ogrgrassdatasource.cpp | 75 +--
ogrgrassdriver.cpp | 33 +-
ogrgrasslayer.cpp | 886 ++++++++++++-------------
21 files changed, 1066 insertions(+), 958 deletions(-)
diff --cc debian/changelog
index 4be8ceb,8b10346..e66988e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,190 +1,221 @@@
++libgdal-grass (2.2.2-1~trusty2) trusty; urgency=medium
++
++ * Rebuild for trusty.
++ * Bump minimum version to GRASS 7.4.0.
++
++ -- Martin Landa <landa.martin at gmail.com> Sun, 28 Jan 2018 19:51:49 +0100
++
+ libgdal-grass (2.2.2-1) unstable; urgency=medium
+
+ * Bump Standards-Version to 4.1.1, no changes.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 03 Oct 2017 20:02:16 +0200
+
+ libgdal-grass (2.2.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 4.1.0, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 22 Sep 2017 15:07:24 +0200
+
+ libgdal-grass (2.2.2~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 16 Sep 2017 02:21:56 +0200
+
+ libgdal-grass (2.2.1-2) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 16 Sep 2017 16:42:42 +0200
+
+ libgdal-grass (2.2.1-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 10 Jul 2017 18:31:09 +0200
+
+ libgdal-grass (2.2.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 30 Jun 2017 15:04:00 +0200
+
+ libgdal-grass (2.2.1~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Disable PIE on Ubuntu where it's still problematic.
+ * Bump Standards-Version to 4.0.0, no changes.
+ * Add autopkgtest to test installability.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 23 Jun 2017 17:07:35 +0200
+
+ libgdal-grass (2.2.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump minimum GRASS version to 7.2.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 09 May 2017 18:23:57 +0200
+
+ libgdal-grass (2.2.0~beta1-1~exp1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Drop Breaks/Replaces for old binary packages, 2.2 subdirectory now used.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 15 Apr 2017 12:17:42 +0200
+
+ libgdal-grass (2.1.3-1~exp2) experimental; urgency=medium
+
+ * Merge changes from libgdal-grass (2.1.2-5).
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 03 Apr 2017 01:22:02 +0200
+
+ libgdal-grass (2.1.3-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 27 Jan 2017 13:12:12 +0100
+
+ libgdal-grass (2.1.3~rc1-1~exp3) experimental; urgency=medium
+
+ * Add Breaks/Replaces for old version specific binary packages.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 26 Jan 2017 21:11:06 +0100
+
+ libgdal-grass (2.1.3~rc1-1~exp2) experimental; urgency=medium
+
+ * Rename library package to libgdal-grass, drop now obsolete metapackage.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 21 Jan 2017 12:20:20 +0100
+
+ libgdal-grass (2.1.3~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop grass72.patch, applied upstream. Refresh remaining patch.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 20 Jan 2017 11:41:22 +0100
+
+ libgdal-grass (2.1.2-6) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.1.
+ * Bump Standards-Version to 4.0.0, no changes.
+ * Add autopkgtest to test installability.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 18 Jun 2017 19:46:34 +0200
+
+ libgdal-grass (2.1.2-5) unstable; urgency=medium
+
+ * Enable PIE hardening flags.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 02 Apr 2017 23:43:22 +0200
+
+libgdal-grass (2.1.0-1~trusty3) trusty; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.0.
+ * Update rpath patch for GRASS 7.2.
+ * Add patch to link GRASS 7.2 libraries.
+ * Move control file generation to separate templates target.
+ * Add metapackage to pull in the version specific binary package.
+ * Update watch file to use HTTPS for trac.osgeo.org.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 17 Jan 2017 15:23:33 +0100
+
+ libgdal-grass (2.1.2-4) unstable; urgency=medium
+
+ * Add patch to link GRASS 7.2 libraries.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 17 Jan 2017 01:50:21 +0100
+
+ libgdal-grass (2.1.2-3) unstable; urgency=medium
+
+ * Update rpath patch for GRASS 7.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 16 Jan 2017 19:15:15 +0100
+
+ libgdal-grass (2.1.2-2) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.0.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 28 Dec 2016 19:46:06 +0100
+
+ libgdal-grass (2.1.2-2~exp1) experimental; urgency=medium
+
+ * Bump minimum GRASS version to 7.2.0~rc1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 16:30:08 +0200
+
+ libgdal-grass (2.1.2-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Oct 2016 00:08:05 +0200
+
+ libgdal-grass (2.1.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 27 Oct 2016 20:20:08 +0200
+
+ libgdal-grass (2.1.2~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 14 Oct 2016 19:40:18 +0200
+
+libgdal-grass (2.1.0-1~trusty2) trusty; urgency=medium
+
+ * Update branch in gbp.conf & Vcs-Git URL.
+ * Bump minimum GRASS version to 7.0.5.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 03 Oct 2016 13:13:13 +0200
+
+ libgdal-grass (2.1.1-3) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.0.5.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 02 Oct 2016 22:30:08 +0200
+
+ libgdal-grass (2.1.1-2) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 10 Aug 2016 15:02:31 +0200
+
+ libgdal-grass (2.1.1-2~exp1) experimental; urgency=medium
+
+ * Add metapackage to pull in the version specific binary package.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 06 Aug 2016 23:04:16 +0200
+
+ libgdal-grass (2.1.1-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 13 Jul 2016 16:30:03 +0200
+
+ libgdal-grass (2.1.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update watch file to use HTTPS for trac.osgeo.org.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 13 Jul 2016 12:11:01 +0200
+
+ libgdal-grass (2.1.1~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Move control file generation to separate templates target.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 04 Jul 2016 21:56:57 +0200
+
+libgdal-grass (2.1.0-1~trusty1) trusty; urgency=medium
+
+ * Backport to Trusty.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Tue, 31 May 2016 21:38:00 +0200
+
libgdal-grass (2.1.0-1) unstable; urgency=medium
* Move from experimental to unstable.
diff --cc debian/control
index 0c02f2b,bb8e713..4d20c10
--- a/debian/control
+++ b/debian/control
@@@ -7,21 -7,21 +7,21 @@@ Priority: optiona
Build-Depends: debhelper (>= 9),
dh-autoreconf,
d-shlibs,
- grass (>= 7.2.0),
- grass-dev (>= 7.2.0),
- libgdal-dev (>= 2.1.0),
- grass (>= 7.2.2),
- grass-dev (>= 7.2.2),
++ grass (>= 7.4.0),
++ grass-dev (>= 7.4.0),
+ libgdal-dev (>= 2.2.2),
libproj-dev,
libpq-dev,
pkg-config
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b ubuntu/trusty
Homepage: http://www.gdal.org/
- Package: libgdal20-2.1.0-grass
+ Package: libgdal-grass
Architecture: any
Section: libs
- Depends: grass720,
-Depends: grass722,
++Depends: grass740,
${shlibs:Depends},
${misc:Depends}
Recommends: gdal-bin
@@@ -32,17 -32,4 +32,3 @@@ Description: GRASS extension for the GD
provides access to GRASS data via GDAL.
.
This package provides the GDAL GRASS plugin.
-
- Package: libgdal-grass
- Architecture: all
- Section: metapackages
- Depends: libgdal20-2.1.0-grass,
- ${misc:Depends}
- Description: GRASS extension for the GDAL library - metapackage
- GDAL is a translator library for raster geospatial data formats.
- As a library, it presents a single abstract data model to the
- calling application for all supported formats. This extension
- provides access to GRASS data via GDAL.
- .
- This metapackage depends on the version specific library package.
--
diff --cc debian/control.in
index f09bf50,962d459..494229f
--- a/debian/control.in
+++ b/debian/control.in
@@@ -7,18 -7,18 +7,18 @@@ Priority: optiona
Build-Depends: debhelper (>= 9),
dh-autoreconf,
d-shlibs,
- grass (>= 7.2.0),
- grass-dev (>= 7.2.0),
- libgdal-dev (>= 2.1.0),
- grass (>= 7.2.2),
- grass-dev (>= 7.2.2),
++ grass (>= 7.4.0),
++ grass-dev (>= 7.4.0),
+ libgdal-dev (>= 2.2.2),
libproj-dev,
libpq-dev,
pkg-config
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b ubuntu/trusty
Homepage: http://www.gdal.org/
- Package: libgdal20-2.1.0-grass
+ Package: libgdal-grass
Architecture: any
Section: libs
Depends: @GRASS_ABI@,
@@@ -32,17 -32,4 +32,3 @@@ Description: GRASS extension for the GD
provides access to GRASS data via GDAL.
.
This package provides the GDAL GRASS plugin.
-
- Package: libgdal-grass
- Architecture: all
- Section: metapackages
- Depends: libgdal20-2.1.0-grass,
- ${misc:Depends}
- Description: GRASS extension for the GDAL library - metapackage
- GDAL is a translator library for raster geospatial data formats.
- As a library, it presents a single abstract data model to the
- calling application for all supported formats. This extension
- provides access to GRASS data via GDAL.
- .
- This metapackage depends on the version specific library package.
--
diff --cc debian/lintian-overrides
index b2ca9a8,a75cff8..27ec498
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@@ -1,4 -1,4 +1,3 @@@
# The run path has been added to get GRASS internal library
- libgdal20-2.1.0-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
- libgdal20-2.1.0-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
-
+ libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
+ libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
-
diff --cc debian/rules
index ef5a51f,cdebb8a..6e50a15
--- a/debian/rules
+++ b/debian/rules
@@@ -5,8 -5,15 +5,8 @@@
#export DH_VERBOSE=1
# Enable hardening build flags
- export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-# Disable PIE on Ubuntu where it's still problematic
-VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
-
-ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
- export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-endif
-
PKGNAME=$(shell grep Package: debian/control.in | head -1 | cut -d' ' -f2)
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git
More information about the Pkg-grass-devel
mailing list