diff -Nru diod-1.0.24/debian/changelog diod-1.0.24/debian/changelog --- diod-1.0.24/debian/changelog 2018-12-20 01:04:48.000000000 +0000 +++ diod-1.0.24/debian/changelog 2020-03-16 22:20:44.000000000 +0000 @@ -1,3 +1,12 @@ +diod (1.0.24-5) unstable; urgency=medium + + * Don't depend on libattr1-dev for use from + glibc instead (closes: #953914) + * Use debhelper 10 + * Standards-Version 4.5.0 - no changes + + -- Євгеній Мещеряков Mon, 16 Mar 2020 23:20:44 +0100 + diod (1.0.24-4) unstable; urgency=medium * New patches: diff -Nru diod-1.0.24/debian/compat diod-1.0.24/debian/compat --- diod-1.0.24/debian/compat 2018-12-20 01:04:48.000000000 +0000 +++ diod-1.0.24/debian/compat 2020-03-16 22:20:44.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru diod-1.0.24/debian/control diod-1.0.24/debian/control --- diod-1.0.24/debian/control 2018-12-20 01:04:48.000000000 +0000 +++ diod-1.0.24/debian/control 2020-03-16 22:20:44.000000000 +0000 @@ -2,12 +2,11 @@ Section: admin Priority: optional Maintainer: Євгеній Мещеряков -Build-Depends: debhelper (>= 9~), dh-autoreconf, libpopt-dev, liblua5.1-0-dev, +Build-Depends: debhelper (>= 10~), libpopt-dev, liblua5.1-0-dev, libmunge-dev, libcap-dev, libncurses5-dev, libwrap0-dev, - valgrind [amd64 i386 powerpc], pkg-config, autotools-dev, - libattr1-dev + valgrind [amd64 i386 powerpc], pkg-config Build-Conflicts: valgrind [armel] -Standards-Version: 4.2.1 +Standards-Version: 4.5.0 Homepage: https://github.com/chaos/diod Vcs-Git: https://salsa.debian.org/debian/diod.git Vcs-Browser: https://salsa.debian.org/debian/diod diff -Nru diod-1.0.24/debian/patches/0005-Use-sys-xattr.h-instead-of-attr-xattr.h.patch diod-1.0.24/debian/patches/0005-Use-sys-xattr.h-instead-of-attr-xattr.h.patch --- diod-1.0.24/debian/patches/0005-Use-sys-xattr.h-instead-of-attr-xattr.h.patch 1970-01-01 00:00:00.000000000 +0000 +++ diod-1.0.24/debian/patches/0005-Use-sys-xattr.h-instead-of-attr-xattr.h.patch 2020-03-16 22:20:44.000000000 +0000 @@ -0,0 +1,42 @@ +From: Eugeniy Meshcheryakov +Date: Mon, 16 Mar 2020 01:03:26 +0100 +Subject: Use instead of + +This closes #953914 +--- + diod/xattr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/diod/xattr.c ++++ b/diod/xattr.c +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- a/tests/user/tsetxattr.c ++++ b/tests/user/tsetxattr.c +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + + + #include "9p.h" +--- a/tests/user/txattr.c ++++ b/tests/user/txattr.c +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff -Nru diod-1.0.24/debian/patches/series diod-1.0.24/debian/patches/series --- diod-1.0.24/debian/patches/series 2018-12-20 01:04:48.000000000 +0000 +++ diod-1.0.24/debian/patches/series 2020-03-16 22:20:44.000000000 +0000 @@ -2,3 +2,4 @@ tests-num-threads.diff disable-xattr-tests.diff include-sysmacros_h.diff +0005-Use-sys-xattr.h-instead-of-attr-xattr.h.patch diff -Nru diod-1.0.24/debian/rules diod-1.0.24/debian/rules --- diod-1.0.24/debian/rules 2018-12-20 01:04:48.000000000 +0000 +++ diod-1.0.24/debian/rules 2020-03-16 22:20:44.000000000 +0000 @@ -12,7 +12,7 @@ export ACLOCAL=aclocal -I config %: - dh $@ --with autoreconf --parallel + dh $@ override_dh_auto_configure: dh_auto_configure -- CPPFLAGS="$(CPPFLAGS) $(shell pkg-config --cflags lua5.1)" --with-lua-suffix=5.1