Bug#981725: gdal: FTBFS after new libdap

[Sebastiaan Couwenberg]

Control: tags -1 patch

On 2/3/21 12:03 PM, Sebastiaan Couwenberg wrote:
> On 2/3/21 10:48 AM, Gianfranco Costamagna wrote:
>> Hello, the new libdap broke in some way the gdal configure script, and now the configure step fails with:
>>
>> checking for libqhull/libqhull.h... yes
>> checking for qh_new_qhull in -lqhull... no
>> configure: error: --with-qhull requested, but library not found!
>>
>>
>> I don't really understand what is going on here, looks like qhull is not found anymore.
>>
>> libdap might be the library to blame here, feel free to reassign if needed
> 
> libdap-dev no longer provides /usr/bin/dap-config, gdal configure then
> adds dap++ to LIBS which breaks the compile test for qhull.
> 
> dap-config should really be provided by libdap-dev instead of
> libdap-bin. Or libdap-bin needs to be a dependency of libdap-dev.

This is also the cause of the autopkgtest failure which prevents testing
migration:

 Test-Command: set -e
   ; dap-config --help 2> /dev/null
 Depends: libdap-dev

The attached patch should fix the issue.

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1
-------------- next part --------------
diff -Nru libdap-3.20.7/debian/changelog libdap-3.20.7/debian/changelog
--- libdap-3.20.7/debian/changelog	2021-02-02 10:45:43.000000000 +0100
+++ libdap-3.20.7/debian/changelog	2021-02-03 12:11:55.000000000 +0100
@@ -1,3 +1,11 @@
+libdap (3.20.7-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Move usr/bin/dap-config* back to libdap-dev.
+    (closes: #981725)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Feb 2021 12:11:55 +0100
+
 libdap (3.20.7-3) unstable; urgency=medium
 
   * Add Breaks/Replaces libdap-bin on libdap-dev. for dap-config, which
diff -Nru libdap-3.20.7/debian/control libdap-3.20.7/debian/control
--- libdap-3.20.7/debian/control	2021-02-02 10:32:16.000000000 +0100
+++ libdap-3.20.7/debian/control	2021-02-03 12:11:55.000000000 +0100
@@ -94,6 +94,8 @@
 Architecture: any
 Multi-Arch: same
 Depends: libdap27 ( = ${binary:Version} ), libdapserver7v5 (=${binary:Version}), libdapclient6v5 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev | libcurl-dev, uuid-dev, pkg-config
+Breaks: libdap-bin (<< 3.20.7-4~)
+Replaces: libdap-bin (<< 3.20.7-4~)
 Description: Development files (headers and static libraries) for libdap
  OPeNDAP provides software that allows you to access data over the internet,
  from programs that weren't originally designed for that purpose, as well
@@ -109,8 +111,6 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, libjs-jquery
-Breaks: libdap-dev (<< 3.20.7)
-Replaces: libdap-dev (<< 3.20.7)
 Description: Documentation for the libdap Data Access Protocol library
  OPeNDAP provides software that allows you to access data over the internet,
  from programs that weren't originally designed for that purpose, as well
diff -Nru libdap-3.20.7/debian/libdap-bin.install libdap-3.20.7/debian/libdap-bin.install
--- libdap-3.20.7/debian/libdap-bin.install	2021-02-02 10:32:16.000000000 +0100
+++ libdap-3.20.7/debian/libdap-bin.install	2021-02-03 12:08:16.000000000 +0100
@@ -1,7 +1,4 @@
 usr/bin/getdap
 usr/bin/getdap4
-usr/bin/dap-config-pkgconfig
-usr/bin/dap-config
-usr/share/man/man1/dap-config.1
 usr/share/man/man1/getdap4.1
 usr/share/man/man1/getdap.1
diff -Nru libdap-3.20.7/debian/libdap-dev.install libdap-3.20.7/debian/libdap-dev.install
--- libdap-3.20.7/debian/libdap-dev.install	2021-02-02 10:32:16.000000000 +0100
+++ libdap-3.20.7/debian/libdap-dev.install	2021-02-03 12:08:40.000000000 +0100
@@ -1,3 +1,6 @@
+usr/bin/dap-config-pkgconfig
+usr/bin/dap-config
+usr/share/man/man1/dap-config.1
 usr/lib/*/pkgconfig/*.pc
 usr/lib/*/*.so
 usr/lib/*/*.a
diff -Nru libdap-3.20.7/debian/rules libdap-3.20.7/debian/rules
--- libdap-3.20.7/debian/rules	2021-02-02 10:32:16.000000000 +0100
+++ libdap-3.20.7/debian/rules	2021-02-03 12:11:55.000000000 +0100
@@ -34,6 +34,8 @@
 
 override_dh_auto_install:
 	dh_auto_install
+	# Allow this cp to fail on arch-independent builds
+	-cp debian/dap-config.pkg  debian/libdap-dev/usr/bin/dap-config
 
 override_dh_installdocs:
 	dh_installdocs
@@ -42,8 +44,6 @@
 		ln -sf /usr/share/javascript/jquery/jquery.js debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js ) \
 		|| echo "Skipped; no jquery"
 	-find debian/libdap-doc -name '*.md5' -delete \;
-	# Allow this cp to fail on arch-independent builds
-	-cp debian/dap-config.pkg  debian/libdap-bin/usr/bin/dap-config
 
 clean:
 	dh clean