debian/changelog

+gdal (3.0.1+dfsg-1~exp3) experimental; urgency=medium
+
+  * Drop Python 2 support.
+    (closes: #936590)
+  * Update symbols for alpha, riscv64 & sparc64.
+  * Move Python scripts to gdal-bin package.
+  * Add lintian override for spelling-error-in-binary false positive.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 30 Aug 2019 10:18:01 +0200
+
 gdal (3.0.1+dfsg-1~exp2) experimental; urgency=medium
 
   * Update gbp.conf to use --source-only-changes by default.

debian/control

@@ -54,16 +54,13 @@ Build-Depends: debhelper (>= 9.20160114),
                lsb-release,
                netcdf-bin,
                patch,
-               python-all-dev (>= 2.6.6-3~),
-               python-numpy,
                python3-all-dev,
                python3-numpy,
                python3-distutils,
                swig,
                unixodbc-dev (>= 2.2.11),
                zlib1g-dev
-Build-Conflicts: automake1.11,
-                 python-setuptools
+Build-Conflicts: automake1.11
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal
 Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal.git -b experimental
@@ -187,11 +184,16 @@ Description: Documentation for the Geospatial Data Abstraction Library
 
 Package: gdal-bin
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: python3-gdal (= ${binary:Version}),
+         ${python3:Depends},
+         ${shlibs:Depends},
          ${misc:Depends}
-Suggests: libgdal-grass,
-          python3-gdal
-Breaks: gdal-bin (<< 1.10.0-0~)
+Suggests: libgdal-grass
+Breaks: gdal-bin (<< 1.10.0-0~),
+        python-gdal (<< 2.5.0~),
+        python3-gdal (<< 3.0.1+dfsg-1~exp3~)
+Replaces: python-gdal (<< 2.5.0~),
+          python3-gdal (<< 3.0.1+dfsg-1~exp3~)
 Description: Geospatial Data Abstraction Library - Utility programs
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -236,33 +238,6 @@ Description: Geospatial Data Abstraction Library - Data files
  .
  This package contains the GDAL data files.
 
-Package: python-gdal
-Architecture: any
-Section: python
-Depends: ${python:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: gdal-bin
-Provides: ${python:Provides}
-Description: Python bindings to the Geospatial Data Abstraction Library
- GDAL is a translator library for raster geospatial data formats.
- As a library, it presents a single abstract data model to the
- calling application for all supported formats. The related OGR
- library (which lives within the GDAL source tree) provides
- a similar capability for simple features vector data.
- .
- GDAL supports 40+ popular data formats, including commonly used
- ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
- GIS and remote sensing software packages (ERDAS Imagine,
- ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
- sensing and scientific data distribution formats such as HDF,
- EOS FAST, NOAA L1B, NetCDF, FITS.
- .
- OGR library supports popular vector formats like ESRI Shapefile,
- TIGER data, S57, MapInfo File, DGN, GML and more.
- .
- This package contains Python bindings for the GDAL/OGR library.
-
 Package: python3-gdal
 Architecture: any
 Section: python
@@ -271,8 +246,6 @@ Depends: ${python3:Depends},
          ${misc:Depends}
 Suggests: gdal-bin
 Provides: ${python3:Provides}
-Breaks: python-gdal (<< 2.5.0~)
-Replaces: python-gdal (<< 2.5.0~)
 Description: Python 3 bindings to the Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the

debian/gdal-bin.install

@@ -51,3 +51,26 @@ usr/share/man/man1/ogrlineref.1
 usr/share/man/man1/ogrtindex.1
 usr/share/man/man1/ogr_utilities.1
 # testepsg.1
+################################################################################
+# Python scripts
+usr/bin/*.py
+#usr/share/man/man1/epsg_tr.1
+#usr/share/man/man1/esri2wkt.1
+#usr/share/man/man1/gcps2vec.1
+#usr/share/man/man1/gcps2wld.1
+usr/share/man/man1/gdal2tiles.1
+#usr/share/man/man1/gdal2xyz.1
+#usr/share/man/man1/gdal_auth.1
+usr/share/man/man1/gdal_calc.1
+usr/share/man/man1/gdal_edit.1
+usr/share/man/man1/gdal_fillnodata.1
+usr/share/man/man1/gdal_merge.1
+usr/share/man/man1/gdal_polygonize.1
+usr/share/man/man1/gdal_proximity.1
+usr/share/man/man1/gdal_retile.1
+usr/share/man/man1/gdal_sieve.1
+usr/share/man/man1/gdalcompare.1
+usr/share/man/man1/gdalmove.1
+usr/share/man/man1/ogrmerge.1
+usr/share/man/man1/pct2rgb.1
+usr/share/man/man1/rgb2pct.1

debian/gdal-bin.lintian-overrides

@@ -10,3 +10,6 @@ package-relation-with-self breaks: gdal-bin (<< 1.10.0-0~)
 # False positive on: "(319) 369-3131"
 copyright-year-in-future 3131 *
 
+# QGIS plugins rely on .py extension, see: http://hub.qgis.org/issues/9924
+script-with-language-extension usr/bin/*.py
+

debian/libgdal26.lintian-overrides

@@ -4,6 +4,9 @@ spelling-error-in-binary * Nam Name
 # Part of GRIB abbreviation
 spelling-error-in-binary * Instnt Instant
 
+# False positive, string not included in source
+spelling-error-in-binary * increaS increase
+
 # False positive on: "(319) 369-3131"
 copyright-year-in-future 3131 *
 

debian/libgdal26.symbols.sparc64

@@ -2582,6 +2582,8 @@ libgdal.so.26 #PACKAGE# #MINVER#
  (c++)"GDALDefaultRasterAttributeTable::~GDALDefaultRasterAttributeTable()@Base" 2.0.2
  (c++)"GDALDefaultRasterAttributeTable::~GDALDefaultRasterAttributeTable()@Base" 2.0.2
  (c++)"OGRCoordinateTransformationOptions::SetAreaOfInterest(double, double, double, double)@Base" 3.0.0
+ (c++)"OGRCoordinateTransformationOptions::SetSourceCenterLong(double)@Base" 3.0.1
+ (c++)"OGRCoordinateTransformationOptions::SetTargetCenterLong(double)@Base" 3.0.1
  (c++)"OGRCoordinateTransformationOptions::SetCoordinateOperation(char const*, bool)@Base" 3.0.0
  (c++)"OGRCoordinateTransformationOptions::OGRCoordinateTransformationOptions()@Base" 3.0.0
  (c++)"OGRCoordinateTransformationOptions::OGRCoordinateTransformationOptions()@Base" 3.0.0
@@ -3982,6 +3984,7 @@ libgdal.so.26 #PACKAGE# #MINVER#
  (c++)"std::vector<bool, std::allocator<bool> >::_M_fill_insert(std::_Bit_iterator, unsigned long, bool)@Base" 2.0.2
  (c++)"void std::vector<char, std::allocator<char> >::emplace_back<char>(char&&)@Base" 2.2.0
  (c++)"std::vector<char, std::allocator<char> >::_M_default_append(unsigned long)@Base" 2.1.1
+ (c++)"void std::vector<char, std::allocator<char> >::_M_realloc_insert<char const&>(__gnu_cxx::__normal_iterator<char*, std::vector<char, std::allocator<char> > >, char const&)@Base" 3.0.1
  (c++)"std::vector<char, std::allocator<char> >::vector(std::initializer_list<char>, std::allocator<char> const&)@Base" 2.2.0
  (c++)"std::vector<char, std::allocator<char> >::vector(std::initializer_list<char>, std::allocator<char> const&)@Base" 2.2.0
  (c++)"std::vector<char, std::allocator<char> >::~vector()@Base" 2.2.0

debian/python-gdal.install

-usr/lib/python2*

debian/python-gdal.lintian-overrides

-# False positive on: "(319) 369-3131"
-copyright-year-in-future 3131 *
-

debian/python3-gdal.install

 usr/lib/python3*
-usr/bin/*.py
 usr/share/doc/python3-gdal/examples/
-#usr/share/man/man1/epsg_tr.1
-#usr/share/man/man1/esri2wkt.1
-#usr/share/man/man1/gcps2vec.1
-#usr/share/man/man1/gcps2wld.1
-usr/share/man/man1/gdal2tiles.1
-#usr/share/man/man1/gdal2xyz.1
-#usr/share/man/man1/gdal_auth.1
-usr/share/man/man1/gdal_calc.1
-usr/share/man/man1/gdal_edit.1
-usr/share/man/man1/gdal_fillnodata.1
-usr/share/man/man1/gdal_merge.1
-usr/share/man/man1/gdal_polygonize.1
-usr/share/man/man1/gdal_proximity.1
-usr/share/man/man1/gdal_retile.1
-usr/share/man/man1/gdal_sieve.1
-usr/share/man/man1/gdalcompare.1
-usr/share/man/man1/gdalmove.1
-usr/share/man/man1/ogrmerge.1
-usr/share/man/man1/pct2rgb.1
-usr/share/man/man1/rgb2pct.1

debian/python3-gdal.lintian-overrides

-# Man pages are automatically generated with sphinx.
-hyphen-used-as-minus-sign
-binary-without-manpage
-
-# QGIS plugins rely on .py extension, see: http://hub.qgis.org/issues/9924
-script-with-language-extension usr/bin/*.py
-
 # False positive on: "(319) 369-3131"
 copyright-year-in-future 3131 *
 

debian/rules

@@ -25,8 +25,8 @@ include /usr/share/dpkg/pkg-info.mk
 
 UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
-PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r)
-PYDEF=$(shell pyversions -dv)
+PYVERS=$(shell py3versions -v -r)
+PYDEF=$(shell py3versions -dv)
 PERLDEF=$(shell perl -V:version|cut -d\' -f2)
 SWIGVER=$(shell swig -version |grep Version|cut -d' ' -f3|sed -e 's/\.//g')
 
@@ -83,7 +83,7 @@ gdal-mrsid-dist:
 
 %:
 	if [ "$@" != "gdal-grass" -a "$@" != "gdal-ecw" -a "$@" != "gdal-mrsid" ]; then \
-		dh $@ --with autoreconf,python2,python3 --parallel ; \
+		dh $@ --with autoreconf,python3 --parallel ; \
 	fi
 
 override_dh_clean:
@@ -216,13 +216,9 @@ override_dh_installdocs:
 	# Remove autogenerated Doxygen files
 	rm -f $(CURDIR)/debian/*/usr/share/doc/libgdal-perl-doc/*/*.md5
 
-override_dh_python2:
-	dh_python2 -X.info -ppython-gdal
-	dh_numpy -ppython-gdal
-
 override_dh_python3:
-	dh_python3 -X.info -ppython3-gdal --shebang=/usr/bin/python3
-	dh_numpy3 -ppython3-gdal
+	dh_python3 -X.info -pgdal-bin -ppython3-gdal --shebang=/usr/bin/python3
+	dh_numpy3 -pgdal-bin -ppython3-gdal
 
 override_dh_makeshlibs:
 	# Forces failure ignoring to collect new symbols on all archs