Skip to content

Commit

Permalink
Use the upstream man-pages
Browse files Browse the repository at this point in the history
There's nothing wrong with them and they include a build-date which will make
the binary packages non-reproducible if they are regenerated when the packages
are built.

* d/clean: remove man-pages
* d/control: remove man-page build-deps
* d/patches: add upstream patch to prevent removal of man-pages by `make clean`

Signed-off-by: Jeremy Sowden <[email protected]>
  • Loading branch information
a3a3el committed Aug 10, 2023
1 parent cceedbd commit 26632e8
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 6 deletions.
3 changes: 0 additions & 3 deletions debian/clean
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
doc/*.3
doc/*.5
doc/*.8
py/nftables.egg-info/
4 changes: 1 addition & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ Priority: important
Maintainer: Debian Netfilter Packaging Team <[email protected]>
Uploaders: Arturo Borrero Gonzalez <[email protected]>,
Jeremy Sowden <[email protected]>
Build-Depends: asciidoc-base,
automake,
Build-Depends: automake,
bison,
debhelper-compat (= 13),
dh-python,
docbook-xsl,
flex,
libeditreadline-dev,
libgmp-dev,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Description: doc: move man-pages to `MAINTAINERCLEANFILES`
.
Since the man-pages are built and included in the distribution
tar-balls, the appropriate clean target is `maintainer-clean`.
From: Jeremy Sowden <[email protected]>
Last-Update: 2023-08-10
Origin: upstream, http://git.netfilter.org/nftables/commit/?id=520a8ba89d118c14de9376e6e21160e71d74fbe0
---
doc/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5a64e39b48cf..b43cb08d2d14 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,5 +26,5 @@ nft.8: ${ASCIIDOCS}
.adoc.5:
${AM_V_GEN}${A2X} ${A2X_OPTS_MANPAGE} $<

-CLEANFILES += ${man_MANS}
+MAINTAINERCLEANFILES = ${man_MANS}
endif
--
2.40.1

1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
0002-py-move-package-source-into-src-directory.patch
0003-py-use-setup.cfg-to-configure-setuptools.patch
0004-py-add-pyproject.toml-to-support-PEP-517-compatible-.patch
0005-doc-move-man-pages-to-MAINTAINERCLEANFILES.patch

0 comments on commit 26632e8

Please sign in to comment.