Remove patch extra.fix-8bit-in-cdf, handled upstream

debian/patches/extra.fix-8bit-in-cdf.patch

@@ -1,24 +0,0 @@
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2014-03-05
-Description:
- Replace 8-bit characters in CDF summary data with spaces.
- .
- At the moment, uninitialized values are printed, resulting in
- differing results upon each call.
- .
- Present spaces instead until upstream provides a better solution.
-
---- a/src/readcdf.c
-+++ b/src/readcdf.c
-@@ -141,8 +141,9 @@
-                                     j++, s += k) {
-                                         if (*s == '\0')
-                                                 break;
--                                        if (isprint((unsigned char)*s))
--                                                vbuf[j] = *s;
-+                                        vbuf[j] = 
-+                                                isprint((unsigned char)*s) ?
-+                                                *s : ' ';
-                                 }
-                                 if (j == sizeof(vbuf))
-                                         --j;

debian/patches/revert.beb312b.add-fmtcheck.patch

@@ -8,7 +8,7 @@ Comment: This introduces a lot of regressions, see
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -136,10 +136,10 @@
+@@ -138,10 +138,10 @@
  fi])
  
  dnl Checks for functions
@@ -23,7 +23,7 @@ Comment: This introduces a lot of regressions, see
  AC_CHECK_LIB(z,gzopen)
 --- a/src/file.h
 +++ b/src/file.h
-@@ -514,10 +514,6 @@
+@@ -527,10 +527,6 @@
  #ifndef HAVE_ASCTIME_R
  char   *asctime_r(const struct tm *, char *);
  #endif
@@ -34,18 +34,3 @@ Comment: This introduces a lot of regressions, see
  
  #if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H) && !defined(QUICK)
  #define QUICK
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -36,7 +36,12 @@
- #endif	/* lint */
- 
- #include "magic.h"
-+#ifdef HAVE_FMTCHECK
-+#include <stdio.h>
- #define F(a, b) fmtcheck((a), (b))
-+#else
-+#define F(a, b) (a)
-+#endif
- #include <assert.h>
- #include <string.h>
- #include <ctype.h>

debian/patches/series

@@ -9,5 +9,4 @@
 0010-mdadm.patch
 0011-btrfs.patch
 0012-lxt.patch
-extra.fix-8bit-in-cdf.patch
-revert.beb312b.add-fmtcheck.patch
+# revert.beb312b.add-fmtcheck.patch