control: tags -1 patch
I rebased the patch on top of the current one in sid
I also bumped the Breaks/Replaces to 3.20.7-6~
(I hope I did it correctly)
G.
On Thu, 4 Feb 2021 20:22:11 +0100 Sebastiaan Couwenberg <sebas...@xs4all.nl>
wrote:
> reopen 981725
> notfixed 981725 libdap/3.20.7-5
> thanks
>
> On 2/4/21 5:39 AM, Sebastiaan Couwenberg wrote:
> > On 2/3/21 12:37 PM, Sebastiaan Couwenberg wrote:
> >> 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.
> >
> > The patch has been updated with the changed from -4.
> >
> > To clarify the issue:
> >
> > Moving dap-config* from libdap-dev to libdap-bin is wrong,
> > from the Debian Library Packaging guide:
> >
> > "
> > -DEV package (e.g. libfooX-dev) should contain the development symlink
> > used when linking, static libraries, and header files, and if they
> > exist, package configuration scripts.
> >
> > Table 4.1. Annotated list of files that usually reside in -DEV package
> >
> > +----------------------------------------------------------------------+
> > |files |meaning |
> > |----------------------+-----------------------------------------------|
> > |usr/lib/*.so |development linkage file, used when other |
> > | |programs are linked with -lxxx |
> > |----------------------+-----------------------------------------------|
> > |usr/lib/*.a |static link files |
> > |----------------------+-----------------------------------------------|
> > |usr/lib/*.la |libtool linkage information file |
> > |----------------------+-----------------------------------------------|
> > |usr/include/* |Development include files |
> > |----------------------+-----------------------------------------------|
diff -Nru libdap-3.20.7/debian/changelog libdap-3.20.7/debian/changelog
--- libdap-3.20.7/debian/changelog 2021-02-04 14:13:25.000000000 +0100
+++ libdap-3.20.7/debian/changelog 2021-02-05 11:29:01.000000000 +0100
@@ -1,3 +1,11 @@
+libdap (3.20.7-6) unstable; urgency=medium
+
+ * Team upload.
+ * Move usr/bin/dap-config* back to libdap-dev.
+ (closes: #981725)
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 05 Feb 2021 11:29:01 +0100
+
libdap (3.20.7-5) unstable; urgency=medium
* Revert dap-config to libdap-dev. Closes: #981725
diff -Nru libdap-3.20.7/debian/control libdap-3.20.7/debian/control
--- libdap-3.20.7/debian/control 2021-02-04 14:13:25.000000000 +0100
+++ libdap-3.20.7/debian/control 2021-02-05 11:29:01.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-6~)
+Replaces: libdap-bin (<< 3.20.7-6~)
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-04 14:13:25.000000000
+0100
+++ libdap-3.20.7/debian/libdap-bin.install 2021-02-05 11:27:28.000000000
+0100
@@ -1,6 +1,4 @@
usr/bin/getdap
usr/bin/getdap4
-usr/bin/dap-config-pkgconfig
-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-04 14:13:25.000000000
+0100
+++ libdap-3.20.7/debian/libdap-dev.install 2021-02-05 11:29:01.000000000
+0100
@@ -1,6 +1,8 @@
+usr/bin/dap-config
+usr/bin/dap-config-pkgconfig
+usr/share/man/man1/dap-config.1
usr/lib/*/pkgconfig/*.pc
usr/lib/*/*.so
usr/lib/*/*.a
usr/share/aclocal/libdap.m4
usr/include/libdap/*
-usr/bin/dap-config
diff -Nru libdap-3.20.7/debian/rules libdap-3.20.7/debian/rules
--- libdap-3.20.7/debian/rules 2021-02-04 14:13:25.000000000 +0100
+++ libdap-3.20.7/debian/rules 2021-02-05 11:28:56.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-bin/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
