From c72b936e06673d3f54f06e3237d546d8d92409ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 24 Jan 2018 11:03:31 +0000 Subject: [PATCH 1/6] Downgrade the debhelper compat level to 10 --- debian/compat | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/compat diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control index 3d4adb0bc..9c2203bf7 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian DNS Team Uploaders: Ondřej Surý , Bernhard Schmidt Build-Depends: bison, - debhelper-compat (= 12), + debhelper (>= 10), dh-apparmor, dh-exec, libcap2-dev [linux-any], -- GitLab From aa614d721e758aa1deae29a803eb324c53a5a4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 24 Jan 2018 11:51:41 +0000 Subject: [PATCH 2/6] Update d/gbp.conf for isc/backports/9.17 branch --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index 8ec461034..9b816385b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = isc/9.18 +debian-branch = isc/backports/9.18 upstream-branch = upstream/9.18 pristine-tar = True -- GitLab From 01df68817917ff33c938b86c8340a4a2045c4eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 20 Aug 2020 21:53:55 +0200 Subject: [PATCH 3/6] Only build-depend on xindy on Debian buster --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9c2203bf7..d10e4dcfd 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Build-Depends-Indep: fonts-freefont-otf, texlive-fonts-extra, texlive-latex-recommended, texlive-xetex, - xindy + xindy | texlive-xetex (<< 2018.20190227-2~) Standards-Version: 4.1.2 Vcs-Browser: https://salsa.debian.org/dns-team/bind9 Vcs-Git: https://salsa.debian.org/dns-team/bind9.git -b isc/9.18 -- GitLab From 490f0bc681922f8354f3c83777e90d81b078a241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 20 Aug 2020 22:16:20 +0200 Subject: [PATCH 4/6] Add texlive-plain-generic | texlive-generic-extra to B-D --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index d10e4dcfd..c417d7df5 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Build-Depends-Indep: fonts-freefont-otf, python3-sphinx-rtd-theme, texlive-fonts-extra, texlive-latex-recommended, + texlive-plain-generic | texlive-generic-extra, texlive-xetex, xindy | texlive-xetex (<< 2018.20190227-2~) Standards-Version: 4.1.2 -- GitLab From 4be4af7dec9f0bb7c674abb40fb5d2822733b12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 7 Dec 2020 09:00:39 +0100 Subject: [PATCH 5/6] Move the python3-sphinx to B-D to allow building manual pages --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index c417d7df5..1b75e342e 100644 --- a/debian/control +++ b/debian/control @@ -31,11 +31,11 @@ Build-Depends: bison, pkg-config, protobuf-c-compiler, python3, + python3-sphinx, + python3-sphinx-rtd-theme, zlib1g-dev Build-Depends-Indep: fonts-freefont-otf, latexmk, - python3-sphinx, - python3-sphinx-rtd-theme, texlive-fonts-extra, texlive-latex-recommended, texlive-plain-generic | texlive-generic-extra, -- GitLab From 6c3c8e8b2e2a22a7b965743577e545b143a0759b Mon Sep 17 00:00:00 2001 From: Athos Ribeiro Date: Wed, 9 Feb 2022 09:46:17 -0300 Subject: [PATCH 6/6] Do not remove local apparmor include file --- debian/bind9.maintscript | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/bind9.maintscript b/debian/bind9.maintscript index 6b43b8e2c..44e049bf9 100644 --- a/debian/bind9.maintscript +++ b/debian/bind9.maintscript @@ -3,4 +3,3 @@ mv_conffile /etc/default/bind9 /etc/default/named 1:9.12.0~ mv_conffile /etc/init.d/bind /etc/init.d/named 1:9.13.6~ mv_conffile /etc/init.d/bind9 /etc/init.d/named 1:9.12.0~ rm_conffile /etc/bind/db.root 1:9.11.4+dfsg-3~ -rm_conffile /etc/apparmor.d/local/usr.sbin.named 1:9.11.4+dfsg-1~ -- GitLab