From edb4aff5d68f2121085f5bb579fc8759cc8f37f9 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 6 Apr 2016 10:55:08 +0200 Subject: [PATCH] use pve-doc-generator, bump version to 2.0-24 --- Makefile | 2 +- debian/changelog | 8 ++++++++ debian/control | 2 +- src/Makefile | 20 ++++++-------------- src/PVE/Service/pve_firewall.pm | 16 ---------------- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index d2cff76..254b6ee 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ RELEASE=4.1 VERSION=2.0 -PKGREL=23 +PKGREL=24 PACKAGE=pve-firewall diff --git a/debian/changelog b/debian/changelog index ad580d9..f1bf68a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pve-firewall (2.0-24) unstable; urgency=medium + + * Build-Depend on pve-doc-generator + + * generate manpage with pve-doc-generator + + -- Proxmox Support Team Wed, 06 Apr 2016 10:52:45 +0200 + pve-firewall (2.0-23) unstable; urgency=medium * use only the top bit for our accept marks diff --git a/debian/control b/debian/control index 29a265d..830efe8 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pve-firewall Section: admin Priority: extra Maintainer: Proxmox Support Team -Build-Depends: debhelper (>= 7.0.50~), libnetfilter-log-dev, libglib2.0-dev +Build-Depends: debhelper (>= 7.0.50~), libnetfilter-log-dev, libglib2.0-dev, pve-doc-generator Standards-Version: 3.8.4 Package: pve-firewall diff --git a/src/Makefile b/src/Makefile index 7cc10fb..bce4edd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,22 +4,15 @@ export BINDIR=${PREFIX}/bin export SBINDIR=${PREFIX}/sbin export MANDIR=${PREFIX}/share/man export DOCDIR=${PREFIX}/share/doc/pve-firewall -export PODDIR=${DOCDIR}/pod export MAN1DIR=${MANDIR}/man1/ export MAN8DIR=${MANDIR}/man8/ export PERLDIR=${PREFIX}/share/perl5 export BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions -all: pve-firewall.8 pvefw-logger - -%.8: %.8.pod - rm -f $@ - cat $<|pod2man -n $* -s 8 -r ${VERSION} -c "Proxmox Documentation" >$@.tmp - mv $@.tmp $@ +export NOVIEW=1 +include /usr/share/pve-doc-generator/pve-doc-generator.mk -pve-firewall.8.pod: PVE/Service/pve_firewall.pm - perl -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_pod_manpage();" >$@.tmp - mv $@.tmp $@ +all: pve-firewall.8 pvefw-logger pve-firewall.bash-completion: PVE/Service/pve_firewall.pm perl -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_bash_completions();" >$@.tmp @@ -35,21 +28,20 @@ pvefw-logger: pvefw-logger.c $(shell pkg-config libnetfilter_log glib-2.0 gthread-2.0 --libs --cflags) .PHONY: install -install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.8.pod pvefw-logger +install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pvefw-logger make -C PVE install install -d -m 0755 ${DESTDIR}/${SBINDIR} install -m 0755 pve-firewall ${DESTDIR}/${SBINDIR} install -m 0755 --strip pvefw-logger ${DESTDIR}/${SBINDIR} install -d ${DESTDIR}/${MAN8DIR} install -m 0644 pve-firewall.8 ${DESTDIR}/${MAN8DIR} - install -d ${DESTDIR}/${PODDIR} - install -m 0644 pve-firewall.8.pod ${DESTDIR}/${PODDIR} install -m 0644 -D pve-firewall.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/pve-firewall .PHONY: clean clean: make -C PVE clean - rm -rf pvefw-logger + make cleanup-docgen + rm -rf pvefw-logger find . -name '*~' -exec rm {} ';' diff --git a/src/PVE/Service/pve_firewall.pm b/src/PVE/Service/pve_firewall.pm index 9f712e0..0ba8a84 100755 --- a/src/PVE/Service/pve_firewall.pm +++ b/src/PVE/Service/pve_firewall.pm @@ -395,19 +395,3 @@ our $cmddef = { }; 1; - -__END__ - -=head1 NAME - -pve-firewall - PVE Firewall Daemon - -=head1 SYNOPSIS - -=include synopsis - -=head1 DESCRIPTION - -This service updates iptables rules periodically. - -=include pve_copyright -- 2.39.2