[Git][debian-gis-team/gdal-grass][master] 18 commits: Update branch in gbp.conf & Vcs-Git URL.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / gdal-grass


Commits:
5cffbd4f by Bas Couwenberg at 2021-11-01T17:43:32+01:00
Update branch in gbp.conf & Vcs-Git URL.

- - - - -
70e1c2c9 by Bas Couwenberg at 2021-11-01T18:25:08+01:00
New upstream version 3.4.0~rc1
- - - - -
507133cf by Bas Couwenberg at 2021-11-01T18:25:11+01:00
Update upstream source from tag 'upstream/3.4.0_rc1'

Update to upstream version '3.4.0~rc1'
with Debian dir c914e47503f057236124033229997c32da6ff66a
- - - - -
d08a87fe by Bas Couwenberg at 2021-11-01T18:26:06+01:00
New upstream release candidate.

- - - - -
30f2b6b0 by Bas Couwenberg at 2021-11-03T13:31:58+01:00
New upstream version 3.4.0~rc2
- - - - -
7a6011b8 by Bas Couwenberg at 2021-11-03T13:31:59+01:00
Update upstream source from tag 'upstream/3.4.0_rc2'

Update to upstream version '3.4.0~rc2'
with Debian dir f83451821296d804b7288294bbf611bde2687661
- - - - -
9dd9b730 by Bas Couwenberg at 2021-11-03T13:32:49+01:00
New upstream release candidate.

- - - - -
fb87cfd2 by Bas Couwenberg at 2021-11-04T13:50:14+01:00
New upstream version 3.4.0~rc3
- - - - -
a8d46609 by Bas Couwenberg at 2021-11-04T13:50:15+01:00
Update upstream source from tag 'upstream/3.4.0_rc3'

Update to upstream version '3.4.0~rc3'
with Debian dir 29104cd70fa85b1521e70fc9461706ce63a49aaa
- - - - -
5631702d by Bas Couwenberg at 2021-11-04T13:50:36+01:00
New upstream release candidate.

- - - - -
5b110cc6 by Bas Couwenberg at 2021-11-06T15:07:41+01:00
Set distribution to experimental.

- - - - -
3c7ca517 by Bas Couwenberg at 2021-11-08T15:02:17+01:00
New upstream version 3.4.0
- - - - -
c85a2ba3 by Bas Couwenberg at 2021-11-08T15:02:18+01:00
Update upstream source from tag 'upstream/3.4.0'

Update to upstream version '3.4.0'
with Debian dir 1b379cacb2736a58eaee0ad43957fd7c597a706c
- - - - -
4ee9b1f1 by Bas Couwenberg at 2021-11-08T15:02:33+01:00
New upstream release.

- - - - -
78c7a5d3 by Bas Couwenberg at 2021-11-08T16:09:47+01:00
Set distribution to experimental.

- - - - -
21be9aaa by Bas Couwenberg at 2021-12-08T12:51:50+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit 5cffbd4f5f317d5c058d2a1e11de7bae24a6bc62.

- - - - -
5ad5345c by Bas Couwenberg at 2021-12-08T13:51:31+01:00
Update lintian overrides.

- - - - -
4d85f734 by Bas Couwenberg at 2021-12-08T13:51:51+01:00
Set distribution to unstable.

- - - - -


5 changed files:

- VERSION
- debian/changelog
- debian/control
- debian/lintian-overrides
- ogrgrasslayer.cpp


Changes:

=====================================
VERSION
=====================================
@@ -1 +1 @@
-3.3.3
+3.4.0


=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+libgdal-grass (3.4.0-1) unstable; urgency=medium
+
+  * Update lintian overrides.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Dec 2021 13:40:46 +0100
+
+libgdal-grass (3.4.0-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 08 Nov 2021 16:09:34 +0100
+
+libgdal-grass (3.4.0~rc3-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 06 Nov 2021 15:07:27 +0100
+
 libgdal-grass (3.3.3-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 12),
                grass (>= 7.8.6),
                grass-dev (>= 7.8.6),
-               libgdal-dev (>= 3.3.3),
+               libgdal-dev (>= 3.4.0),
                libpq-dev,
                lsb-release,
                pkg-config


=====================================
debian/lintian-overrides
=====================================
@@ -1,4 +1,3 @@
 # The run path has been added to get GRASS internal library
-custom-library-search-path usr/lib/gdalplugins/gdal_GRASS.so RUNPATH usr/lib/grass*/lib/
-custom-library-search-path usr/lib/gdalplugins/ogr_GRASS.so RUNPATH usr/lib/grass*/lib/
+custom-library-search-path RUNPATH /usr/lib/grass*/lib [usr/lib/gdalplugins/*_GRASS.so]
 


=====================================
ogrgrasslayer.cpp
=====================================
@@ -31,7 +31,7 @@
 #include "ogrgrass.h"
 #include "cpl_conv.h"
 
-CPL_CVSID("$Id: ogrgrasslayer.cpp a832da5b936bac8438f9c50e7c20e563fd94c9ff 2020-09-22 13:06:27 +0200 Markus Neteler $")
+CPL_CVSID("$Id: ogrgrasslayer.cpp 5163a8056bee931f5bc8e72676d90092cdd1d760 2021-08-12 22:25:24 +0200 Even Rouault $")
 
 /************************************************************************/
 /*                           OGRGRASSLayer()                            */
@@ -486,8 +486,10 @@ bool OGRGRASSLayer::SetQueryMatch()
 
         // Go through category index until first record of current category
         // is found or a category > current is found
-        int cidxcat, type, id;
+        int id = -1;
         while ( cidx < ncats ) {
+            int cidxcat = 0;
+            int type = 0;
             Vect_cidx_get_cat_by_index ( poMap, iLayerIndex, cidx,
                                          &cidxcat, &type, &id );
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/b2f31782f7d195f217efb18fa8bfda7c4449951f...4d85f7349c2fcfd31d1bfe606c90d0854d2ee393

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/b2f31782f7d195f217efb18fa8bfda7c4449951f...4d85f7349c2fcfd31d1bfe606c90d0854d2ee393
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/20211208/7ef88473/attachment-0001.htm>