From 219ae7d9a64e398aab6d39e6a6fef6eb0ce0f630 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 12 May 2008 20:40:59 +0000 Subject: [PATCH] update to 1.10 upstream and drop dpatch --- debian/changelog | 4 ++-- debian/control | 6 +++--- debian/patches/00list | 1 - debian/patches/10_fix_manpage.dpatch | 21 --------------------- debian/rules | 9 ++++----- 5 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 debian/patches/00list delete mode 100755 debian/patches/10_fix_manpage.dpatch diff --git a/debian/changelog b/debian/changelog index d22c65f..58d6b46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -postfwd (1.03-1) unstable; urgency=low +postfwd (1.10pre7c-1) unstable; urgency=low * Initial release (Closes: #470356). - -- Jan Wagner Mon, 10 Mar 2008 22:37:44 +0100 + -- Jan Wagner Mon, 14 Apr 2008 22:37:44 +0100 diff --git a/debian/control b/debian/control index fe399e2..1781bff 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: postfwd Section: mail Priority: optional Maintainer: Jan Wagner -Build-Depends: debhelper (>= 5), dpatch +Build-Depends: debhelper (>= 5) Homepage: http://www.postfwd.org/ Vcs-Browser: https://trac.cyconet.org/debian/browser/debian/postfwd Vcs-Svn: https://trac.cyconet.org/svn/debian/postfwd @@ -10,8 +10,8 @@ Standards-Version: 3.7.3 Package: postfwd Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, adduser, libnet-cidr-lite-perl, libnet-server-perl -Description: a Postfix policyd to combine complex restrictions in a ruleset +Depends: ${perl:Depends}, ${misc:Depends}, adduser, libnet-cidr-lite-perl, libnet-dns-async-perl, libnet-server-perl +Description: Postfix policyd to combine complex restrictions in a ruleset Postfwd is written in perl to combine complex postfix restrictions in a ruleset similar to those of the most firewalls. The program uses the postfix policy delegation protocol to control access to the mail system before a diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 324347e..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -10_fix_manpage.dpatch diff --git a/debian/patches/10_fix_manpage.dpatch b/debian/patches/10_fix_manpage.dpatch deleted file mode 100755 index 76c020c..0000000 --- a/debian/patches/10_fix_manpage.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 10_fix_manpage.dpatch by Jan Wagner -## -## DP: Fix manpage section - -@DPATCH@ - -diff -Nur postfwd-1.03.orig/man/man1/postfwd.1 postfwd-1.03/man/man1/postfwd.1 ---- postfwd-1.03.orig/man/man1/postfwd.1 2007-10-29 09:29:15.000000000 +0100 -+++ postfwd-1.03/man/man1/postfwd.1 2008-03-12 01:10:48.000000000 +0100 -@@ -128,8 +128,8 @@ - .rm #[ #] #H #V #F C - .\" ======================================================================== - .\" --.IX Title "POSTFWD 1" --.TH POSTFWD 1 "2007-10-29" "perl v5.8.5" "User Contributed Perl Documentation" -+.IX Title "POSTFWD 8" -+.TH POSTFWD 8 "2007-10-29" "perl v5.8.5" "User Contributed Perl Documentation" - .SH "NAME" - postfwd \- postfix firewall daemon - .SH "SYNOPSIS" diff --git a/debian/rules b/debian/rules index 293fe7f..11e0b20 100755 --- a/debian/rules +++ b/debian/rules @@ -4,11 +4,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +build: -build: patch-stamp - -clean: unpatch +clean: dh_testdir dh_testroot dh_clean @@ -22,6 +20,7 @@ install: build install -D -m 644 sbin/postfwd debian/postfwd/usr/sbin/postfwd install -d -m 0755 debian/postfwd/usr/share/doc/postfwd/examples/ cp debian/example-cfg*.txt debian/postfwd/usr/share/doc/postfwd/examples/ + cp etc/postfwd.cf debian/postfwd/usr/share/doc/postfwd/examples/example-cfg.txt # Build architecture-independent files here. binary-indep: build install @@ -30,7 +29,7 @@ binary-indep: build install dh_installchangelogs doc/CHANGELOG dh_installdocs tools dh_installinit -- defaults 19 21 - dh_installman man/man1/postfwd.1 + dh_installman man/man8/postfwd.8 dh_link dh_compress dh_fixperms