[postfwd] 59/96: update to recent release

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository postfwd.

commit 3e24c2190617e855468fdbda536e45c87118f798
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Dec 8 21:05:38 2010 +0000

    update to recent release
---
 debian/changelog        |   14 +++++++++++---
 debian/patches/00list   |    2 +-
 debian/postfwd.docs     |    2 +-
 debian/postfwd.postinst |    8 ++++++--
 debian/rules            |    7 ++++++-
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adc55e5..66875df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-postfwd (1.18-2) unstable; urgency=low
+postfwd (1.20-1) unstable; urgency=low
 
+  * New upstream release
+    - Release contains postfwd1 and postfwd2 now
+    - new --umask setting allows to set filepermissions for pidfilesand unix
+      domain sockets
+    - Rate limit code rewritten
+    - rbl checks disabled for ipv6 addresses, cidr compare will switch to
+      default (regex/string)
+    - rbl check could fail on multiple dnsbl answers
   * Add dpatch infrastructure
-  * Add 01_postfwd2.dpatch to ship postfwd2 script and changelog
   * Provide update-alternatives for choosing the postfwd variant
+  * Install also CHANGELOG2
 
- -- Jan Wagner <waja at cyconet.org>  Sun, 17 Oct 2010 15:18:39 +0200
+ -- Jan Wagner <waja at cyconet.org>  Wed, 08 Dec 2010 22:04:01 +0100
 
 postfwd (1.18-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 7fade7d..ccbeb27 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1 @@
-01_postfwd2
+#01_postfwd2
diff --git a/debian/postfwd.docs b/debian/postfwd.docs
index 45b1e2a..3bb7ccf 100644
--- a/debian/postfwd.docs
+++ b/debian/postfwd.docs
@@ -1,3 +1,3 @@
 doc/postfwd.html
 doc/postfwd.txt
-doc/postfwd2.CHANGELOG 
+doc/CHANGELOG2
diff --git a/debian/postfwd.postinst b/debian/postfwd.postinst
index 4162f98..fed6a61 100644
--- a/debian/postfwd.postinst
+++ b/debian/postfwd.postinst
@@ -54,6 +54,10 @@ case "$1" in
 		;;
 esac
 
-update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd1 100
-update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd2 120
+update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd1 100 \
+                    --slave /usr/share/man/man1/postfwd.1.gz postfwd.1.gz \
+                    /usr/share/man/man1/postfwd1.1.gz
+update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd2 120 \
+                    --slave /usr/share/man/man1/postfwd.2.gz postfwd.2.gz \
+                    /usr/share/man/man1/postfwd2.1.gz
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index a9b4b3d..28ec61c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,12 @@ install: build
 	dh_testroot
 	dh_clean -k
 
+	# install binaries
 	install -D -m 644 sbin/postfwd debian/postfwd/usr/sbin/postfwd1
 	install -D -m 644 sbin/postfwd2 debian/postfwd/usr/sbin/postfwd2
+	# install man page
+	mkdir -p debian/tmp/
+	cp man/man8/postfwd.8 debian/tmp/postfwd1.8
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -29,7 +33,8 @@ binary-indep: build install
 	dh_installdocs tools
 	dh_installexamples etc/postfwd.cf.sample debian/example-cfg*
 	dh_installinit -- defaults 19 21
-	dh_installman man/man8/postfwd.8
+	dh_installman man/man8/postfwd2.8
+	dh_installman debian/tmp/postfwd1.8
 	# dh_link usr/share/man/man1/postfwd.1.gz usr/share/man/man1/postfwd2.1.gz
 	dh_compress
 	dh_fixperms

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/postfwd.git