Merge branch 'debian' into debian-common

Conflicts:
	debian/control

diff --cc debian/control
index 74f1ca04f97a8f617410136486203eaa10cc5760,0fb48142681716de718e5955564095fa871d39f3..080591fcf03c684ee7a770661f2ce6c8ef7bb321
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,7 -9,8 +9,8 @@@ Homepage: http://github.com/apenwarr/bu
  
  Package: bup
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 +Depends: ${shlibs:Depends}, ${misc:Depends}, bup-common
+ Recommends: par2
  Description: highly efficient file backup system based on git
   bup is a backup tool which stores the backups in a system based around
   the packfile format from git.