From: Sven Hoexter <sven@timegate.de>
Date: Sun, 12 Aug 2012 17:39:09 +0000 (+0200)
Subject: * New upstream release.
X-Git-Tag: debian/0.9.8-1~3
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=0a13e7b2a499334cfa9bc5d8b23913f26317f57a;p=sven%2Ffuse-exfat.git

* New upstream release.
  + The mkfs utility was rewritten and can now
    create filesystems up to several exabytes.
* Dropped all patches - merged upstream.
* Dropped all usage of quilt - currently not required.
---

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 68083bd..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-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 <hoexter@debian.org>, Mon, 21 May 2012 20:54:59 +0200
diff --git a/debian/changelog b/debian/changelog
index 5be252c..a2e3ef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fuse-exfat (0.9.8-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Dropped all patches - merged upstream.
+  * Dropped all usage of quilt - currently not required.
+  
+ -- Sven Hoexter <hoexter@debian.org>  Sun, 12 Aug 2012 19:38:28 +0200
+
 fuse-exfat (0.9.7-2) unstable; urgency=low
 
   * Switch from dh compat level 8 to 9.
diff --git a/debian/control b/debian/control
index da53357..59383fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fuse-exfat
 Section: otherosfs
 Priority: optional
 Maintainer: Sven Hoexter <hoexter@debian.org>
-Build-Depends: debhelper (>= 9), scons, libfuse-dev, quilt
+Build-Depends: debhelper (>= 9), scons, libfuse-dev
 Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/exfat/
 Vcs-Git: git://git.sven.stormbind.net/git/sven/fuse-exfat.git
diff --git a/debian/patches/honor-cppflags b/debian/patches/honor-cppflags
deleted file mode 100644
index 199876b..0000000
--- a/debian/patches/honor-cppflags
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index e3ec1be..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-honor-cppflags
-utf16-fix
diff --git a/debian/patches/utf16-fix b/debian/patches/utf16-fix
deleted file mode 100644
index 10bce32..0000000
--- a/debian/patches/utf16-fix
+++ /dev/null
@@ -1,22 +0,0 @@
-Applied upstream in r283.
-http://code.google.com/p/exfat/source/detail?r=283
-Closes Debian bug #672898.
-Thanks to Vladimir Serbinenko <phcoder@gmail.com>.
---- 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
index 27581bb..8a057aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export CCFLAGS=${CFLAGS}
 
 
 %:
-	dh $@ --with quilt
+	dh $@
 
 override_dh_auto_build:
 	scons