[Git][debian-gis-team/gdal][experimental] 5 commits: Use veryclean target for python bindings.
Bas Couwenberg
gitlab at salsa.debian.org
Tue Apr 20 06:50:58 BST 2021
Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal
Commits:
41a312f3 by Bas Couwenberg at 2021-04-19T18:16:53+02:00
Use veryclean target for python bindings.
- - - - -
ef7cf400 by Bas Couwenberg at 2021-04-20T06:07:46+02:00
Update rules for moved python scripts.
- - - - -
56d76b35 by Bas Couwenberg at 2021-04-20T06:07:47+02:00
Update copyright file.
- - - - -
20368788 by Bas Couwenberg at 2021-04-20T06:53:40+02:00
Add patch to fix spelling errors.
- - - - -
66e0d447 by Bas Couwenberg at 2021-04-20T06:56:53+02:00
Set distribution to experimental.
- - - - -
5 changed files:
- debian/changelog
- debian/copyright
- debian/patches/series
- + debian/patches/spelling-errors.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,12 +1,15 @@
-gdal (3.3.0~beta1+dfsg-1) UNRELEASED; urgency=medium
+gdal (3.3.0~beta1+dfsg-1~exp1) experimental; urgency=medium
* New upstream beta release.
* Update copyright file.
* Refresh patches.
* Drop epsilon support, removed upstream.
* Rename library package for SONAME bump.
+ * Use veryclean target for python bindings.
+ * Update rules for moved python scripts.
+ * Add patch to fix spelling errors.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 19 Apr 2021 15:16:54 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 20 Apr 2021 06:56:36 +0200
gdal (3.2.2+dfsg-1) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -320,8 +320,7 @@ Copyright: 1996-1997, Sam Leffler
1996, Pixar
License: HPND-p-sl-sgi
-Files: frmts/gtiff/tif_lerc.c
- frmts/gtiff/tif_lerc.h
+Files: frmts/gtiff/libtiff/tif_lerc.c
Copyright: 2018, Even Rouault
License: HPND-sl-sgi
@@ -372,7 +371,6 @@ License: Apache-2.0
Files: frmts/mrf/JPEG_band.cpp
frmts/mrf/PNG_band.cpp
- frmts/mrf/Raw_band.cpp
frmts/mrf/Tif_band.cpp
frmts/mrf/marfa.h
frmts/mrf/marfa_dataset.cpp
@@ -732,7 +730,7 @@ Copyright: 2006-, Ari Jolma and GDAL Swig developers
License: Artistic or GPL-1.0+
Files: swig/python/gdal-utils/osgeo_utils/samples/gdal_vrtmerge.py
- swig/python/gdal-utils/osgeo_utils//gdal_merge.py
+ swig/python/gdal-utils/osgeo_utils/gdal_merge.py
Copyright: 2000, Atlantis Scientific Inc. (www.atlsci.com)
2005, Gabriel Ebner <ge at gabrielebner.at>
2009-2011, Even Rouault <even dot rouault at mines-paris dot org>
=====================================
debian/patches/series
=====================================
@@ -7,3 +7,4 @@ spatialite
java.opt
perl-vendor
perl-doxyfile
+spelling-errors.patch
=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -0,0 +1,168 @@
+Description: Fix spelling errors.
+ * Allows to <verb> -> Allows <verb>ing
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/gdal/pull/3700
+
+--- a/frmts/ecw/ecwdataset.cpp
++++ b/frmts/ecw/ecwdataset.cpp
+@@ -3117,7 +3117,7 @@ void ECWDataset::ECW2WKTProjection()
+ /* have "Upward" orientation (Y coordinates increase "Upward"). */
+ /* Setting ECW_ALWAYS_UPWARD=FALSE option relexes that policy */
+ /* and makes the driver rely on the actual Y-resolution */
+- /* value (sign) of an image. This allows to correctly process */
++ /* value (sign) of an image. This allows correctly processing */
+ /* rare images with "Downward" orientation, where Y coordinates */
+ /* increase "Downward" and Y-resolution is positive. */
+ if( CPLTestBool( CPLGetConfigOption("ECW_ALWAYS_UPWARD","TRUE") ) )
+--- a/man/man1/gdal_calc.1
++++ b/man/man1/gdal_calc.1
+@@ -131,7 +131,7 @@ GDAL format for output file.
+ .INDENT 0.0
+ .TP
+ .B color\-table=<filename>
+-Allows to specify a filename of a color table (or a ColorTable object) (with Palette Index interpretation) to be used for the output raster.
++Allows specifying a filename of a color table (or a ColorTable object) (with Palette Index interpretation) to be used for the output raster.
+ Supported formats: txt (i.e. like gdaldem, but color names are not supported), qlr, qml (i.e. exported from QGIS)
+ .UNINDENT
+ .INDENT 0.0
+@@ -213,7 +213,7 @@ If enabled, the output dataset would be
+ .INDENT 0.0
+ .TP
+ .B color_table
+-Allows to specify a ColorTable object (with Palette Index interpretation) to be used for the output raster.
++Allows specifying a ColorTable object (with Palette Index interpretation) to be used for the output raster.
+ .UNINDENT
+ .SH EXAMPLE
+ .sp
+--- a/swig/perl/gdal_wrap.cpp
++++ b/swig/perl/gdal_wrap.cpp
+@@ -279,7 +279,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/perl/gdalconst_wrap.c
++++ b/swig/perl/gdalconst_wrap.c
+@@ -255,7 +255,7 @@
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/perl/gnm_wrap.cpp
++++ b/swig/perl/gnm_wrap.cpp
+@@ -279,7 +279,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/perl/ogr_wrap.cpp
++++ b/swig/perl/ogr_wrap.cpp
+@@ -279,7 +279,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/perl/osr_wrap.cpp
++++ b/swig/perl/osr_wrap.cpp
+@@ -279,7 +279,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/python/extensions/gdal_array_wrap.cpp
++++ b/swig/python/extensions/gdal_array_wrap.cpp
+@@ -290,7 +290,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/python/extensions/gdal_wrap.cpp
++++ b/swig/python/extensions/gdal_wrap.cpp
+@@ -291,7 +291,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/python/extensions/gdalconst_wrap.c
++++ b/swig/python/extensions/gdalconst_wrap.c
+@@ -267,7 +267,7 @@
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/python/extensions/gnm_wrap.cpp
++++ b/swig/python/extensions/gnm_wrap.cpp
+@@ -291,7 +291,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/python/extensions/ogr_wrap.cpp
++++ b/swig/python/extensions/ogr_wrap.cpp
+@@ -291,7 +291,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/swig/python/extensions/osr_wrap.cpp
++++ b/swig/python/extensions/osr_wrap.cpp
+@@ -291,7 +291,7 @@ template <typename T> T SwigValueInit()
+ SWIG errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+- allows to return the 'cast rank', for example, if you have this
++ allows returning the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+--- a/third_party/LercLib/Lerc2.h
++++ b/third_party/LercLib/Lerc2.h
+@@ -57,7 +57,7 @@ NAMESPACE_LERC_START
+ *
+ * -- add checksum for the entire byte blob, for more rigorous detection of compressed data corruption
+ * -- for the main bit stuffing routine, use an extra uint buffer for guaranteed memory alignment
+- * -- this also allows to drop the NumExtraBytesToAllocate functions
++ * -- this also allows dropping the NumExtraBytesToAllocate functions
+ *
+ * Lerc2 v4
+ *
=====================================
debian/rules
=====================================
@@ -174,7 +174,7 @@ override_dh_auto_build:
# It needs pre-installing just after the building due to intermediate cleaning.
for V in $(PYVERS); do \
cp GDALmake.opt-$$V GDALmake.opt && \
- $(MAKE) $(NJOBS) -C $(CURDIR)/swig/python clean && \
+ $(MAKE) $(NJOBS) -C $(CURDIR)/swig/python veryclean && \
$(MAKE) -C $(CURDIR)/swig/python generate && \
$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python build && \
$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
@@ -189,7 +189,7 @@ override_dh_auto_install:
# install python stuff previuosly built and pre-installed
cp -a $(CURDIR)/debian/python-tmp/usr/lib/* $(CURDIR)/debian/tmp/usr/lib/.
install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin
- install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/.
+ install -o root -g root -m 755 $(CURDIR)/swig/python/gdal-utils/*.py $(CURDIR)/debian/tmp/usr/bin/.
# removing useless autogenerated man pages
rm -f $(CURDIR)/debian/tmp/usr/share/man/man1/_*_apps_.1
@@ -205,7 +205,8 @@ override_dh_auto_install:
# copy sample programs for python3-gdal
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/doc/python3-gdal/examples
- install -o root -g root -m 755 $(CURDIR)/swig/python/samples/*.py $(CURDIR)/debian/tmp/usr/share/doc/python3-gdal/examples/.
+ install -o root -g root -m 755 $(CURDIR)/swig/python/gdal-utils/osgeo_utils/samples/*.py $(CURDIR)/debian/tmp/usr/share/doc/python3-gdal/examples/.
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/python3-gdal/examples/__init__.py
override_dh_install:
dh_install --autodest --list-missing
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/77428ea1170643fe98cfedeccf1dfd81ce715adc...66e0d447cbc3cd20adee0abf4a0b64c4cb96517f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/77428ea1170643fe98cfedeccf1dfd81ce715adc...66e0d447cbc3cd20adee0abf4a0b64c4cb96517f
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/20210420/af46142e/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list