[Git][debian-gis-team/gdal-grass][experimental] 9 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."

[Bas Couwenberg (@sebastic)]

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


Commits:
aa5fcfe0 by Bas Couwenberg at 2021-10-29T17:27:31+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit 84a45a632fa00cfe504ef49c1a8889d9cbf9d55d.

- - - - -
b0f88af3 by Bas Couwenberg at 2021-10-29T17:28:01+02:00
New upstream version 3.3.3
- - - - -
a6ec7f23 by Bas Couwenberg at 2021-10-29T17:28:02+02:00
Update upstream source from tag 'upstream/3.3.3'

Update to upstream version '3.3.3'
with Debian dir 2bc28d15f9c23c505f99598f192e6ad8d8524c16
- - - - -
357a12a4 by Bas Couwenberg at 2021-10-29T17:28:31+02:00
New upstream release.

- - - - -
b2f31782 by Bas Couwenberg at 2021-10-29T17:29:05+02:00
Set distribution to unstable.

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

- - - - -


4 changed files:

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


Changes:

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


=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+libgdal-grass (3.4.0~rc1-1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Nov 2021 18:25:49 +0100
+
+libgdal-grass (3.3.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Oct 2021 17:28:47 +0200
+
 libgdal-grass (3.3.3~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


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


=====================================
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/ebcaa87e623bceead61b2f3e40574102ba0fe13c...d08a87fe700727e15ed23c81035b2759346bcd1a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/ebcaa87e623bceead61b2f3e40574102ba0fe13c...d08a87fe700727e15ed23c81035b2759346bcd1a
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/20211101/d4affe76/attachment-0001.htm>