distro/pkg/deb: apply most differences from downstream Debian

I looked through the differences and sometimes checked
relevant docs or commits which introduced the differences.

Keeping on debhelper-compat 12, so that we don't have to
drop Ubuntu 20.04 which only ended the standard support phase
less than one year ago (and gets security support for 5-10 more).

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index 2ee4f32b89fc4aa52764faf41b553e396da65540..8317b89cdd63628292320dab97fa7b258cd2a646 100644 (file)
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -5,6 +5,7 @@ Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
 Build-Depends:
  debhelper (>= 12~),
  dh-python,
+ dns-root-data,
  libcap-ng-dev,
  libcmocka-dev (>= 1.0.0),
  libfstrm-dev,
@@ -20,15 +21,15 @@ Build-Depends:
  libsystemd-dev (>= 227) [linux-any],
  libuv1-dev,
  luajit,
- meson (>= 0.49),
- pkg-config,
+ meson,
+ ninja-build,
+ pkgconf,
  protobuf-compiler,
  protobuf-c-compiler,
  python3-dev:any,
  python3-setuptools,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.3
 Homepage: https://www.knot-resolver.cz/
-Rules-Requires-Root: no
 
 Package: knot-resolver6
 Architecture: any
@@ -60,7 +61,7 @@ Recommends:
  python3-watchdog,
 Suggests:
  knot-resolver6-module-http,
-Description: caching, DNSSEC-validating DNS resolver - core binaries
+Description: caching, DNSSEC-validating DNS resolver - binaries
  Knot Resolver is a caching full resolver implementation
  written in C and LuaJIT, including both a resolver library and a
  daemon. Modular architecture of the library keeps the core tiny and
@@ -118,11 +119,11 @@ Description: dnstap module for Knot Resolver
 Package: knot-resolver6-module-http
 Architecture: all
 Depends:
- knot-resolver6 (>= ${source:Version}),
+ knot-resolver6 (= ${binary:Version}),
  libjs-bootstrap,
  libjs-d3,
  libjs-jquery,
- lua-cqueues (>= 20171014),
+ lua-cqueues,
  lua-http,
  lua-mmdb,
  systemd,

diff --git a/distro/pkg/deb/copyright b/distro/pkg/deb/copyright
index 92eade13a8f344216dca7f968ce3150b7333aac8..4522c38720ab3d572b72cba658cb4ff4723a31e1 100644 (file)
--- a/distro/pkg/deb/copyright
+++ b/distro/pkg/deb/copyright
@@ -6,6 +6,11 @@ Files: *
 Copyright: CZ.NIC
 License: GPL-3.0+
 
+Files: debian/*
+Copyright: 2015 Ondřej Surý <ondrej@debian.org>
+           2021-2024 Jakub Ružička <jru@debian.org>
+License: GPL-3.0+
+
 Files: contrib/ccan/asprintf/*
 Copyright: Rusty Russell
 License: Expat
@@ -75,10 +80,6 @@ Files: modules/http/static/selectize.min.js
 Copyright: 2013–2015 Brian Reavis & contributors
 License: Apache-2.0
 
-Files: debian/*
-Copyright: 2015 Ondřej Surý <ondrej@debian.org>
-License: GPL-3.0+
-
 License: LGPL-2.1
  This library is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as
@@ -323,8 +324,7 @@ License: GPL-2
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ with this program; if not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in "/usr/share/common-licenses/GPL-2".

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 0fbd3570908dc1d70e895e2fac598a163389c118..4324c3a7c274451b0c2aecb293769b01b21a4e87 100755 (executable)
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -26,6 +26,7 @@ override_dh_auto_configure:
                --buildtype=plain \
                --prefix=/usr \
                --libdir=lib \
+               -Dinstall_root_keys=disabled \
                -Dsystemd_files=enabled \
                -Ddnstap=enabled \
                -Dkeyfile_default=/usr/share/dns/root.key \
@@ -43,3 +44,9 @@ override_dh_auto_install:
        PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
                dh_auto_install --buildsystem=pybuild
        install -m 644 -D etc/config/config.yaml debian/tmp/etc/knot-resolver/config.yaml
+
+override_dh_auto_clean:
+       rm -rf .pybuild/
+       rm -rf build/
+       rm -rf python/knot_resolver.egg-info
+       dh_auto_clean