[Git][debian-gis-team/gdal-grass][experimental] 21 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."
Bas Couwenberg
gitlab at salsa.debian.org
Mon Apr 27 18:23:13 BST 2020
Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal-grass
Commits:
a0e8787b by Bas Couwenberg at 2020-01-13T14:56:56+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 8a839ea5d05ef8fa8b17e0c66553d98affcd7203.
- - - - -
217bc2fd by Bas Couwenberg at 2020-01-13T14:57:08+01:00
New upstream version 3.0.3
- - - - -
e7f4cc6b by Bas Couwenberg at 2020-01-13T14:57:09+01:00
Update upstream source from tag 'upstream/3.0.3'
Update to upstream version '3.0.3'
with Debian dir 38f78d9984fec2f8063a8ac243db1fa143fa359e
- - - - -
869924c8 by Bas Couwenberg at 2020-01-13T15:00:19+01:00
New upstream release.
- - - - -
f8a6f304 by Bas Couwenberg at 2020-01-13T15:00:19+01:00
Set distribution to unstable.
- - - - -
fa9803f7 by Bas Couwenberg at 2020-01-25T10:33:34+01:00
Bump Standards-Version to 4.5.0, no changes.
- - - - -
1a3a44a7 by Bas Couwenberg at 2020-01-28T12:02:28+01:00
New upstream version 3.0.4~rc1
- - - - -
e523811c by Bas Couwenberg at 2020-01-28T12:02:29+01:00
Update upstream source from tag 'upstream/3.0.4_rc1'
Update to upstream version '3.0.4~rc1'
with Debian dir ce7d22b7b1d11d4f38392de55da5c10173a40c37
- - - - -
1eb63229 by Bas Couwenberg at 2020-01-28T12:02:59+01:00
New upstream release candidate.
- - - - -
f1edcec5 by Bas Couwenberg at 2020-01-28T12:03:18+01:00
Set distribution to experimental.
- - - - -
38484da1 by Bas Couwenberg at 2020-01-30T14:31:26+01:00
New upstream version 3.0.4
- - - - -
3a70a3fb by Bas Couwenberg at 2020-01-30T14:31:27+01:00
Update upstream source from tag 'upstream/3.0.4'
Update to upstream version '3.0.4'
with Debian dir c64c6a9f89ba95ce114f360928a9603a83bcaabf
- - - - -
abb0b9c4 by Bas Couwenberg at 2020-01-30T14:31:52+01:00
New upstream release.
- - - - -
c6ae1951 by Bas Couwenberg at 2020-01-30T14:32:15+01:00
Set distribution to unstable.
- - - - -
f4546d4b by Bas Couwenberg at 2020-03-19T18:01:40+01:00
Bump debhelper compat to 10.
Changes:
- Drop --parallel option, enabled by default
- Don't explicitly enable autoreconf, enabled by default
- Drop dh-autoreconf build dependency
- - - - -
a985d1ae by Bas Couwenberg at 2020-04-27T14:43:41+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
433f2e47 by Bas Couwenberg at 2020-04-27T14:56:24+02:00
New upstream version 3.1.0~rc1
- - - - -
5000ee40 by Bas Couwenberg at 2020-04-27T14:56:24+02:00
Update upstream source from tag 'upstream/3.1.0_rc1'
Update to upstream version '3.1.0~rc1'
with Debian dir 962f3ed9a9f2f6f850e114547f7e3892a70fab81
- - - - -
bb561518 by Bas Couwenberg at 2020-04-27T14:56:47+02:00
New upstream release candidate.
- - - - -
9719c30d by Bas Couwenberg at 2020-04-27T16:23:43+02:00
Update email address for Even Rouault.
- - - - -
ebd64932 by Bas Couwenberg at 2020-04-27T19:12:14+02:00
Set distribution to experimental.
- - - - -
10 changed files:
- VERSION
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/rules
- grass57dataset.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
VERSION
=====================================
@@ -1 +1 @@
-3.0.3
+3.1.0
=====================================
debian/changelog
=====================================
@@ -1,3 +1,35 @@
+libgdal-grass (3.1.0~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Bump debhelper compat to 10, changes:
+ - Drop --parallel option, enabled by default
+ - Don't explicitly enable autoreconf, enabled by default
+ - Drop dh-autoreconf build dependency
+ * Update email address for Even Rouault.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 27 Apr 2020 19:12:00 +0200
+
+libgdal-grass (3.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 30 Jan 2020 14:31:58 +0100
+
+libgdal-grass (3.0.4~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Bump Standards-Version to 4.5.0, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 28 Jan 2020 12:03:04 +0100
+
+libgdal-grass (3.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 13 Jan 2020 14:57:26 +0100
+
libgdal-grass (3.0.3~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+10
=====================================
debian/control
=====================================
@@ -4,16 +4,15 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Bas Couwenberg <sebastic at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
+Build-Depends: debhelper (>= 10~),
d-shlibs,
grass (>= 7.8.2),
grass-dev (>= 7.8.2),
- libgdal-dev (>= 3.0.3~),
+ libgdal-dev (>= 3.1.0~),
libpq-dev,
lsb-release,
pkg-config
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass
Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b experimental
Homepage: http://www.gdal.org/
=====================================
debian/copyright
=====================================
@@ -9,7 +9,7 @@ Source: GDAL-GRASS source is extracted from the GDAL source.
Files: *
Copyright: 1998-2013, Frank Warmerdam <warmerdam at pobox.com>
- 2007-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ 2007-2010, Even Rouault <even dot rouault at spatialys.com>
2005, Radim Blazek <radim.blazek at gmail.com>
License: MIT
=====================================
debian/rules
=====================================
@@ -25,7 +25,7 @@ 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/-/'))
%:
- dh $@ --with autoreconf --parallel
+ dh $@
override_dh_autoreconf:
mv configure configure.pre-autoreconf
=====================================
grass57dataset.cpp
=====================================
@@ -9,7 +9,7 @@
*
******************************************************************************
* Copyright (c) 2000 Frank Warmerdam <warmerdam at pobox.com>
- * Copyright (c) 2007-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -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 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $")
+CPL_CVSID("$Id: grass57dataset.cpp a5d5ed208537a05de4437e97b6a09b7ba44f76c9 2020-03-24 08:27:48 +0100 Kai Pastor $")
#if GRASS_VERSION_MAJOR >= 7
#define G_get_cellhd Rast_get_cellhd
@@ -117,7 +117,7 @@ static int Grass2CPLErrorHook( char * pszMessage, int bFatal )
class GRASSRasterBand;
-class GRASSDataset : public GDALDataset
+class GRASSDataset final: public GDALDataset
{
friend class GRASSRasterBand;
@@ -153,7 +153,7 @@ class GRASSDataset : public GDALDataset
/* ==================================================================== */
/************************************************************************/
-class GRASSRasterBand : public GDALRasterBand
+class GRASSRasterBand final: public GDALRasterBand
{
friend class GRASSDataset;
@@ -1053,7 +1053,7 @@ void GDALRegister_GRASS()
poDriver->SetDescription( "GRASS" );
poDriver->SetMetadataItem( GDAL_DCAP_RASTER, "YES" );
poDriver->SetMetadataItem( GDAL_DMD_LONGNAME, "GRASS Rasters (5.7+)" );
- poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "frmt_grass.html" );
+ poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "drivers/raster/grass.html" );
poDriver->pfnOpen = GRASSDataset::Open;
=====================================
ogrgrass.h
=====================================
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogrgrass.h 2c3d60220a2d6b41496ded571e231b96435bffa0 2016-11-25 14:09:24Z Even Rouault $
+ * $Id: ogrgrass.h 842d122d2f23aaebb28362e083b52d6bc7dbcde2 2019-08-11 17:42:34 +0200 Even Rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Private definitions for OGR/GRASS driver.
@@ -47,7 +47,7 @@ extern "C" {
/************************************************************************/
/* OGRGRASSLayer */
/************************************************************************/
-class OGRGRASSLayer : public OGRLayer
+class OGRGRASSLayer final: public OGRLayer
{
public:
OGRGRASSLayer( int layer, struct Map_info * map );
@@ -125,7 +125,7 @@ class OGRGRASSLayer : public OGRLayer
/************************************************************************/
/* OGRGRASSDataSource */
/************************************************************************/
-class OGRGRASSDataSource : public OGRDataSource
+class OGRGRASSDataSource final: public OGRDataSource
{
public:
OGRGRASSDataSource();
@@ -159,7 +159,7 @@ class OGRGRASSDataSource : public OGRDataSource
/************************************************************************/
/* OGRGRASSDriver */
/************************************************************************/
-class OGRGRASSDriver : public OGRSFDriver
+class OGRGRASSDriver final: public OGRSFDriver
{
public:
virtual ~OGRGRASSDriver();
=====================================
ogrgrassdatasource.cpp
=====================================
@@ -6,7 +6,7 @@
*
******************************************************************************
* Copyright (c) 2005, Radim Blazek <radim.blazek at gmail.com>
- * Copyright (c) 2008-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -31,7 +31,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
-CPL_CVSID("$Id: ogrgrassdatasource.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
+CPL_CVSID("$Id: ogrgrassdatasource.cpp b1c9c12ad373e40b955162b45d704070d4ebf7b0 2019-06-19 16:50:15 +0200 Even Rouault $")
#if GRASS_VERSION_MAJOR >= 7
#define G__setenv G_setenv_nogisrc
=====================================
ogrgrasslayer.cpp
=====================================
@@ -6,7 +6,7 @@
*
******************************************************************************
* Copyright (c) 2005, Radim Blazek <radim.blazek at gmail.com>
- * Copyright (c) 2008-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -31,7 +31,7 @@
#include "ogrgrass.h"
#include "cpl_conv.h"
-CPL_CVSID("$Id: ogrgrasslayer.cpp 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $")
+CPL_CVSID("$Id: ogrgrasslayer.cpp b1c9c12ad373e40b955162b45d704070d4ebf7b0 2019-06-19 16:50:15 +0200 Even Rouault $")
/************************************************************************/
/* OGRGRASSLayer() */
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/ba044ec8eb1a711c71e3a4cdac4d6f6a748184ac...ebd64932c7c272f6e859b58a4f3d2b69a43a65ef
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/ba044ec8eb1a711c71e3a4cdac4d6f6a748184ac...ebd64932c7c272f6e859b58a4f3d2b69a43a65ef
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/20200427/74851815/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list