distro/pkg/deb: debian packaging changes for v6

14 files changed, 45 insertions, 32 deletions

diff --git a/distro/pkg/deb/compat b/distro/pkg/deb/compat
index ec635144..48082f72 100644
--- a/distro/pkg/deb/compat
+++ b/distro/pkg/deb/compat
@@ -1 +1 @@
-9
+12
diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index c4d1edb2..d4a3bda9 100644
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
 Build-Depends:
- debhelper (>= 9~),
+ debhelper (>= 12~),
  dh-python,
  libcmocka-dev (>= 1.0.0),
  libedit-dev,
@@ -28,7 +28,30 @@ Build-Depends:
  libssl-dev,
 Homepage: https://www.knot-resolver.cz/
 
-Package: knot-resolver
+Package: knot-resolver-manager
+Architecture: all
+Provides:
+ knot-resolver6,
+Depends:
+ knot-resolver-core (= ${binary:Version}),
+ python3-aiohttp,
+ python3-jinja2,
+ python3-yaml,
+ python3-prometheus-client,
+ supervisor,
+ ${misc:Depends},
+ ${python3:Depends},
+Section: python
+Description: caching, DNSSEC-validating DNS resolver - config manager
+ Knot Resolver is a caching full resolver implementation written in C and
+ LuaJIT, including both a resolver library and a daemon.
+ .
+ This package contains Knot Resolver Manager - a configuration tool for Knot
+ Resolver. The Manager hides the complexity of running several independent
+ resolver processes while ensuring zero-downtime reconfiguration with YAML/JSON
+ declarative configuration and an optional HTTP API for dynamic changes.
+
+Package: knot-resolver-core
 Architecture: any
 Depends:
  adduser,
@@ -36,10 +59,10 @@ Depends:
  systemd,
  ${misc:Depends},
  ${shlibs:Depends},
-Replaces:
-  libkres9 (<< 3.2.1-2),
 Breaks:
-  libkres9 (<< 3.2.1-2),
+ knot-resolver (<< 6),
+Replaces:
+ knot-resolver (<< 6),
 Recommends:
  lua-basexx,
  lua-cqueues,
@@ -47,8 +70,8 @@ Recommends:
  lua-psl,
 Suggests:
  knot-resolver-module-http,
-Description: caching, DNSSEC-validating DNS resolver
- The Knot Resolver is a caching full resolver implementation
+Description: caching, DNSSEC-validating DNS resolver - core 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
  efficient, and provides a state-machine like API for
@@ -63,14 +86,17 @@ Description: caching, DNSSEC-validating DNS resolver
  DNS recursors - no threading, shared-nothing architecture (except
  MVCC cache that may be shared). You can start and stop additional
  nodes depending on the contention without downtime.
+ .
+ This package contains the core resolver binaries.
 
-Package: knot-resolver-dbg
+Package: knot-resolver-core-dbg
 Architecture: any
-Depends: knot-resolver (= ${binary:Version}),
-         ${misc:Depends}
+Depends:
+ knot-resolver-core (= ${binary:Version}),
+ ${misc:Depends}
 Recommends: gdb
 Section: debug
-Priority: extra
+Priority: optional
 Description: Debug symbols for Knot Resolver
  This package provides the debug symbols for Knot Resolver needed
  for properly debugging errors in Knot Resolver with gdb.
@@ -79,7 +105,7 @@ Package: knot-resolver-module-dnstap
 Architecture: any
 Multi-Arch: same
 Depends:
- knot-resolver (= ${binary:Version}),
+ knot-resolver-core (= ${binary:Version}),
  libfstrm0,
  libprotobuf-c1,
  ${misc:Depends},
@@ -98,7 +124,7 @@ Description: dnstap module for Knot Resolver
 Package: knot-resolver-module-http
 Architecture: all
 Depends:
- knot-resolver (= ${binary:Version}),
+ knot-resolver-core (= ${binary:Version}),
  libjs-bootstrap,
  libjs-d3,
  libjs-jquery,
@@ -120,17 +146,3 @@ Description: HTTP module for Knot Resolver
  .
  This package contains HTTP/2 module for local visualization of the
  resolver cache and queries.
-
-Package: python3-knot-resolver-manager
-Architecture: all
-Provides: knot-resolver-manager
-Depends:
- knot-resolver (= ${binary:Version}),
- ${misc:Depends},
- ${python3:Depends},
-Section: python
-Description: Configuration tool for Knot Resolver
- Knot Resolver Manager is a configuration tool for Knot Resolver. The Manager
- hides the complexity of running several independent resolver processes while
- ensuring zero-downtime reconfiguration with YAML/JSON declarative
- configuration and an optional HTTP API for dynamic changes.
diff --git a/distro/pkg/deb/knot-resolver.dirs b/distro/pkg/deb/knot-resolver-core.dirs
index f8981d8d..f8981d8d 100644
--- a/distro/pkg/deb/knot-resolver.dirs
+++ b/distro/pkg/deb/knot-resolver-core.dirs
diff --git a/distro/pkg/deb/knot-resolver.docs b/distro/pkg/deb/knot-resolver-core.docs
index 8e919d0c..8e919d0c 100644
--- a/distro/pkg/deb/knot-resolver.docs
+++ b/distro/pkg/deb/knot-resolver-core.docs
diff --git a/distro/pkg/deb/knot-resolver.install b/distro/pkg/deb/knot-resolver-core.install
index 7e4af158..7e4af158 100644
--- a/distro/pkg/deb/knot-resolver.install
+++ b/distro/pkg/deb/knot-resolver-core.install
diff --git a/distro/pkg/deb/knot-resolver.links b/distro/pkg/deb/knot-resolver-core.links
index 8196524d..8196524d 100644
--- a/distro/pkg/deb/knot-resolver.links
+++ b/distro/pkg/deb/knot-resolver-core.links
diff --git a/distro/pkg/deb/knot-resolver.manpages b/distro/pkg/deb/knot-resolver-core.manpages
index 101a4acf..101a4acf 100644
--- a/distro/pkg/deb/knot-resolver.manpages
+++ b/distro/pkg/deb/knot-resolver-core.manpages
diff --git a/distro/pkg/deb/knot-resolver.postinst b/distro/pkg/deb/knot-resolver-core.postinst
index fb2bce2f..fb2bce2f 100644
--- a/distro/pkg/deb/knot-resolver.postinst
+++ b/distro/pkg/deb/knot-resolver-core.postinst
diff --git a/distro/pkg/deb/knot-resolver.postrm b/distro/pkg/deb/knot-resolver-core.postrm
index 4c8a1ea8..4c8a1ea8 100644
--- a/distro/pkg/deb/knot-resolver.postrm
+++ b/distro/pkg/deb/knot-resolver-core.postrm
diff --git a/distro/pkg/deb/knot-resolver.preinst b/distro/pkg/deb/knot-resolver-core.preinst
index 1f8f5898..1f8f5898 100644
--- a/distro/pkg/deb/knot-resolver.preinst
+++ b/distro/pkg/deb/knot-resolver-core.preinst
diff --git a/distro/pkg/deb/knot-resolver.triggers b/distro/pkg/deb/knot-resolver-core.triggers
index e8d82469..e8d82469 100644
--- a/distro/pkg/deb/knot-resolver.triggers
+++ b/distro/pkg/deb/knot-resolver-core.triggers
diff --git a/distro/pkg/deb/python3-knot-resolver-manager.install b/distro/pkg/deb/knot-resolver-manager.install
index 3ec23ee1..3ec23ee1 100644
--- a/distro/pkg/deb/python3-knot-resolver-manager.install
+++ b/distro/pkg/deb/knot-resolver-manager.install
diff --git a/distro/pkg/deb/python3-knot-resolver-manager.manpages b/distro/pkg/deb/knot-resolver-manager.manpages
index a453f7e9..a453f7e9 100644
--- a/distro/pkg/deb/python3-knot-resolver-manager.manpages
+++ b/distro/pkg/deb/knot-resolver-manager.manpages
diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 787dad99..d25d6b3d 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -11,6 +11,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic -fno-omit-frame-pointer
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 export PYBUILD_NAME=knot_resolver_manager
+export PYBUILD_DESTDIR=debian/knot-resolver-manager/
 
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -43,9 +44,9 @@ override_dh_auto_build:
 override_dh_auto_install:
 	DESTDIR="${PWD}/debian/tmp" ninja -v -C build_deb install
 	dh_auto_install --buildsystem=pybuild --sourcedirectory manager
-	install -m 644 -D $(CURDIR)/manager/etc/knot-resolver/config.yml $(CURDIR)/debian/tmp/etc/knot-resolver/config.yml
-	install -m 644 -D $(CURDIR)/manager/shell-completion/client.bash $(CURDIR)/debian/tmp/usr/share/bash-completion/completions/kresctl
-	install -m 644 -D $(CURDIR)/manager/shell-completion/client.fish $(CURDIR)/debian/tmp/usr/share/fish/completions/kresctl.fish
+	install -m 644 -D manager/etc/knot-resolver/config.yml debian/tmp/etc/knot-resolver/config.yml
+	install -m 644 -D manager/shell-completion/client.bash debian/tmp/usr/share/bash-completion/completions/kresctl
+	install -m 644 -D manager/shell-completion/client.fish debian/tmp/usr/share/fish/completions/kresctl.fish
 
 override_dh_auto_test:
 	meson test -C build_deb
@@ -54,4 +55,4 @@ override_dh_missing:
 	dh_missing --fail-missing
 
 override_dh_strip:
-	dh_strip --dbg-package=knot-resolver-dbg
+	dh_strip --dbg-package=knot-resolver-core-dbg