Merge branch 'lenny'

Conflicts:
	debian/changelog
	debian/rules

diff --git a/debian/changelog b/debian/changelog
index abec0da36d985d612d5702d94dbb6eb75e111b1f..c650a86ef6a231b930e8371dfdd111ba975315a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ amanda (1:2.6.1p1-1) UNRELEASED; urgency=low
 
  -- Bdale Garbee <bdale@gag.com>  Thu, 20 Aug 2009 00:08:24 -0600
 
+amanda (1:2.5.2p1-5) unstable; urgency=low
+
+  * add --without-ipv6 as a short-term fix for amdump connectivity problems,
+    closes: #482754, #501281, #470202
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 26 Mar 2009 22:52:51 -0600
+
 amanda (1:2.5.2p1-4) unstable; urgency=high
 
   * high priority bug fixes intended for lenny release

diff --git a/debian/rules b/debian/rules
index 4fe0807f4a9574bc9eafdc668c840bf55ae34416..764713c38507ca9ba1cf3b014124b416594787d4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,8 @@ configure-stamp:
                --with-amandahosts \
                --with-ssh-security \
                --with-bsdtcp-security \
-               --with-bsdudp-security
+               --with-bsdudp-security \
+               --without-ipv6
 
        touch missing
        touch configure-stamp