* New upstream release.
authorSven Hoexter <sven@timegate.de>
Sun, 12 Aug 2012 17:55:56 +0000 (19:55 +0200)
committerSven Hoexter <sven@timegate.de>
Sun, 12 Aug 2012 17:55:56 +0000 (19:55 +0200)
  + 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.
* No longer use CFLAGS as CCFLAGS, the SConstruct file
  now honors CCFLAGS.

debian/README.source [deleted file]
debian/changelog
debian/control
debian/patches/honor-cppflags [deleted file]
debian/patches/series [deleted file]
debian/patches/utf16-fix [deleted file]
debian/rules

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644 (file)
index 68083bd..0000000
+++ /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
index b94d07d..cf38ed0 100644 (file)
@@ -1,3 +1,15 @@
+exfat-utils (0.9.8-1) UNRELEASED; urgency=low
+
+  * 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.
+  * No longer use CFLAGS as CCFLAGS, the SConstruct file
+    now honors CCFLAGS.
+
+ -- Sven Hoexter <hoexter@debian.org>  Sun, 12 Aug 2012 19:51:22 +0200
+
 exfat-utils (0.9.7-2) unstable; urgency=low
 
   * Move manual link creation from debian/rules to debian/links
index cc96ffa..bfb073e 100644 (file)
@@ -2,7 +2,7 @@ Source: exfat-utils
 Section: otherosfs
 Priority: optional
 Maintainer: Sven Hoexter <hoexter@debian.org>
-Build-Depends: debhelper (>= 9), scons, quilt
+Build-Depends: debhelper (>= 9), scons
 Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/exfat/
 Vcs-Git: git://git.sven.stormbind.net/git/sven/exfat-utils.git
diff --git a/debian/patches/honor-cppflags b/debian/patches/honor-cppflags
deleted file mode 100644 (file)
index 199876b..0000000
+++ /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 (file)
index e3ec1be..0000000
+++ /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 (file)
index 10bce32..0000000
+++ /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;
index 9af1dc3..9f54ab7 100755 (executable)
@@ -6,10 +6,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-export CCFLAGS=${CFLAGS}
-
 %:
-       dh $@ --with quilt
+       dh $@
 
 override_dh_auto_build:
        scons