[Git][debian-gis-team/gdal-grass][ubuntu/bionic] 83 commits: Override dh_gencontrol to set GRASS ABI dependency with substvars.
Martin Landa
gitlab at salsa.debian.org
Wed Nov 28 12:22:15 GMT 2018
Martin Landa pushed to branch ubuntu/bionic at Debian GIS Project / gdal-grass
Commits:
3ebaba99 by Bas Couwenberg at 2017-11-05T09:23:53Z
Override dh_gencontrol to set GRASS ABI dependency with substvars.
- - - - -
f5f2fd19 by Bas Couwenberg at 2017-11-15T20:50:43Z
Strip trailing whitespace from changelog.
- - - - -
0dcb7e5b by Bas Couwenberg at 2017-11-17T10:48:37Z
Strip trailing whitespace from changelog & rules.
- - - - -
bb55b5e8 by Bas Couwenberg at 2017-11-17T13:05:51Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
45e086ad by Bas Couwenberg at 2017-11-17T13:07:06Z
Bump minimum GRASS version to 7.4.0~.
- - - - -
4cd89337 by Bas Couwenberg at 2017-11-17T13:07:24Z
Set distribution to experimental.
- - - - -
0f2d3e0f by Bas Couwenberg at 2017-11-17T16:57:02Z
Update rpath patch for GRASS 7.4.
- - - - -
72c29fad by Bas Couwenberg at 2017-11-17T16:57:37Z
Set distribution to experimental.
- - - - -
86df3e77 by Bas Couwenberg at 2017-11-17T19:26:55Z
Drop libproj-dev from build dependencies, not directly required and already pulled in via libgdal-dev.
- - - - -
4a9741ec by Bas Couwenberg at 2017-12-14T19:56:13Z
Revert changes for GRASS 7.4 to build with GRASS 7.2.
- - - - -
19339a1d by Bas Couwenberg at 2017-12-14T19:56:42Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
06b7b416 by Bas Couwenberg at 2017-12-14T20:00:59Z
New upstream version 2.2.3
- - - - -
8a5a1039 by Bas Couwenberg at 2017-12-14T20:01:03Z
Merge tag 'upstream/2.2.3' into experimental-2.2
Upstream version 2.2.3
- - - - -
53b52398 by Bas Couwenberg at 2017-12-14T20:02:31Z
New upstream release.
- - - - -
1ba9a759 by Bas Couwenberg at 2017-12-15T11:58:20Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
409454bb by Bas Couwenberg at 2017-12-15T18:46:55Z
Bump Standards-Version to 4.1.2, no changes.
- - - - -
7ac710ce by Bas Couwenberg at 2017-12-15T18:46:55Z
Set distribution to experimental.
- - - - -
52ee3127 by Bas Couwenberg at 2017-12-17T11:38:11Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
a599c27c by Bas Couwenberg at 2017-12-17T11:38:48Z
Move from experimental to unstable.
- - - - -
92e7ba73 by Bas Couwenberg at 2018-01-20T14:49:13Z
Update copyright-format URL to use HTTPS.
- - - - -
be94484a by Bas Couwenberg at 2018-01-26T10:37:44Z
Bump minimum GRASS version to 7.4.0.
- - - - -
4541ee20 by Bas Couwenberg at 2018-01-26T10:38:17Z
Update rpath patch for GRASS 7.4.
- - - - -
8804e459 by Bas Couwenberg at 2018-01-26T10:39:17Z
Bump Standards-Version to 4.1.3, no changes.
- - - - -
982872f3 by Bas Couwenberg at 2018-01-26T10:39:30Z
Set distribution to unstable.
- - - - -
2f2bf3f4 by Bas Couwenberg at 2018-03-21T15:20:37Z
New upstream version 2.2.4
- - - - -
c7e11093 by Bas Couwenberg at 2018-03-21T15:20:40Z
Merge tag 'upstream/2.2.4'
Upstream version 2.2.4
- - - - -
86db3b66 by Bas Couwenberg at 2018-03-21T15:21:12Z
New upstream release.
- - - - -
59890cb5 by Bas Couwenberg at 2018-03-21T15:24:27Z
Add lintian override for vcs-deprecated-in-debian-infrastructure.
- - - - -
ffb2d8e2 by Bas Couwenberg at 2018-03-21T15:24:49Z
Set distribution to unstable.
- - - - -
623f77b5 by Bas Couwenberg at 2018-03-31T09:38:12Z
Update Vcs-* URLs for Salsa.
- - - - -
a957d993 by Bas Couwenberg at 2018-03-31T09:38:34Z
Drop override for vcs-deprecated-in-debian-infrastructure.
- - - - -
174fbbfc by Bas Couwenberg at 2018-04-18T17:58:51Z
Bump Standards-Version to 4.1.4, no changes.
- - - - -
42aa4285 by Bas Couwenberg at 2018-04-21T16:46:14Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
38270223 by Bas Couwenberg at 2018-04-21T16:48:32Z
New upstream version 2.3.0~beta1
- - - - -
8db99fc9 by Bas Couwenberg at 2018-04-21T16:48:33Z
Merge tag 'upstream/2.3.0_beta1' into experimental
Upstream version 2.3.0~beta1
- - - - -
32538404 by Bas Couwenberg at 2018-04-22T07:17:37Z
New upstream beta release.
- - - - -
4215c4e8 by Bas Couwenberg at 2018-04-22T07:18:18Z
Set distribution to experimental.
- - - - -
d5ad8409 by Bas Couwenberg at 2018-05-04T18:17:10Z
New upstream version 2.3.0~rc1
- - - - -
8fcb9f43 by Bas Couwenberg at 2018-05-04T18:17:12Z
Merge tag 'upstream/2.3.0_rc1' into experimental
Upstream version 2.3.0~rc1
- - - - -
30f19707 by Bas Couwenberg at 2018-05-04T18:17:53Z
New upstream release candidate.
- - - - -
8ca51226 by Bas Couwenberg at 2018-05-04T18:29:18Z
Enable parallel make.
- - - - -
45bdac01 by Bas Couwenberg at 2018-05-04T18:29:18Z
Set distribution to experimental.
- - - - -
24254a38 by Bas Couwenberg at 2018-05-07T12:44:11Z
Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.
- - - - -
6bb23f8c by Bas Couwenberg at 2018-05-07T12:44:29Z
Use dh_auto_install instead of make.
- - - - -
25f090ba by Bas Couwenberg at 2018-05-07T12:52:02Z
Strip trailing whitespace from changelog & control files.
- - - - -
bbe10a43 by Bas Couwenberg at 2018-05-07T20:10:07Z
Don't use version plugins directory.
- - - - -
dd793e1f by Bas Couwenberg at 2018-05-07T20:10:07Z
Set distribution to experimental.
- - - - -
6fe6d29a by Bas Couwenberg at 2018-05-11T10:38:10Z
New upstream version 2.3.0
- - - - -
82900884 by Bas Couwenberg at 2018-05-11T10:38:14Z
Merge tag 'upstream/2.3.0' into experimental
Upstream version 2.3.0
- - - - -
538fd1ec by Bas Couwenberg at 2018-05-11T10:39:38Z
New upstream release.
- - - - -
b93a23f2 by Bas Couwenberg at 2018-05-11T10:40:14Z
Set distribution to experimental.
- - - - -
76da5ccf by Bas Couwenberg at 2018-05-11T16:03:14Z
Bump minimum GDAL version to 2.3.0.
- - - - -
06c75c53 by Bas Couwenberg at 2018-05-24T16:36:36Z
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 42aa4285479fed5be4f3bcb4d2dc8e6eaed6ee45.
- - - - -
e93ddc48 by Bas Couwenberg at 2018-05-24T16:37:33Z
Set distribution to unstable.
- - - - -
07537c79 by Bas Couwenberg at 2018-06-09T20:44:13Z
Explicitly disable --as-needed on Ubuntu. See: https://trac.osgeo.org/osgeolive/ticket/2068
- - - - -
4308a6fd by Bas Couwenberg at 2018-06-10T11:42:18Z
Fix --no-as-needed flag.
- - - - -
61d026a5 by Bas Couwenberg at 2018-06-12T21:12:10Z
Bump minimum GRASS version to 7.4.1.
- - - - -
db1fdf7c by Bas Couwenberg at 2018-06-12T21:12:36Z
Set distribution to unstable.
- - - - -
b18a1c2d by Bas Couwenberg at 2018-06-22T13:01:01Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
d5e4644c by Bas Couwenberg at 2018-06-22T13:01:17Z
New upstream version 2.3.1~rc1
- - - - -
9bcace28 by Bas Couwenberg at 2018-06-22T13:01:20Z
Merge tag 'upstream/2.3.1_rc1' into experimental
Upstream version 2.3.1~rc1
- - - - -
c0e9fec7 by Bas Couwenberg at 2018-06-22T13:02:05Z
New upstream release candidate.
- - - - -
b4bedf48 by Bas Couwenberg at 2018-06-23T10:26:45Z
Set distribution to experimental.
- - - - -
387f38d6 by Bas Couwenberg at 2018-06-28T09:47:01Z
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit b18a1c2d93a6821201ee0cfaefc12b421566f352.
- - - - -
87fa026c by Bas Couwenberg at 2018-06-28T09:52:11Z
New upstream version 2.3.1
- - - - -
7af8d2d4 by Bas Couwenberg at 2018-06-28T09:52:16Z
Merge tag 'upstream/2.3.1'
Upstream version 2.3.1
- - - - -
7ae9c4e5 by Bas Couwenberg at 2018-06-28T09:53:41Z
New upstream release.
- - - - -
9da3a328 by Bas Couwenberg at 2018-06-28T09:54:06Z
Set distribution to unstable.
- - - - -
87355339 by Bas Couwenberg at 2018-06-29T18:52:02Z
Disable PIE only on older Ubuntu releases.
- - - - -
897b3ac4 by Bas Couwenberg at 2018-07-05T07:56:52Z
Bump Standards-Version to 4.1.5, no changes.
- - - - -
1eb5353f by Bas Couwenberg at 2018-07-09T16:15:04Z
Remove artful from list of Ubuntu releases, EOL soon.
- - - - -
b0b53b45 by Bas Couwenberg at 2018-07-31T13:48:42Z
Drop autopkgtest to test installability.
- - - - -
827b133a by Bas Couwenberg at 2018-07-31T13:49:41Z
Add lintian override for testsuite-autopkgtest-missing.
- - - - -
efcd9818 by Bas Couwenberg at 2018-07-31T13:49:56Z
Set distribution to unstable.
- - - - -
62b1f363 by Bas Couwenberg at 2018-08-04T09:59:27Z
Bump Standards-Version to 4.2.0, no changes.
- - - - -
5afe0d9e by Bas Couwenberg at 2018-08-28T07:52:30Z
Bump Standards-Version to 4.2.1, no changes.
- - - - -
ba094e65 by Bas Couwenberg at 2018-09-28T15:31:22Z
New upstream version 2.3.2
- - - - -
dc8ed4c0 by Bas Couwenberg at 2018-09-28T15:31:26Z
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
- - - - -
ba256490 by Bas Couwenberg at 2018-09-28T15:31:53Z
New upstream release.
- - - - -
0a7d9559 by Bas Couwenberg at 2018-09-28T15:32:31Z
Set distribution to unstable.
- - - - -
620292d2 by Bas Couwenberg at 2018-10-23T05:21:04Z
Bump minimum GRASS version to 7.4.2.
- - - - -
297dd0d4 by Bas Couwenberg at 2018-10-23T05:47:41Z
Set distribution to unstable.
- - - - -
878fec5c by Martin Landa at 2018-11-28T11:20:57Z
Rebuild 2.3.2 for bionic
- - - - -
14 changed files:
- VERSION
- configure.in
- debian/changelog
- debian/control
- debian/copyright
- debian/lintian-overrides
- debian/rules
- + debian/source/lintian-overrides
- − debian/tests/control
- grass57dataset.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrassdriver.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
VERSION
=====================================
@@ -1 +1 @@
-2.2.3
+2.3.2
=====================================
configure.in
=====================================
@@ -1,5 +1,5 @@
dnl ***************************************************************************
-dnl $Id: configure.in 37160 2017-01-17 07:34:22Z rouault $
+dnl $Id$
dnl
dnl Project: GDAL GRASS Plugin
dnl Purpose: Configure source file.
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libgdal-grass (2.3.2-2~bionic1) bionic; urgency=medium
+
+ * Rebuild for bionic.
+ * Bump mininum GRASS version to 7.4.3.
+
+ -- Martin Landa <landa.martin at gmail.com> Wed, 28 Nov 2018 12:17:52 +0100
+
libgdal-grass (2.2.3-3~bionic5) bionic; urgency=medium
* Override dh_gencontrol to set GRASS ABI dependency with substvars.
@@ -18,6 +25,41 @@ libgdal-grass (2.2.3-3~bionic3) bionic; urgency=medium
-- Martin Landa <landa.martin at gmail.com> Sun, 28 Oct 2018 11:06:54 +0100
+libgdal-grass (2.3.2-2) unstable; urgency=medium
+
+ * Bump minimum GRASS version to 7.4.2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 23 Oct 2018 07:47:26 +0200
+
+libgdal-grass (2.3.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 4.2.1, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Sep 2018 17:31:54 +0200
+
+libgdal-grass (2.3.1-2) unstable; urgency=medium
+
+ * Disable PIE only on older Ubuntu releases.
+ * Bump Standards-Version to 4.1.5, no changes.
+ * Drop autopkgtest to test installability.
+ * Add lintian override for testsuite-autopkgtest-missing.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 31 Jul 2018 15:49:42 +0200
+
+libgdal-grass (2.3.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 28 Jun 2018 11:53:44 +0200
+
+libgdal-grass (2.3.1~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 23 Jun 2018 12:25:56 +0200
+
libgdal-grass (2.2.3-3~bionic2) bionic; urgency=medium
* Rebuild for bionic.
@@ -37,6 +79,59 @@ libgdal-grass (2.2.2-1~xenial5) xenial; urgency=medium
-- Martin Landa <landa.martin at gmail.com> Thu, 14 Jun 2018 00:06:51 +0200
+libgdal-grass (2.3.0-1) unstable; urgency=medium
+
+ * Bump minimum GDAL version to 2.3.0.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 24 May 2018 18:37:15 +0200
+
+libgdal-grass (2.3.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 11 May 2018 12:40:00 +0200
+
+libgdal-grass (2.3.0~rc1-1~exp2) experimental; urgency=medium
+
+ * Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.
+ * Strip trailing whitespace from changelog & control files.
+ * Don't use version plugins directory.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 May 2018 19:08:06 +0200
+
+libgdal-grass (2.3.0~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Enable parallel make.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 04 May 2018 20:18:15 +0200
+
+libgdal-grass (2.3.0~beta1-1~exp1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Update Vcs-* URLs for Salsa.
+ * Drop override for vcs-deprecated-in-debian-infrastructure.
+ * Bump Standards-Version to 4.1.4, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 Apr 2018 09:17:58 +0200
+
+libgdal-grass (2.2.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Add lintian override for vcs-deprecated-in-debian-infrastructure.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 21 Mar 2018 16:24:30 +0100
+
+libgdal-grass (2.2.3-2) unstable; urgency=medium
+
+ * Update copyright-format URL to use HTTPS.
+ * Bump minimum GRASS version to 7.4.0.
+ * Update rpath patch for GRASS 7.4.
+ * Bump Standards-Version to 4.1.3, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 26 Jan 2018 11:39:22 +0100
+
libgdal-grass (2.2.2-1~xenial4) xenial; urgency=medium
* Rebuild for xenial.
@@ -44,6 +139,14 @@ libgdal-grass (2.2.2-1~xenial4) xenial; urgency=medium
-- Martin Landa <landa.martin at gmail.com> Sat, 27 Jan 2018 11:50:25 +0100
+libgdal-grass (2.3.0-2) unstable; urgency=medium
+
+ * Explicitly disable --as-needed on Ubuntu.
+ See: https://trac.osgeo.org/osgeolive/ticket/2068
+ * Bump minimum GRASS version to 7.4.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 12 Jun 2018 23:12:26 +0200
+
libgdal-grass (2.2.2-1~xenial3) xenial; urgency=medium
* Rebuild for xenial.
@@ -51,6 +154,22 @@ libgdal-grass (2.2.2-1~xenial3) xenial; urgency=medium
-- Martin Landa <landa.martin at gmail.com> Fri, 12 Jan 2018 13:36:15 +0100
+libgdal-grass (2.2.3-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 17 Dec 2017 12:38:42 +0100
+
+libgdal-grass (2.2.3-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop libproj-dev from build dependencies, not directly required and
+ already pulled in via libgdal-dev.
+ * Revert changes for GRASS 7.4 to build with GRASS 7.2.
+ * Bump Standards-Version to 4.1.2, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 15 Dec 2017 19:38:15 +0100
+
libgdal-grass (2.2.2-1~xenial2) xenial; urgency=medium
* Rebuild for xenial.
@@ -65,6 +184,20 @@ libgdal-grass (2.2.2-1~xenial1) xenial; urgency=medium
-- Martin Landa <landa.martin at gmail.com> Sun, 19 Nov 2017 22:19:30 +0100
+libgdal-grass (2.2.2-2~exp2) experimental; urgency=medium
+
+ * Update rpath patch for GRASS 7.4.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 17 Nov 2017 17:57:21 +0100
+
+libgdal-grass (2.2.2-2~exp1) experimental; urgency=medium
+
+ * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+ * Strip trailing whitespace from changelog & rules.
+ * Bump minimum GRASS version to 7.4.0~.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 17 Nov 2017 14:07:10 +0100
+
libgdal-grass (2.2.2-1) unstable; urgency=medium
* Bump Standards-Version to 4.1.1, no changes.
@@ -350,7 +483,7 @@ libgdal-grass (1.6.2-3) unstable; urgency=low
libgdal-grass (1.6.2-2) unstable; urgency=low
- * Now strictly depends on the full grass ABI version. This is useful
+ * Now strictly depends on the full grass ABI version. This is useful
because it can change even in release candidates and minor versions.
So, better being defensive to avoid unnoticed breakages.
* Depends on gdal >= 1.6.2 to be nice with backports.
@@ -364,8 +497,8 @@ libgdal-grass (1.6.2-1) unstable; urgency=low
packages when a binNMU is issued while GDAL is transitioning to a new
major version.
(closes: #544978)
- * Now depends at least on incoming 1.6.2-1 gdal-dev version that provides
- a suitable support patch for the previous trick.
+ * Now depends at least on incoming 1.6.2-1 gdal-dev version that provides
+ a suitable support patch for the previous trick.
-- Francesco Paolo Lovergine <frankie at debian.org> Tue, 08 Sep 2009 14:58:47 +0200
@@ -378,7 +511,7 @@ libgdal-grass (1.6.0-3) unstable; urgency=low
libgdal-grass (1.6.0-2) experimental; urgency=low
- * Introduced automagically dependency on the grass version used for building.
+ * Introduced automagically dependency on the grass version used for building.
IA t prevents breakages at major upgrading times. Note that debian/control
should be generated at run-time.
* Fixed typo in build-dep.
@@ -493,4 +626,3 @@ libgdal-grass (1.2.6-1) unstable; urgency=low
* Initial release (Closes: #248832)
-- Steve Halasz <debian at adkgis.org> Mon, 13 Jun 2005 13:00:27 -0400
-
=====================================
debian/control
=====================================
@@ -7,15 +7,15 @@ Priority: optional
Build-Depends: debhelper (>= 9),
dh-autoreconf,
d-shlibs,
- grass (>= 7.4.2),
- grass-dev (>= 7.4.2),
- libgdal-dev (>= 2.2.3),
- libproj-dev,
+ grass (>= 7.4.3),
+ grass-dev (>= 7.4.3),
+ libgdal-dev (>= 2.3.2),
libpq-dev,
+ lsb-release,
pkg-config
-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 -b ubuntu/bionic
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass
+Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b ubuntu/bionic
Homepage: http://www.gdal.org/
Package: libgdal-grass
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: GDAL-GRASS
Upstream-Contact: Frank Warmerdam <warmerdam at pobox.com>,
Radim Blazek <radim.blazek at gmail.com>
=====================================
debian/lintian-overrides
=====================================
@@ -1,4 +1,4 @@
# The run path has been added to get GRASS internal library
-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
+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
=====================================
debian/rules
=====================================
@@ -9,15 +9,18 @@ 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)
+DISTRIBUTION_RELEASE := $(shell lsb_release -cs)
ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
- export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+ ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial bionic))
+ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+ endif
+ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
endif
PKGNAME=$(shell grep Package: debian/control | 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/-/'))
-GDAL=$(shell cat VERSION | cut -d. -f1,2)
%:
dh $@ --with autoreconf --parallel
@@ -41,21 +44,15 @@ override_dh_auto_configure:
dh_auto_configure -- \
--prefix=/usr \
- --with-autoload=/usr/lib/gdalplugins/$(GDAL) \
+ --with-autoload=/usr/lib/gdalplugins \
--with-grass=/usr/lib/$(GRASS) \
--with-postgres-includes=$(shell pg_config --includedir)
override_dh_auto_install:
- mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
-
- $(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL) \
- GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
-
- # removes redundant stuff already installed by grass
- rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)
+ dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins
override_dh_shlibdeps:
- dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib
+ dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib
override_dh_strip:
# Debug files contain no debug symbols
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Not worth the effort
+testsuite-autopkgtest-missing
+
=====================================
debian/tests/control deleted
=====================================
@@ -1,3 +0,0 @@
-# Test installability
-Depends: @
-Test-Command: /bin/true
=====================================
grass57dataset.cpp
=====================================
@@ -63,7 +63,7 @@ char *GPJ_grass_to_wkt( struct Key_Value *,
#define GRASS_MAX_COLORS 100000 // what is the right value
-CPL_CVSID("$Id: grass57dataset.cpp 37964 2017-04-11 18:04:50Z rouault $");
+CPL_CVSID("$Id: grass57dataset.cpp c4d5cfef28c1c6fbb03a9ab1d42835e6cfa920cc 2017-12-20 12:29:27Z Kurt Schwehr $")
#if GRASS_VERSION_MAJOR >= 7
#define G_get_cellhd Rast_get_cellhd
@@ -132,11 +132,11 @@ class GRASSDataset : public GDALDataset
double adfGeoTransform[6];
public:
- GRASSDataset();
- ~GRASSDataset();
+ GRASSDataset();
+ ~GRASSDataset() override;
- virtual const char *GetProjectionRef(void) override;
- virtual CPLErr GetGeoTransform( double * ) override;
+ const char *GetProjectionRef(void) override;
+ CPLErr GetGeoTransform( double * ) override;
static GDALDataset *Open( GDALOpenInfo * );
@@ -174,21 +174,20 @@ class GRASSRasterBand : public GDALRasterBand
bool valid;
public:
-
- GRASSRasterBand( GRASSDataset *, int,
- const char *, const char * );
- virtual ~GRASSRasterBand();
-
- virtual CPLErr IReadBlock( int, int, void * ) override;
- virtual CPLErr IRasterIO ( GDALRWFlag, int, int, int, int, void *, int, int, GDALDataType,
- GSpacing nPixelSpace,
- GSpacing nLineSpace,
- GDALRasterIOExtraArg* psExtraArg) override;
- virtual GDALColorInterp GetColorInterpretation() override;
- virtual GDALColorTable *GetColorTable() override;
- virtual double GetMinimum( int *pbSuccess = NULL ) override;
- virtual double GetMaximum( int *pbSuccess = NULL ) override;
- virtual double GetNoDataValue( int *pbSuccess = NULL ) override;
+ GRASSRasterBand( GRASSDataset *, int, const char *, const char * );
+ ~GRASSRasterBand() override;
+
+ CPLErr IReadBlock( int, int, void * ) override;
+ CPLErr IRasterIO ( GDALRWFlag, int, int, int, int,
+ void *, int, int, GDALDataType,
+ GSpacing nPixelSpace,
+ GSpacing nLineSpace,
+ GDALRasterIOExtraArg* psExtraArg) override;
+ GDALColorInterp GetColorInterpretation() override;
+ GDALColorTable *GetColorTable() override;
+ double GetMinimum( int *pbSuccess = NULL ) override;
+ double GetMaximum( int *pbSuccess = NULL ) override;
+ double GetNoDataValue( int *pbSuccess = NULL ) override;
private:
CPLErr ResetReading( struct Cell_head * );
=====================================
ogrgrass.h
=====================================
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogrgrass.h 36501 2016-11-25 14:09:24Z rouault $
+ * $Id: ogrgrass.h 2c3d60220a2d6b41496ded571e231b96435bffa0 2016-11-25 14:09:24Z Even Rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Private definitions for OGR/GRASS driver.
=====================================
ogrgrassdatasource.cpp
=====================================
@@ -31,7 +31,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
-CPL_CVSID("$Id: ogrgrassdatasource.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrassdatasource.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
#if GRASS_VERSION_MAJOR >= 7
#define G__setenv G_setenv_nogisrc
=====================================
ogrgrassdriver.cpp
=====================================
@@ -30,7 +30,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
-CPL_CVSID("$Id: ogrgrassdriver.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrassdriver.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
/************************************************************************/
/* ~OGRGRASSDriver() */
=====================================
ogrgrasslayer.cpp
=====================================
@@ -31,7 +31,7 @@
#include "ogrgrass.h"
#include "cpl_conv.h"
-CPL_CVSID("$Id: ogrgrasslayer.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrasslayer.cpp 4971449609881d6ffdca70188292293852d12691 2017-12-17 16:48:14Z Even Rouault $")
/************************************************************************/
/* OGRGRASSLayer() */
@@ -789,11 +789,9 @@ OGRFeature *OGRGRASSLayer::GetFeature( GIntBig nFeatureId )
nFeatureId );
int cat;
- OGRFeature *poFeature = NULL;
-
OGRGeometry *poOGR = GetFeatureGeometry ( nFeatureId, &cat );
- poFeature = new OGRFeature( poFeatureDefn );
+ OGRFeature* poFeature = new OGRFeature( poFeatureDefn );
poFeature->SetGeometryDirectly( poOGR );
poFeature->SetFID ( nFeatureId );
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/fad4eee39510fcbf1bc2966c27359808245c8e00...878fec5c6d6cf59f6e02c859c25b48102695be8e
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/fad4eee39510fcbf1bc2966c27359808245c8e00...878fec5c6d6cf59f6e02c859c25b48102695be8e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181128/8a9847f4/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list