From ac9362ae5bfc665535ef6471567474e938ca6bb1 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 16 May 2006 20:28:31 +0000
Subject: [PATCH] fixed binary-indep binary-arch separation

---
 debian/changelog |  2 ++
 debian/control   |  2 +-
 debian/rules     | 23 ++++++++---------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ac63b80..f337ad72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ fail2ban (0.6.1-4) unstable; urgency=low
     - debhelper and dpatch moved to Build-Depends
     - added --no-compile for python setup.py install, and removed explicit
       cleaning of .pyc's
+    - fixed separation binary-indep and binary-arch in debian/rules
+    - restricted depends on python >= 2.3
 
  -- Yaroslav Halchenko <debian@onerussian.com>  Tue, 16 May 2006 15:53:06 -0400
 
diff --git a/debian/control b/debian/control
index fc451057..5930a534 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: fail2ban
 Architecture: all
-Depends: python, iptables, lsb-base (>=2.0-7)
+Depends: python (>=2.3), iptables, lsb-base (>=2.0-7)
 Description: bans IPs that cause multiple authentication errors
  Monitors (in daemon mode) or just scans log files (e.g. /var/log/auth.log,
  /var/log/apache/access.log) and temporarily bans failure-prone
diff --git a/debian/rules b/debian/rules
index e4453f76..0ece77ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,11 +23,7 @@ configure-stamp:
 	# Add here commands to configure the package.
 	touch configure-stamp
 
-build: patch build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-	touch build-stamp
+build: patch
 
 copy-inits:
 	cp config/gentoo-confd debian/fail2ban.default
@@ -47,7 +43,7 @@ clean: clean-inits unpatch
 
 	dh_clean
 
-install: build
+install: build copy-inits
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -63,13 +59,7 @@ $(MANPAGE): fail2ban fail2ban.h2m
 	help2man --include fail2ban.h2m --section=1x --no-info --output $@ ./fail2ban
 
 # Build architecture-independent files here.
-binary-indep: build install $(MANPAGE)
-
-	# migrated from binary-arch
-	dh_python
-
-# Build architecture-dependent files here.
-binary-arch: build install copy-inits
+binary-indep: install $(MANPAGE)
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGELOG
@@ -82,6 +72,9 @@ binary-arch: build install copy-inits
 #	dh_installcron
 #	dh_installinfo
 	dh_installman fail2ban.8 man/fail2ban.conf.5
+# just for maint scripts. I don't want to use ${python:Depends} to be portable between
+# systems with different pythons
+	dh_python
 	dh_link
 	dh_compress
 	dh_fixperms
@@ -91,5 +84,5 @@ binary-arch: build install copy-inits
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure copy-inits clean-inits
+binary: binary-indep
+.PHONY: build clean binary-indep binary install configure copy-inits clean-inits