diff -u backuppc-3.2.0/debian/postinst backuppc-3.2.0/debian/postinst
--- backuppc-3.2.0/debian/postinst
+++ backuppc-3.2.0/debian/postinst
@@ -110,7 +110,6 @@
 	else 
 	    htpasswd2 -bm /etc/backuppc/htpasswd backuppc $RET
 	fi
-	touch /etc/backuppc/htgroup
     fi
     db_reset backuppc/tmppass
     db_subst "backuppc/configuration-note" "pass" ""
@@ -134,7 +133,7 @@
     chown -R backuppc:www-data /etc/backuppc
 
     # fix the perms of the backuppc password files
-    chmod 640 /etc/backuppc/htgroup /etc/backuppc/htpasswd
+    chmod 640 /etc/backuppc/htpasswd
     
     ;;
 
diff -u backuppc-3.2.0/debian/changelog backuppc-3.2.0/debian/changelog
--- backuppc-3.2.0/debian/changelog
+++ backuppc-3.2.0/debian/changelog
@@ -1,3 +1,23 @@
+backuppc (3.2.0-3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. (LP: #702812) Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+
+ -- Angel Abad <angelabad@ubuntu.com>  Fri, 14 Jan 2011 11:02:06 +0100
+
+backuppc (3.2.0-3) unstable; urgency=low
+
+  * Shell characters are now properly escaped. Closes: #516626
+  * Added in README.Debian instructions for IPv6 hosts. Closes: #594091
+  * Removed /etc/backuppc/htgroup. Closes: #594692
+
+ -- Ludovic Drolez <ldrolez@debian.org>  Mon, 10 Jan 2011 12:29:07 +0100
+
 backuppc (3.2.0-2ubuntu1) natty; urgency=low
 
   * Merge from debian unstable. (LP: #698028) Remaining changes:
diff -u backuppc-3.2.0/debian/README.Debian backuppc-3.2.0/debian/README.Debian
--- backuppc-3.2.0/debian/README.Debian
+++ backuppc-3.2.0/debian/README.Debian
@@ -4,7 +4,6 @@
 The Web interface is available at http://myserver/backuppc/. Log in a user
 backuppc with the random password given during installation. 
 You can change the password by running "htpasswd for /etc/backuppc/htpasswd".
-Users in the backuppc htgroup file are also admins.
 
 The default install will backup the local /etc directory using the 'backuppc'
 user, so it will not backup root only files like /etc/shadow. If you want
@@ -34,6 +33,11 @@
 - Do no use the '--exclude' option for rsync backups but only the 
   $Conf{BackupFilesExclude} backuppc parameter.
 
+- For IPv6 only hosts, add the following lines to the host configuration file:
+
+    $Conf{NmbLookupCmd} = '';
+    $Conf{NmbLookupFindHostCmd} = '';
+    $Conf{PingCmd} = '/bin/ping6';
 
 Installing BackupPC with Apache 2.2.x
 -------------------------------------
@@ -86,9 +90,7 @@
     AddHandler cgi-script .cgi
 
     AuthType Basic
-    AuthGroupFile /etc/backuppc/htgroup
-    AuthUserFile
-    /etc/backuppc/htpasswd
+    AuthUserFile /etc/backuppc/htpasswd
     AuthName "BackupPC admin"
     require valid-user
   </Directory>
diff -u backuppc-3.2.0/debian/apache.conf backuppc-3.2.0/debian/apache.conf
--- backuppc-3.2.0/debian/apache.conf
+++ backuppc-3.2.0/debian/apache.conf
@@ -14,7 +14,6 @@
 	AddHandler cgi-script .cgi
 	DirectoryIndex index.cgi
 
-	AuthGroupFile /etc/backuppc/htgroup
         AuthUserFile /etc/backuppc/htpasswd
 	AuthType basic
 	AuthName "BackupPC admin"