From: Sven Hoexter Date: Sun, 12 Aug 2012 17:16:47 +0000 (+0200) Subject: Merge tag 'upstream/0.9.8' X-Git-Tag: debian/0.9.8-1~2 X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=commitdiff_plain;h=4c15e072cf41b39ffa0c4354c64856a9c8414edf;hp=70a4b10edcf53a90140e6dd80ccaa045f3647ad7 Merge tag 'upstream/0.9.8' Upstream version 0.9.8 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..68083bd --- /dev/null +++ b/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage the patches in debian/patches. +For further information please install the quilt package and read +/usr/share/doc/quilt/README.source. + + -- Sven Hoexter , Mon, 21 May 2012 20:54:59 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b94d07d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,37 @@ +exfat-utils (0.9.7-2) unstable; urgency=low + + * Move manual link creation from debian/rules to debian/links + and thus make use of dh_link. + * Switch dh compat level from 8 to 9. + * Enable all hardening flags via DEB_BUILD_MAINT_OPTIONS. + * Export CFLAGS as CCFLAGS which is honored by the current + SConstruct file. + * Add debian/patches/honor-cppflags - scons should use exported + CPPFLAGS. + * Add debian/patches/utf16-fix - fix handling of characters beyond BMP. + Thanks to Vladimir Serbinenko . + * Add build-dep on quilt, use dh quilt addon in debian/rules. + * Add README.source to reference quilt. + + -- Sven Hoexter Mon, 21 May 2012 21:19:35 +0200 + +exfat-utils (0.9.7-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.3 - no changes required. + * Remove config.log, in the clean target (via override dh_auto_clean). + + -- Sven Hoexter Fri, 09 Mar 2012 21:19:25 +0100 + +exfat-utils (0.9.6-1) unstable; urgency=low + + * New upstream release. + + -- Sven Hoexter Sat, 14 Jan 2012 18:21:18 +0100 + +exfat-utils (0.9.5-1) unstable; urgency=low + + * Initial release. (Closes: #625611) + + -- Sven Hoexter Mon, 02 Jan 2012 12:59:11 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..cc96ffa --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: exfat-utils +Section: otherosfs +Priority: optional +Maintainer: Sven Hoexter +Build-Depends: debhelper (>= 9), scons, quilt +Standards-Version: 3.9.3 +Homepage: http://code.google.com/p/exfat/ +Vcs-Git: git://git.sven.stormbind.net/git/sven/exfat-utils.git +Vcs-Browser: http://git.sven.stormbind.net/?p=sven/exfat-utils.git + +Package: exfat-utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: exfat-fuse +Description: utilities to create, check, label and dump exFAT filesystem + Utilities to manage extended file allocation table filesystem. + This package provides tools to create, check and label the + filesystem. It contains + - dumpexfat to dump properties of the filesystem + - exfatfsck / fsck.exfat to report errors found on a exFAT filesystem + - exfatlabel to label a exFAT filesystem + - mkexfatfs / mkfs.exfat to create a exFAT filesystem. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..95a7569 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,33 @@ +This work was packaged for Debian by: + Sven Hoexter on Thu, 29 Dec 2011 10:30:47 +0100 + +It was downloaded from: + http://code.google.com/p/exfat/downloads/list + +Upstream Author: + Andrew Nayenko resver@gmail.com + +Copyright: + Copyright (C) 2009, 2010 Andrew Nayenko + +License: + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + On any Debian system, you can find the complete text of the GNU GPL + (GNU General Public License) in the file "/usr/share/common-licenses/GPL-3". + +The Debian packaging is: + Copyright (C) 2011-2012 Sven Hoexter + +and is licensed under the GPL version 3, see "/usr/share/common-licenses/GPL-3". diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..374a8a7 --- /dev/null +++ b/debian/install @@ -0,0 +1,4 @@ +dump/dumpexfat /sbin +fsck/exfatfsck /sbin +label/exfatlabel /sbin +mkfs/mkexfatfs /sbin diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..b8d123b --- /dev/null +++ b/debian/links @@ -0,0 +1,4 @@ +sbin/exfatfsck sbin/fsck.exfat +sbin/mkexfatfs sbin/mkfs.exfat +usr/share/man/man8/exfatfsck.8.gz usr/share/man/man8/fsck.exfat.8.gz +usr/share/man/man8/mkexfatfs.8.gz usr/share/man/man8/mkfs.exfat.8.gz diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..d8cc60f --- /dev/null +++ b/debian/manpages @@ -0,0 +1,4 @@ +dump/dumpexfat.8 +fsck/exfatfsck.8 +label/exfatlabel.8 +mkfs/mkexfatfs.8 diff --git a/debian/patches/honor-cppflags b/debian/patches/honor-cppflags new file mode 100644 index 0000000..199876b --- /dev/null +++ b/debian/patches/honor-cppflags @@ -0,0 +1,13 @@ +Applied upstream in r284. +http://code.google.com/p/exfat/source/detail?r=284 +--- a/SConstruct ++++ b/SConstruct +@@ -41,6 +41,8 @@ if not conf.env['CCFLAGS']: + conf.env.Replace(CCFLAGS = '-Wall -O2 -ggdb') + elif conf.env['CC'] == 'clang': + conf.env.Replace(CCFLAGS = '-Wall -O2 -g') ++if 'CPPFLAGS' in os.environ: ++ conf.env.Replace(CPPFLAGS = os.environ['CPPFLAGS']) + conf.env.Append(CPPDEFINES = {'FUSE_USE_VERSION': 26}) + conf.env.Append(CPPDEFINES = {'_FILE_OFFSET_BITS' : 64}) + conf.env.Append(CPPPATH = ['libexfat']) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e3ec1be --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +honor-cppflags +utf16-fix diff --git a/debian/patches/utf16-fix b/debian/patches/utf16-fix new file mode 100644 index 0000000..10bce32 --- /dev/null +++ b/debian/patches/utf16-fix @@ -0,0 +1,22 @@ +Applied upstream in r283. +http://code.google.com/p/exfat/source/detail?r=283 +Closes Debian bug #672898. +Thanks to Vladimir Serbinenko . +--- a/libexfat/utf.c ++++ b/libexfat/utf.c +@@ -89,6 +89,7 @@ static const le16_t* utf16_to_wchar(cons + return NULL; + *wc = ((wchar_t) (le16_to_cpu(input[0]) & 0x3ff) << 10); + *wc |= (le16_to_cpu(input[1]) & 0x3ff); ++ *wc += 0x10000; + return input + 2; + } + else +@@ -186,6 +187,7 @@ static le16_t* wchar_to_utf16(le16_t* ou + } + if (outsize < 2) + return NULL; ++ wc -= 0x10000; + output[0] = cpu_to_le16(0xd800 | ((wc >> 10) & 0x3ff)); + output[1] = cpu_to_le16(0xdc00 | (wc & 0x3ff)); + return output + 2; diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..9af1dc3 --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +export CCFLAGS=${CFLAGS} + +%: + dh $@ --with quilt + +override_dh_auto_build: + scons + +override_dh_auto_clean: + scons -c + rm -f config.log diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..714c860 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://code.google.com/p/exfat/downloads/list?can=1 .*/exfat-utils-(\d[\d\.]*)\.tar\.gz