Control: tags 984100 + patch Control: tags 984100 + pending Dear maintainer,
I've prepared an NMU for libdjconsole (versioned as 0.1.3-3.1) and uploaded it to DELAYED/7. Feel free to upload a fix in the meantime or cancel the NMU. Best, Chris
diff -Nru libdjconsole-0.1.3/debian/changelog libdjconsole-0.1.3/debian/changelog --- libdjconsole-0.1.3/debian/changelog 2015-12-16 17:14:43.000000000 +0100 +++ libdjconsole-0.1.3/debian/changelog 2023-12-08 17:37:04.000000000 +0100 @@ -1,3 +1,13 @@ +libdjconsole (0.1.3-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use pkg-config to place udev rules file. + * Fix FTBFS by correcting usb_open retval check (Closes: #984100) + * Bump to dh compat level 13, away from obsolete level 9. + Record not installed files in debian/not-installed. + + -- Chris Hofstaedtler <z...@debian.org> Fri, 08 Dec 2023 17:37:04 +0100 + libdjconsole (0.1.3-3) unstable; urgency=medium * Don't use /usr/share/doc/ symlinks anymore to keep things simple and diff -Nru libdjconsole-0.1.3/debian/compat libdjconsole-0.1.3/debian/compat --- libdjconsole-0.1.3/debian/compat 2015-08-28 16:32:22.000000000 +0200 +++ libdjconsole-0.1.3/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -9 diff -Nru libdjconsole-0.1.3/debian/control libdjconsole-0.1.3/debian/control --- libdjconsole-0.1.3/debian/control 2015-08-28 16:32:22.000000000 +0200 +++ libdjconsole-0.1.3/debian/control 2023-12-08 17:37:04.000000000 +0100 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Adrien Cunin <adri2...@ubuntu.com> -Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libusb-dev +Build-Depends: debhelper-compat (= 13), pkgconf, libusb-dev, systemd-dev Standards-Version: 3.9.6 Homepage: http://djplay.sourceforge.net/ diff -Nru libdjconsole-0.1.3/debian/libdjconsole-data.install libdjconsole-0.1.3/debian/libdjconsole-data.install --- libdjconsole-0.1.3/debian/libdjconsole-data.install 2015-08-28 16:32:22.000000000 +0200 +++ libdjconsole-0.1.3/debian/libdjconsole-data.install 2023-12-08 17:37:04.000000000 +0100 @@ -1,2 +1,2 @@ debian/tmp/usr/share/ -debian/tmp/lib/udev/rules.d/ +debian/tmp/${env:deb_udevdir} diff -Nru libdjconsole-0.1.3/debian/not-installed libdjconsole-0.1.3/debian/not-installed --- libdjconsole-0.1.3/debian/not-installed 1970-01-01 01:00:00.000000000 +0100 +++ libdjconsole-0.1.3/debian/not-installed 2023-12-08 17:37:04.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libdjconsole.la diff -Nru libdjconsole-0.1.3/debian/patches/01_install_udev_rules_lib.patch libdjconsole-0.1.3/debian/patches/01_install_udev_rules_lib.patch --- libdjconsole-0.1.3/debian/patches/01_install_udev_rules_lib.patch 2015-08-28 16:32:22.000000000 +0200 +++ libdjconsole-0.1.3/debian/patches/01_install_udev_rules_lib.patch 2023-12-08 17:37:04.000000000 +0100 @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = gnu pkgconfigdir=$(libdir)/pkgconfig -rulesdir=$(sysconfdir)/udev/rules.d -+rulesdir=/lib/udev/rules.d ++rulesdir=$(shell pkg-config --variable=udevdir udev)/rules.d lib_LTLIBRARIES = libdjconsole.la @@ -18,7 +18,7 @@ AUTOMAKE_OPTIONS = gnu pkgconfigdir = $(libdir)/pkgconfig -rulesdir = $(sysconfdir)/udev/rules.d -+rulesdir = /lib/udev/rules.d ++rulesdir=$(shell pkg-config --variable=udevdir udev)/rules.d lib_LTLIBRARIES = libdjconsole.la diff -Nru libdjconsole-0.1.3/debian/patches/04_usb_open_retval.patch libdjconsole-0.1.3/debian/patches/04_usb_open_retval.patch --- libdjconsole-0.1.3/debian/patches/04_usb_open_retval.patch 1970-01-01 01:00:00.000000000 +0100 +++ libdjconsole-0.1.3/debian/patches/04_usb_open_retval.patch 2023-12-08 17:37:04.000000000 +0100 @@ -0,0 +1,22 @@ +Index: libdjconsole-0.1.3/djconsole.cpp +=================================================================== +--- libdjconsole-0.1.3.orig/djconsole.cpp ++++ libdjconsole-0.1.3/djconsole.cpp +@@ -107,7 +107,7 @@ DJConsole::DJConsole(bool load_data) + + hdev1=usb_open(dev); + +- if(hdev1 < 0) ++ if(hdev1 == nullptr) + { + printf("Error opening DJ Console device, check permissions\n"); + return; +@@ -115,7 +115,7 @@ DJConsole::DJConsole(bool load_data) + + hdev2=usb_open(dev); + +- if(hdev2 < 0) ++ if(hdev2 == nullptr) + { + printf("Error opening DJ Console device, check permissions\n"); + return; diff -Nru libdjconsole-0.1.3/debian/patches/series libdjconsole-0.1.3/debian/patches/series --- libdjconsole-0.1.3/debian/patches/series 2015-08-28 16:32:22.000000000 +0200 +++ libdjconsole-0.1.3/debian/patches/series 2023-12-08 17:37:04.000000000 +0100 @@ -1,3 +1,4 @@ 01_install_udev_rules_lib.patch 02_udev_rules_sysfs_attr.patch 03_update_pc_file.patch +04_usb_open_retval.patch diff -Nru libdjconsole-0.1.3/debian/rules libdjconsole-0.1.3/debian/rules --- libdjconsole-0.1.3/debian/rules 2015-12-16 17:14:43.000000000 +0100 +++ libdjconsole-0.1.3/debian/rules 2023-12-08 17:37:04.000000000 +0100 @@ -1,3 +1,5 @@ #!/usr/bin/make -f +export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,) + %: - dh $@ --with autoreconf + dh $@
