update to recent release

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@cyconet.org>  Sun, 17 Oct 2010 15:18:39 +0200
+ -- Jan Wagner <waja@cyconet.org>  Wed, 08 Dec 2010 22:04:01 +0100
 
 postfwd (1.18-1) unstable; urgency=low
 

debian/patches/00list

@@ -1 +1 @@
-01_postfwd2
+#01_postfwd2

debian/postfwd.docs

@@ -1,3 +1,3 @@
 doc/postfwd.html
 doc/postfwd.txt
-doc/postfwd2.CHANGELOG 
+doc/CHANGELOG2

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/postfwd1 100 \
-update-alternatives --install /usr/sbin/postfwd postfwd /usr/sbin/postfwd2 120
+                    --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#

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