[Git][debian-gis-team/gdal][experimental] 4 commits: Strip trailing whitespace from changelog, control & rules files.
Bas Couwenberg
gitlab at salsa.debian.org
Mon May 7 20:47:00 BST 2018
Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal
Commits:
a22f77de by Bas Couwenberg at 2018-05-07T14:53:52+02:00
Strip trailing whitespace from changelog, control & rules files.
- - - - -
5d7870ae by Bas Couwenberg at 2018-05-07T19:54:33+02:00
Don't use version specified data & plugins directory.
- - - - -
4f656828 by Bas Couwenberg at 2018-05-07T20:55:28+02:00
Update symbols for 2.3.0~rc1.
- - - - -
8e0bee2a by Bas Couwenberg at 2018-05-07T20:55:28+02:00
Set distribution to experimental.
- - - - -
20 changed files:
- debian/changelog
- debian/control
- debian/gdal-data.install
- debian/libgdal20.symbols.alpha
- debian/libgdal20.symbols.amd64
- debian/libgdal20.symbols.arm64
- debian/libgdal20.symbols.armel
- debian/libgdal20.symbols.armhf
- debian/libgdal20.symbols.common
- debian/libgdal20.symbols.i386
- debian/libgdal20.symbols.mips
- debian/libgdal20.symbols.mips64el
- debian/libgdal20.symbols.powerpc
- debian/libgdal20.symbols.ppc64
- debian/libgdal20.symbols.ppc64el
- debian/libgdal20.symbols.s390x
- debian/libgdal20.symbols.sparc64
- − debian/patches/gdalpaths
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-gdal (2.3.0~rc1+dfsg-1~exp2) UNRELEASED; urgency=medium
+gdal (2.3.0~rc1+dfsg-1~exp2) experimental; urgency=medium
* Drop ancient X-Python3-Version field.
+ * Strip trailing whitespace from changelog, control & rules files.
+ * Don't use version specified data & plugins directory.
+ * Update symbols for 2.3.0~rc1.
- -- Bas Couwenberg <sebastic at debian.org> Sun, 06 May 2018 09:10:57 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 May 2018 19:02:21 +0200
gdal (2.3.0~rc1+dfsg-1~exp1) experimental; urgency=medium
@@ -1996,4 +1999,3 @@ gdal (1.1.8-030518+1) unstable; urgency=low
* A few files are missing from the html documentation.
-- Alessandro Amici (devel) <alexamici at tiscali.it> Sun, 18 May 2003 18:05:12 +0200
-
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -364,4 +364,3 @@ Description: Java bindings to the Geospatial Data Abstraction Library
TIGER data, S57, MapInfo File, DGN, GML and more.
.
This package contains Java bindings for GDAL/OGR library.
-
=====================================
debian/gdal-data.install
=====================================
--- a/debian/gdal-data.install
+++ b/debian/gdal-data.install
@@ -1 +1 @@
-usr/share/gdal/2.3
+usr/share/gdal
=====================================
debian/libgdal20.symbols.alpha
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/libgdal20.symbols.amd64
=====================================
--- a/debian/libgdal20.symbols.amd64
+++ b/debian/libgdal20.symbols.amd64
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.arm64
=====================================
--- a/debian/libgdal20.symbols.arm64
+++ b/debian/libgdal20.symbols.arm64
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.10.1 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.10.1 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.armel
=====================================
--- a/debian/libgdal20.symbols.armel
+++ b/debian/libgdal20.symbols.armel
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.armhf
=====================================
--- a/debian/libgdal20.symbols.armhf
+++ b/debian/libgdal20.symbols.armhf
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.common
=====================================
--- a/debian/libgdal20.symbols.common
+++ b/debian/libgdal20.symbols.common
@@ -188,6 +188,7 @@
CPLQuietErrorHandler at Base 1.8.0
CPLReadDir at Base 1.8.0
CPLReadLine2L at Base 1.8.0
+ CPLReadLine3L at Base 2.3.0~rc1
CPLReadLine at Base 1.8.0
CPLReadLineL at Base 1.8.0
CPLRealloc at Base 1.8.0
=====================================
debian/libgdal20.symbols.i386
=====================================
--- a/debian/libgdal20.symbols.i386
+++ b/debian/libgdal20.symbols.i386
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.9.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.9.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.mips
=====================================
--- a/debian/libgdal20.symbols.mips
+++ b/debian/libgdal20.symbols.mips
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.9.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.9.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.mips64el
=====================================
--- a/debian/libgdal20.symbols.mips64el
+++ b/debian/libgdal20.symbols.mips64el
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 2.0.1 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 2.0.1 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.powerpc
=====================================
--- a/debian/libgdal20.symbols.powerpc
+++ b/debian/libgdal20.symbols.powerpc
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.8.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.ppc64
=====================================
--- a/debian/libgdal20.symbols.ppc64
+++ b/debian/libgdal20.symbols.ppc64
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.10.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.10.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.2 1
=====================================
debian/libgdal20.symbols.ppc64el
=====================================
--- a/debian/libgdal20.symbols.ppc64el
+++ b/debian/libgdal20.symbols.ppc64el
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.10.1 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.10.1 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.s390x
=====================================
--- a/debian/libgdal20.symbols.s390x
+++ b/debian/libgdal20.symbols.s390x
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 1.9.0 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 1.9.0 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.1 1
=====================================
debian/libgdal20.symbols.sparc64
=====================================
--- a/debian/libgdal20.symbols.sparc64
+++ b/debian/libgdal20.symbols.sparc64
@@ -2273,6 +2273,7 @@ libgdal.so.20 libgdal20 #MINVER#
(c++)"VRTDerivedRasterBand::SetPixelFunctionName(char const*)@Base" 2.0.2 1
(c++)"VRTDerivedRasterBand::SetSourceTransferType(GDALDataType)@Base" 2.0.2 1
(c++)"VRTDerivedRasterBand::IGetDataCoverageStatus(int, int, int, int, int, double*)@Base" 2.2.0 1
+ (c++)"VRTDerivedRasterBand::SetPixelFunctionLanguage(char const*)@Base" 2.3.0~rc1 1
(c++)"VRTDerivedRasterBand::Cleanup()@Base" 2.2.0 1
(c++)"VRTDerivedRasterBand::XMLInit(CPLXMLNode*, char const*, void*)@Base" 2.3.0~beta1 1
(c++)"VRTDerivedRasterBand::IRasterIO(GDALRWFlag, int, int, int, int, void*, int, int, GDALDataType, long long, long long, GDALRasterIOExtraArg*)@Base" 2.0.2 1
=====================================
debian/patches/gdalpaths deleted
=====================================
--- a/debian/patches/gdalpaths
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Install GDAL plugins in version specific subdirectory.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2013-07-01
-Forwarded: not-needed
-
---- a/gcore/gdaldrivermanager.cpp
-+++ b/gcore/gdaldrivermanager.cpp
-@@ -752,7 +752,7 @@ void GDALDriverManager::AutoLoadDrivers(
- #ifdef MACOSX_FRAMEWORK
- GDAL_PREFIX "/PlugIns");
- #else
-- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_PREFIX "/lib/gdalplugins/2.3" );
- #endif
- #else
- char szExecPath[1024];
---- a/port/cpl_findfile.cpp
-+++ b/port/cpl_findfile.cpp
-@@ -118,7 +118,7 @@ static FindFileTLS* CPLFinderInit()
- #ifdef MACOSX_FRAMEWORK
- CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
- #else
-- CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/2.3" );
- #endif
- #endif
- }
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
ogdi
-gdalpaths
hdf4
gdal-grass
ecw-plugin
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -166,8 +166,7 @@ override_dh_auto_build:
override_dh_auto_install:
cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
- $(MAKE) $(NJOBS) install BINDINGS="perl java" DESTDIR=$(CURDIR)/debian/tmp \
- INST_DATA="\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)"
+ $(MAKE) $(NJOBS) install BINDINGS="perl java" DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) $(NJOBS) install-docs DESTDIR=$(CURDIR)/debian/tmp \
"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
"INST_MAN=\$$(prefix)/share/man"
@@ -191,7 +190,7 @@ override_dh_auto_install:
rm -f $(CURDIR)/debian/tmp/usr/share/man/man1/_*_apps_.1
# removing license file
- rm -f $(CURDIR)/debian/tmp/usr/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)/LICENSE.TXT
+ rm -f $(CURDIR)/debian/tmp/usr/share/gdal/LICENSE.TXT
# removing la file
rm -f $(CURDIR)/debian/tmp/usr/lib/libgdal.la
@@ -231,4 +230,3 @@ override_dh_makeshlibs:
override_dh_shlibdeps:
dh_shlibdeps -L libgdal20 -l debian/libgdal20/usr/lib
-
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/5b398afbb4d9f6026a91cc6f6d834c3cf50ec76d...8e0bee2a581aa0fc3e85ed84acb6328a87f6aaf3
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/5b398afbb4d9f6026a91cc6f6d834c3cf50ec76d...8e0bee2a581aa0fc3e85ed84acb6328a87f6aaf3
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/20180507/da4d58c3/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list