Dear maintainer,

I've prepared an NMU for diagnostics (versioned as 0.3.3-12.1). The diff
is attached to this message.

Since this package is in the LowNMU list, it's already uploaded.

Regards.


-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
More about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for diagnostics-0.3.3 diagnostics-0.3.3

 changelog                         |   10 ++++++++++
 control                           |    2 +-
 patches/no-ltdl-convenience.patch |   25 +++++++++++++++++++++++++
 patches/series                    |    1 +
 rules                             |    1 -
 5 files changed, 37 insertions(+), 2 deletions(-)

diff -Nru diagnostics-0.3.3/debian/changelog diagnostics-0.3.3/debian/changelog
--- diagnostics-0.3.3/debian/changelog	2016-12-04 09:54:25.000000000 +0100
+++ diagnostics-0.3.3/debian/changelog	2021-02-16 11:43:01.000000000 +0100
@@ -1,3 +1,13 @@
+diagnostics (0.3.3-12.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS due to using a convenience copy of ltdl.  Closes: #980642
+    Thanks to Dennis Filder <d.fil...@web.de> for the patch.
+  * Drop explicit Build-Depends on automake1.11, the default automake version
+    is good for this package.  Closes: #865142
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 16 Feb 2021 11:43:01 +0100
+
 diagnostics (0.3.3-12) unstable; urgency=low
 
   * Bump Standards Version to 3.9.8 (no changes)
diff -Nru diagnostics-0.3.3/debian/control diagnostics-0.3.3/debian/control
--- diagnostics-0.3.3/debian/control	2016-12-04 09:54:25.000000000 +0100
+++ diagnostics-0.3.3/debian/control	2021-02-16 11:40:47.000000000 +0100
@@ -1,7 +1,7 @@
 Source: diagnostics
 Priority: extra
 Maintainer: Michael Tautschnig <m...@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.0~), debhelper (>= 9), automake1.11 | automake (>= 1:1.9), pkg-config, libtool, libltdl-dev (>= 2.4.2-1~), libace-dev (>= 5.7.7-3) [!hurd-i386], dh-autoreconf
+Build-Depends: dpkg-dev (>= 1.16.0~), debhelper (>= 9), automake, pkg-config, libtool, libltdl-dev (>= 2.4.2-1~), libace-dev (>= 5.7.7-3) [!hurd-i386], dh-autoreconf
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://forsyte.at/software/diagnostics
diff -Nru diagnostics-0.3.3/debian/patches/no-ltdl-convenience.patch diagnostics-0.3.3/debian/patches/no-ltdl-convenience.patch
--- diagnostics-0.3.3/debian/patches/no-ltdl-convenience.patch	1970-01-01 01:00:00.000000000 +0100
+++ diagnostics-0.3.3/debian/patches/no-ltdl-convenience.patch	2021-02-16 11:32:47.000000000 +0100
@@ -0,0 +1,25 @@
+Description: Disable AC_LIBLTDL_CONVENIENCE and use the distro's ltdl
+ For some reason configure.ac enables AC_LIBLTDL_CONVENIENCE which is
+ rather pointless in a distro that comes with its own ltdl and also
+ interferes with the build (#980642).  This patch disables that.
+Author: Dennis Filder <d.fil...@web.de>
+Bug-Debian: https://bugs.debian.org/980642
+Last-Update: 2021-02-10
+
+--- diagnostics-0.3.3/configure.ac
++++ diagnostics-0.3.3/configure.ac
+@@ -29,9 +29,11 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+ # new libtool versions:
+-# LT_INIT
+-# LTDL_INIT
+-AC_LIBLTDL_CONVENIENCE
++LT_INIT
++LTDL_INIT
++
++#AC_LIBLTDL_CONVENIENCE # disabled as this is pointless/redundant in
++#                       # a distro shipping its own ltdl (see also: #652201)
+ AC_WITH_LTDL
+ AC_PROG_LIBTOOL
+ 
diff -Nru diagnostics-0.3.3/debian/patches/series diagnostics-0.3.3/debian/patches/series
--- diagnostics-0.3.3/debian/patches/series	2016-12-04 09:54:25.000000000 +0100
+++ diagnostics-0.3.3/debian/patches/series	2021-02-16 11:32:11.000000000 +0100
@@ -4,3 +4,4 @@
 gcc-warns-successfully
 gcc-6-destructor-is-noexcept
 test-run-cleanup
+no-ltdl-convenience.patch
diff -Nru diagnostics-0.3.3/debian/rules diagnostics-0.3.3/debian/rules
--- diagnostics-0.3.3/debian/rules	2014-07-07 13:42:50.000000000 +0200
+++ diagnostics-0.3.3/debian/rules	2021-02-16 11:33:00.000000000 +0100
@@ -27,7 +27,6 @@
 		--prefix=/usr --mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-update-makefiles \
-		--with-ltdl-include=/usr/include --with-ltdl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		CXXFLAGS="$(CXXFLAGS)" # LDFLAGS="-Wl,-z,defs"
 
 override_dh_auto_test:

Attachment: signature.asc
Description: PGP signature

Reply via email to