Merge branch 'master' into squeeze

Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index 2dec97f885d7fe557ee60013e8e1a4797290e23a,dac5602c474f0c808e78d858cfdf6cd316cb1ec5..9f474dac10ab0cd2f7a0f39aeab9d2515377210c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,68 +1,87 @@@
++amanda (1:3.3.1-3~bpo60+1) squeeze-backports; urgency=low
++
++  * backport for squeeze in response to user request, closes: #677818
++
++ -- Bdale Garbee <bdale@gag.com>  Sat, 16 Jun 2012 22:40:14 -0600
++
+ amanda (1:3.3.1-3) unstable; urgency=low
+ 
+   * patch from Robert Milan to fix kfreebsd FTBFS, closes: #667836
+   * patch from amanda-users mailing list via Jose Manuel dos Santos Calhariz
+     that fixes amrecover issue with VTAPE access, closes: #666088
+ 
+  -- Bdale Garbee <bdale@gag.com>  Thu, 12 Apr 2012 23:29:14 -0600
+ 
+ amanda (1:3.3.1-2) unstable; urgency=low
+ 
+   * patch from Michael Biebl to elide g_queue_free_full definition that
+     conflicts with glib 2.32 but isn't actually used, closes: #665675
+ 
+  -- Bdale Garbee <bdale@gag.com>  Tue, 03 Apr 2012 07:18:07 -0700
+ 
+ amanda (1:3.3.1-1) unstable; urgency=low
+ 
+   * new upstream version, closes: #655025, #658933
+   * enable hardening build flags, closes: #644437
+   * include Indonesian translation, closes: #658482
+   * relax build-deps by having dump and xfsdump only required on linux-any, 
+     to allow amanda to build on kFreeBSD, closes: #661702
+   * clean up and expand the delivery of examples, closes: #496286, #647550
+ 
+  -- Bdale Garbee <bdale@gag.com>  Tue, 20 Mar 2012 14:59:38 +0100
+ 
+ amanda (1:3.3.0-1) unstable; urgency=low
+ 
+   * new upstream version, closes: #641453
+   * lots of packaging cleanup
+   * consolidate inetd and xinetd config handling in amanda-common package
+   * add a NEWS entry explaining the switch to bsdtcp auth as default
+ 
+  -- Bdale Garbee <bdale@gag.com>  Tue, 13 Sep 2011 12:42:40 -0600
+ 
+ amanda (1:3.2.1-1.1) unstable; urgency=low
+ 
+   * non-maintainer upload
+   * clear dependency_libs in *.la files, closes: #621214
+ 
+  -- Luk Claes <luk@debian.org>  Sat, 28 May 2011 17:04:18 +0200
+ 
+ amanda (1:3.2.1-1) unstable; urgency=low
+ 
+   * new upstream version, closes: #613178
+   * enable support for Amazon S3 storage on request from Christopher McCrory
+   * fix for dh_perl usage to include private library, closes: #582220
+   * merge updated Vietnamese debconf translation, closes: #601919
+   * merge updated Danish debconf translation, closes: #608435
+   * merge updated Arabic debconf translation, closes: #596178
+ 
+  -- Bdale Garbee <bdale@gag.com>  Sun, 27 Feb 2011 11:54:58 -0700
+ 
+ amanda (1:3.2.0-1) unstable; urgency=low
+ 
+   * new upstream version
+ 
+  -- Bdale Garbee <bdale@gag.com>  Wed, 01 Dec 2010 20:39:49 -0700
+ 
+ amanda (1:3.1.0-1) unstable; urgency=low
+ 
+   * new upstream version
+ 
+  -- Bdale Garbee <bdale@gag.com>  Mon, 14 Jun 2010 13:46:03 -0600
+ 
 +amanda (1:2.6.1p2-4) UNRELEASED; urgency=low
 +
 +  * make dump and xfsdump build deps [linux-any], closes: #661702
 +
 + -- Bdale Garbee <bdale@gag.com>  Wed, 29 Feb 2012 09:50:03 -0700
 +
 +amanda (1:2.6.1p2-3) testing; urgency=low
 +
 +  * re-build -2 specifically for testing because the build depend on procps 
 +    and Perl policy fixes are imporant to include in squeeze
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 05 Dec 2010 16:19:59 -0700
 +
  amanda (1:2.6.1p2-2) unstable; urgency=low
  
    * add build depend on procps, closes: #552390