Followup-For: Bug #986975
Control: reassign -1 src:gdal 3.2.1+dfsg-1
Control: retitle -1 gdal: rename gdal-data to gdal3-data and move files to
/usr/share/gdal3
Control: severity -1 serious
Control: tag -1 - moreinfo
This is my suggested patch for moving gdal-data content to /usr/share/gdal3
and renaming the package to gdal3-data to restore co-installability of
libgdal20 (buster) and libgdal28 (bullseye).
This patch is for the version in experimental to have the renamed
package pass NEW.
Andreas
diff -Nru gdal-3.3.0+dfsg/debian/changelog gdal-3.3.0+dfsg/debian/changelog
--- gdal-3.3.0+dfsg/debian/changelog 2021-05-03 15:05:33.000000000 +0200
+++ gdal-3.3.0+dfsg/debian/changelog 2021-06-14 10:19:38.000000000 +0200
@@ -1,3 +1,11 @@
+gdal (3.3.0+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+ * Rename gdal-data to gdal3-data and build with --datadir=/usr/share/gdal3.
+ This makes libgdal20 (in buster) and libgdal28 (in bullseye)
+ co-installable for smoother upgrades from buster. (Closes: #986975)
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 14 Jun 2021 10:19:38 +0200
+
gdal (3.3.0+dfsg-1~exp1) experimental; urgency=medium
* New upstream release.
diff -Nru gdal-3.3.0+dfsg/debian/control gdal-3.3.0+dfsg/debian/control
--- gdal-3.3.0+dfsg/debian/control 2021-04-20 06:52:58.000000000 +0200
+++ gdal-3.3.0+dfsg/debian/control 2021-06-14 10:19:38.000000000 +0200
@@ -67,7 +67,7 @@
Package: libgdal29
Architecture: any
Section: libs
-Depends: gdal-data (>= ${source:Version}),
+Depends: gdal3-data (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
Recommends: proj-bin
@@ -187,11 +187,11 @@
namely gdal_translate, gdalinfo, gdaladdo, gdalwarp, ogr2ogr, ogrinfo,
ogrtindex.
-Package: gdal-data
+Package: gdal3-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
-Breaks: libgdal20 (<< 2.5.0~)
+Breaks: gdal-data (>= 2.5.0~)
Description: Geospatial Data Abstraction Library - Data files
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
diff -Nru gdal-3.3.0+dfsg/debian/gdal-data.install
gdal-3.3.0+dfsg/debian/gdal-data.install
--- gdal-3.3.0+dfsg/debian/gdal-data.install 2021-04-20 06:52:58.000000000
+0200
+++ gdal-3.3.0+dfsg/debian/gdal-data.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/share/gdal
diff -Nru gdal-3.3.0+dfsg/debian/gdal-data.lintian-overrides
gdal-3.3.0+dfsg/debian/gdal-data.lintian-overrides
--- gdal-3.3.0+dfsg/debian/gdal-data.lintian-overrides 2021-04-20
06:52:58.000000000 +0200
+++ gdal-3.3.0+dfsg/debian/gdal-data.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-# Not a problem
-national-encoding usr/share/gdal/s57expectedinput.csv
-
-# Not documentation
-package-contains-documentation-outside-usr-share-doc usr/share/gdal/pci_*.txt
-
diff -Nru gdal-3.3.0+dfsg/debian/gdal3-data.install
gdal-3.3.0+dfsg/debian/gdal3-data.install
--- gdal-3.3.0+dfsg/debian/gdal3-data.install 1970-01-01 01:00:00.000000000
+0100
+++ gdal-3.3.0+dfsg/debian/gdal3-data.install 2021-06-14 10:19:30.000000000
+0200
@@ -0,0 +1 @@
+usr/share/gdal3
diff -Nru gdal-3.3.0+dfsg/debian/gdal3-data.lintian-overrides
gdal-3.3.0+dfsg/debian/gdal3-data.lintian-overrides
--- gdal-3.3.0+dfsg/debian/gdal3-data.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
+++ gdal-3.3.0+dfsg/debian/gdal3-data.lintian-overrides 2021-06-14
10:19:30.000000000 +0200
@@ -0,0 +1,6 @@
+# Not a problem
+national-encoding usr/share/gdal3/s57expectedinput.csv
+
+# Not documentation
+package-contains-documentation-outside-usr-share-doc usr/share/gdal3/pci_*.txt
+
diff -Nru gdal-3.3.0+dfsg/debian/rules gdal-3.3.0+dfsg/debian/rules
--- gdal-3.3.0+dfsg/debian/rules 2021-04-20 06:52:58.000000000 +0200
+++ gdal-3.3.0+dfsg/debian/rules 2021-06-14 10:19:30.000000000 +0200
@@ -117,6 +117,7 @@
override_dh_auto_configure:
for V in $(PYVERS); do \
PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
+ --datadir=\$$\{prefix\}/share/gdal3 \
--mandir=\$$\{prefix\}/share/man \
--includedir=\$$\{prefix\}/include/gdal \
--with-hide-internal-symbols=yes \
