Merge changes from master and switch version to 0.9.6.

diff --git a/debian/changelog b/debian/changelog
index cc060524781c2f52a507306b660a957fec5e3413..5b72994ad8dcc4d587514fe416e60c320e3fbcc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+exfat-utils (0.9.6-1~bpo60+1) squeeze-backports; urgency=low
+
+  * Backport for Debian/squeeze.
+  * Change the debian branch in gbp.conf to squeeze-backports.
+
+ -- Sven Hoexter <hoexter@debian.org>  Wed, 25 Jan 2012 19:14:55 +0100
+
 exfat-utils (0.9.6-1) unstable; urgency=low
 
   * New upstream release.

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