diff --git a/debian/changelog b/debian/changelog index e844043..6d76a40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,14 @@ nut (2.7.4-9) UNRELEASED; urgency=medium [ Arnaud Quette ] * debian/control, debian/rules, debian/libnutscan1.install, - debian/libnutscan-dev.install: distribute nut-scanner. (Closes: #921379) + debian/libnutscan-dev.install: distribute nut-scanner. (Closes: #921379 + LP: #1814314) - -- Arnaud Quette Tue, 26 Feb 2019 13:34:07 +0100 + [ Laurent Bigonville ] + * Add libltdl-dev to the build-dependencies and fix FTBFS when it is + installed (Closes: #831740) + + -- Laurent Bigonville Mon, 04 Feb 2019 16:25:36 +0100 nut (2.7.4-8) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2b8821e..6fb2e29 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: autotools-dev, libfreeipmi-dev (>= 0.8.5) [!hurd-i386], libgd-dev | libgd2-xpm-dev | libgd2-noxpm-dev, libipmimonitoring-dev (>= 1.1.5-2) [!hurd-i386], + libltdl-dev, libneon27-gnutls-dev | libneon27-dev, libnss3-dev, libpowerman0-dev (>= 2.3.3), diff --git a/debian/patches/0010-fix-nutscanner-ftbfs.patch b/debian/patches/0010-fix-nutscanner-ftbfs.patch new file mode 100644 index 0000000..54b2615 --- /dev/null +++ b/debian/patches/0010-fix-nutscanner-ftbfs.patch @@ -0,0 +1,33 @@ +commit 5d98d5536699222bc93c58c1e6f6df43dc9bfcff +Author: Arnaud Quette +Date: Thu Mar 10 14:41:40 2016 +0100 + + Fix nut-scanner compilation in some environments + + Following the commits 5187dab (common: add some string-related functions) and + e767df5 (common: consolidate some string-related functions), the build rules of + nut-scanner were not updated to also use str.c. Since the libcommon.la + dependency was still there, some environments managed to build cleanly, while + other are failing. Update build dependencies to fix this situation + +diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am +index 558cb23b..db85c682 100644 +--- a/tools/nut-scanner/Makefile.am ++++ b/tools/nut-scanner/Makefile.am +@@ -14,14 +14,14 @@ libnutscan_la_SOURCES = scan_nut.c scan_ipmi.c \ + scan_avahi.c scan_eaton_serial.c nutscan-serial.c \ + ../../drivers/serial.c \ + ../../drivers/bcmxcp_ser.c \ +- ../../common/common.c ++ ../../common/common.c ../../common/str.c + libnutscan_la_LIBADD = $(NETLIBS) $(LIBLTDL_LIBS) + libnutscan_la_LDFLAGS = $(SERLIBS) -version-info 1:0:0 + libnutscan_la_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include $(LIBLTDL_CFLAGS) -I$(top_srcdir)/drivers + + nut_scanner_SOURCES = nut-scanner.c + nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include +-nut_scanner_LDADD = libnutscan.la ../../common/libcommon.la ++nut_scanner_LDADD = libnutscan.la + + if WITH_SSL + libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS) diff --git a/debian/patches/series b/debian/patches/series index 0b7915d..c981d6f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0006-ups-conf-maxretry.patch 0008-drop-w3c-icons.patch 0009-fix-nutshutdown-install.patch +0010-fix-nutscanner-ftbfs.patch