From: Sven Hoexter Date: Mon, 9 Nov 2015 19:42:24 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.sven.stormbind.net/home/sven/repos/exfat-utils X-Git-Tag: debian/1.2.2-1~4 X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=commitdiff_plain;h=500e17a31f9edc049fee937dba68f8a3b9e14784;hp=95cf07d9916bc15b6324b92c7f4bf24330e89e3a Merge branch 'master' of ssh://git.sven.stormbind.net/home/sven/repos/exfat-utils --- diff --git a/debian/changelog b/debian/changelog index 2c081d0..9f0a058 100644 --- 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 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 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 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 + #include diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 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 d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt)