Merge changes from master and switch version to 0.9.6.

diff --git a/debian/changelog b/debian/changelog
index 781c94df02ab49c96a3865b957fb83be206ac27e..1aedca7c2c9284c0a573282191caa7073643e86d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fuse-exfat (0.9.6-1~bpo60+1) squeeze-backports; urgency=low
+
+  * Backport for Debian/Squeeze.
+  * Change the debian branch in gbp.conf to squeeze-backports.
+  * Depend on fuse-utils instead of fuse for linux-any.
+
+ -- Sven Hoexter <hoexter@debian.org>  Sat, 14 Jan 2012 19:08:52 +0100
+
 fuse-exfat (0.9.6-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 618802e4eeb9020df6f8e7cfd71ab32f3b6eca09..0cea6f87f1c91bf007b1367c39d4fb56ae11f2ee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.sven.stormbind.net/?p=sven/fuse-exfat.git
 
 Package: exfat-fuse
 Architecture: linux-any kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, fuse [linux-any], fuse4bsd [kfreebsd-any]
+Depends: ${shlibs:Depends}, ${misc:Depends}, fuse-utils [linux-any], fuse4bsd [kfreebsd-any]
 Recommends: exfat-utils
 Description: read and write exFAT driver for FUSE 
  fuse-exfat is a read and write driver implementing

diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c7444886870d72dc8bcd536479e7f8a284..4bb7857fd2ec88f20fafee123116861502012892 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = True
+debian-branch = squeeze-backports