Merge branch 'master' of ssh://git.sven.stormbind.net/home/sven/repos/exfat-utils

diff --combined debian/changelog
index 56a7046fa376ceda13e00c81fb84b2ffa6d0d41d,2c081d022f7e446ffd0de6911758c4791381683e..9f0a0583f935260869645303039ee3ffa25f14c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,8 +1,15 @@@
 +exfat-utils (1.2.1-2) unstable; urgency=low
 +
 +  * Change to source format 3.0 quilt.
 +  * Add d/patches/kfreebsd-compat so we can build on GNU/kfreebsd.
 +
 + -- Sven Hoexter <hoexter@debian.org>  Thu, 08 Oct 2015 14:34:03 +0200
 +
  exfat-utils (1.2.1-1) unstable; urgency=low
  
    * New upstream release.
      + Changes from scons to autotools
+     + Includes a fix for CVE-2015-8026
    * Remove d/install, no longer required.
    * Remove old scons overrides from d/rules.
    * Build-Depend on autotools-dev and pkg-config instead of scons.
@@@ -17,7 -11,7 +18,7 @@@
    * Readd debian/watch pointing now at the github release page.
    * Update the Homepage field in d/control.
  
 - --
 + -- Sven Hoexter <hoexter@debian.org>  Wed, 07 Oct 2015 12:15:27 +0200
  
  exfat-utils (1.1.1-1) unstable; urgency=medium