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

diff --git a/debian/changelog b/debian/changelog
index 2c081d022f7e446ffd0de6911758c4791381683e..9f0a0583f935260869645303039ee3ffa25f14c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
@@ -11,7 +18,7 @@ exfat-utils (1.2.1-1) unstable; urgency=low
   * 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
 

diff --git a/debian/patches/kfreebsd-compat b/debian/patches/kfreebsd-compat
new file mode 100644 (file)
index 0000000..c4f1cf1
--- /dev/null
+++ b/debian/patches/kfreebsd-compat
@@ -0,0 +1,13 @@
+Index: fuse-exfat/libexfat/platform.h
+===================================================================
+--- fuse-exfat.orig/libexfat/platform.h
++++ fuse-exfat/libexfat/platform.h
+@@ -24,7 +24,7 @@
+ #ifndef PLATFORM_H_INCLUDED
+ #define PLATFORM_H_INCLUDED
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GLIBC__)
+ 
+ #include <endian.h>
+ #include <byteswap.h>

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..b7646da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kfreebsd-compat

diff --git a/debian/source/format b/debian/source/format
index d3827e75a5cadb9fe4a27e1cb9b6d192e7323120..163aaf8d82b6c54f23c45f32895dbdfdcc27b047 100644 (file)
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)