Remove all patches and usage of quilt.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644 (file)
index c4fc1e8..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses quilt, please see /usr/share/doc/quilt/README.source
-for further instructions.

diff --git a/debian/changelog b/debian/changelog
index a4998dcb148b45dc4b7a7b88ad4e8cee2d67f17e..fbe86acb2f480327686f25c208d053272cd8c0c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 fuse-exfat (1.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Remove all patches and usage of quilt.
   * Update years in debian/copyright.
 
  -- Sven Hoexter <hoexter@debian.org>  Tue, 05 Feb 2013 21:25:38 +0100

diff --git a/debian/control b/debian/control
index da533572b1288eefe787ae56c1fa591318fe26d1..59383fb822b3664993652880092f54696b4ce084 100644 (file)
--- 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/fix-fuse-read-write-return-r336.patch b/debian/patches/fix-fuse-read-write-return-r336.patch
deleted file mode 100644 (file)
index eeef1ee..0000000
--- a/debian/patches/fix-fuse-read-write-return-r336.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fixed "Operation not permitted" error on reading an empty file: FUSE read/write
-ops should return a number of bytes actually read/written or -errno on error.
-Picked from upstream svn r336.
-Index: fuse-exfat/fuse/main.c
-===================================================================
---- fuse-exfat.orig/fuse/main.c        2013-01-25 22:26:15.309086812 +0100
-+++ fuse-exfat/fuse/main.c     2013-01-25 22:26:20.093086638 +0100
-@@ -155,19 +155,25 @@
- static int fuse_exfat_read(const char* path, char* buffer, size_t size,
-               off_t offset, struct fuse_file_info* fi)
- {
-+      ssize_t ret;
-+
-       exfat_debug("[%s] %s (%zu bytes)", __func__, path, size);
--      if (exfat_generic_pread(&ef, get_node(fi), buffer, size, offset) != size)
--              return EOF;
--      return size;
-+      ret = exfat_generic_pread(&ef, get_node(fi), buffer, size, offset);
-+      if (ret < 0)
-+              return -EIO;
-+      return ret;
- }
- 
- static int fuse_exfat_write(const char* path, const char* buffer, size_t size,
-               off_t offset, struct fuse_file_info* fi)
- {
-+      ssize_t ret;
-+
-       exfat_debug("[%s] %s (%zu bytes)", __func__, path, size);
--      if (exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset) != size)
--              return EOF;
--      return size;
-+      ret = exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset);
-+      if (ret < 0)
-+              return -EIO;
-+      return ret;
- }
- 
- static int fuse_exfat_unlink(const char* path)
-Index: fuse-exfat/libexfat/io.c
-===================================================================
---- fuse-exfat.orig/libexfat/io.c      2013-01-25 22:26:15.309086812 +0100
-+++ fuse-exfat/libexfat/io.c   2013-01-25 22:26:20.093086638 +0100
-@@ -341,7 +341,7 @@
-       }
-       if (!ef->ro && !ef->noatime)
-               exfat_update_atime(node);
--      return size - remainder;
-+      return MIN(size, node->size - offset) - remainder;
- }
- 
- ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,

diff --git a/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch b/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch
deleted file mode 100644 (file)
index 8cb8de2..0000000
--- a/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fixed unexpected removal of a directory if it is moved into itself: return
-EINVAL in this situation. It also happens when trying to change directory name
-case.
-Picked from upstream svn r337.
-Index: fuse-exfat/libexfat/node.c
-===================================================================
---- fuse-exfat.orig/libexfat/node.c    2013-01-25 22:12:09.529117673 +0100
-+++ fuse-exfat/libexfat/node.c 2013-01-25 22:22:56.473094067 +0100
-@@ -905,6 +905,23 @@
-               exfat_put_node(ef, node);
-               return rc;
-       }
-+
-+      /* check that target is not a subdirectory of the source */
-+      if (node->flags & EXFAT_ATTRIB_DIR)
-+      {
-+              struct exfat_node* p;
-+
-+              for (p = dir; p; p = p->parent)
-+                      if (node == p)
-+                      {
-+                              if (existing != NULL)
-+                                      exfat_put_node(ef, existing);
-+                              exfat_put_node(ef, dir);
-+                              exfat_put_node(ef, node);
-+                              return -EINVAL;
-+                      }
-+      }
-+
-       if (existing != NULL)
-       {
-               /* remove target if it's not the same node as source */

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 228799b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-fuse-read-write-return-r336.patch
-fix-unexpected-removal-on-dir-move-r337.patch

diff --git a/debian/rules b/debian/rules
index 32b9bfcb336b051a6ea394b8a35532aa86ed9060..80f7246ce77dd0bcac323fa49d2602182d6b82d1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export CCFLAGS = $(CFLAGS)
 
 %:
-       dh $@ --with quilt
+       dh $@
 
 override_dh_auto_build:
        scons