diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 23:51:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 23:51:29 +0000 |
| commit | 8daaacd1420c00f31c2929de73198a34ad2514c6 (patch) | |
| tree | 48bf98d85adae676317c69ad3b59ca85920066b5 /debian/patches | |
| parent | Merging upstream version 1:9.16.48. (diff) | |
| download | bind9-8daaacd1420c00f31c2929de73198a34ad2514c6.tar.xz bind9-8daaacd1420c00f31c2929de73198a34ad2514c6.zip | |
Merging debian version 1:9.16.48-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
3 files changed, 60 insertions, 1 deletions
diff --git a/debian/patches/0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch b/debian/patches/0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch new file mode 100644 index 0000000..9cd5b13 --- /dev/null +++ b/debian/patches/0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch @@ -0,0 +1,22 @@ +From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@debian.org> +Date: Wed, 16 Mar 2022 20:28:46 +0100 +Subject: Remove the reference to OPTIONS.md - it breaks build on Debian + stretch + +--- + doc/arm/build.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/arm/build.rst b/doc/arm/build.rst +index 7c266c9..1a5f000 100644 +--- a/doc/arm/build.rst ++++ b/doc/arm/build.rst +@@ -39,7 +39,7 @@ before running ``configure``. The most significant ones are: + | ``STD_CDEFINES`` | Any additional preprocessor symbols you want | + | | defined. Defaults to empty string. For a list | + | | of possible settings, see the file | +-| | `OPTIONS <OPTIONS.md>`__. | ++| | OPTIONS.md. | + +--------------------+-------------------------------------------------+ + | ``LDFLAGS`` | The linker flags. Defaults to an empty string. | + +--------------------+-------------------------------------------------+ diff --git a/debian/patches/0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch b/debian/patches/0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch new file mode 100644 index 0000000..3bf68b8 --- /dev/null +++ b/debian/patches/0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch @@ -0,0 +1,36 @@ +From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@debian.org> +Date: Wed, 18 May 2022 17:17:57 +0200 +Subject: Disable treat-warnings-as-errors in sphinx-build + +--- + doc/arm/Makefile.in | 1 - + doc/man/Makefile.in | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in +index ce365e3..806f577 100644 +--- a/doc/arm/Makefile.in ++++ b/doc/arm/Makefile.in +@@ -29,7 +29,6 @@ SPHINXBUILD = @SPHINX_BUILD@ + SPHINXBUILDDIR = ${builddir}/_build + + common_SPHINXOPTS = \ +- -W \ + -a \ + -v \ + -c "${abs_srcdir}" +diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in +index 75794f7..7148293 100644 +--- a/doc/man/Makefile.in ++++ b/doc/man/Makefile.in +@@ -158,10 +158,8 @@ BIND9_VERSIONSTRING=@BIND9_VERSIONSTRING@ + # You can set these variables from the command line. + SPHINXBUILD = @SPHINX_BUILD@ + SPHINXBUILDDIR = ${builddir}/_build +-SPHINX_W = -W + + common_SPHINXOPTS = \ +- $(SPHINX_W) \ + -a \ + -v \ + -c "${abs_srcdir}" diff --git a/debian/patches/series b/debian/patches/series index 12673d3..f17013e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Add_--install-layout=deb_to_setup.py_call.patch 0002-python-fix-for-dist-packages.patch -0003-Disable-sphinx-build-strict-mode.patch +0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch +0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch |