From: Jon Dowland <jmtd@debian.org>
Date: Tue, 6 Apr 2010 21:28:24 +0000 (+0100)
Subject: Merge branch 'debian' into debian-common
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ac35d0ec23d00190e0f1738e763f3deb6cf2c88d;p=packages%2Fb%2Fbup.git

Merge branch 'debian' into debian-common

Conflicts:
	debian/control
---

ac35d0ec23d00190e0f1738e763f3deb6cf2c88d
diff --cc debian/control
index 74f1ca0,0fb4814..080591f
--- a/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.