[Forensics-changes] [libewf] 03/07: Drop unneeded patches

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/20160318-1
in repository libewf.

commit a7bdf50f86d4d2915fec7ee3de22907bc2b0a690
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Mar 25 16:46:07 2016 +0100

    Drop unneeded patches
---
 debian/patches/01_fix_libbfio_check.patch           | 15 ---------------
 debian/patches/02-fix-pkgconfig-mfcache-error.patch | 12 ------------
 debian/patches/03-fix-FTBFS-hurd-386.patch          |  6 +++---
 debian/patches/04-fix-FTBFS-GCC5.patch              | 17 -----------------
 debian/patches/series                               |  3 ---
 5 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/debian/patches/01_fix_libbfio_check.patch b/debian/patches/01_fix_libbfio_check.patch
deleted file mode 100644
index 771d71e..0000000
--- a/debian/patches/01_fix_libbfio_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libewf/m4/libbfio.m4
-===================================================================
---- libewf.orig/m4/libbfio.m4	2013-05-20 18:58:16.000000000 +0200
-+++ libewf/m4/libbfio.m4	2013-05-20 19:01:24.827766119 +0200
-@@ -24,7 +24,9 @@
-    [PKG_CHECK_MODULES(
-     [libbfio],
-     [libbfio >= 20120426],
--    [ac_cv_libbfio=yes],
-+    [ac_cv_libbfio=yes
-+    AC_CHECK_HEADERS([libbfio.h])
-+    ],
-     [ac_cv_libbfio=no])
-    ])
- 
diff --git a/debian/patches/02-fix-pkgconfig-mfcache-error.patch b/debian/patches/02-fix-pkgconfig-mfcache-error.patch
deleted file mode 100644
index 4616674..0000000
--- a/debian/patches/02-fix-pkgconfig-mfcache-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libewf/libewf.pc.in
-===================================================================
---- libewf.orig/libewf.pc.in
-+++ libewf/libewf.pc.in
-@@ -7,6 +7,6 @@ Name: libewf
- Description: Library to access the Expert Witness Compression Format (EWF)
- Version: @VERSION@
- Libs: -L${libdir} -lewf
--Libs.private: @ax_bzip2_pc_libs_private@ @ax_libbfio_pc_libs_private@ @ax_libcaes_pc_libs_private@ @ax_libcdata_pc_libs_private@ @ax_libcerror_pc_libs_private@ @ax_libcfile_pc_libs_private@ @ax_libclocale_pc_libs_private@ @ax_libcnotify_pc_libs_private@ @ax_libcpath_pc_libs_private@ @ax_libcrypto_pc_libs_private@ @ax_libcsplit_pc_libs_private@ @ax_libcstring_pc_libs_private@ @ax_libcthreads_pc_libs_private@ @ax_libfvalue_pc_libs_private@ @ax_libhmac_pc_libs_private@ @ax_libmfcache_pc_li [...]
-+Libs.private: @ax_bzip2_pc_libs_private@ @ax_libbfio_pc_libs_private@ @ax_libcaes_pc_libs_private@ @ax_libcdata_pc_libs_private@ @ax_libcerror_pc_libs_private@ @ax_libcfile_pc_libs_private@ @ax_libclocale_pc_libs_private@ @ax_libcnotify_pc_libs_private@ @ax_libcpath_pc_libs_private@ @ax_libcrypto_pc_libs_private@ @ax_libcsplit_pc_libs_private@ @ax_libcstring_pc_libs_private@ @ax_libcthreads_pc_libs_private@ @ax_libfvalue_pc_libs_private@ @ax_libhmac_pc_libs_private@ @ax_libmfdata_pc_lib [...]
- Cflags: -I${includedir}
- 
diff --git a/debian/patches/03-fix-FTBFS-hurd-386.patch b/debian/patches/03-fix-FTBFS-hurd-386.patch
index da55f4c..f74cc02 100644
--- a/debian/patches/03-fix-FTBFS-hurd-386.patch
+++ b/debian/patches/03-fix-FTBFS-hurd-386.patch
@@ -2,7 +2,7 @@ Index: libewf/libcpath/libcpath_path.c
 ===================================================================
 --- libewf.orig/libcpath/libcpath_path.c
 +++ libewf/libcpath/libcpath_path.c
-@@ -338,40 +338,12 @@ int libcpath_path_get_current_working_di
+@@ -484,40 +484,12 @@ int libcpath_path_get_current_working_di
  
  		return( -1 );
  	}
@@ -46,7 +46,7 @@ Index: libewf/libcpath/libcpath_path.c
  		libcerror_system_set_error(
  		 error,
  		 LIBCERROR_ERROR_DOMAIN_RUNTIME,
-@@ -382,6 +354,8 @@ int libcpath_path_get_current_working_di
+@@ -528,6 +500,8 @@ int libcpath_path_get_current_working_di
  
  		goto on_error;
  	}
@@ -55,7 +55,7 @@ Index: libewf/libcpath/libcpath_path.c
  	return( 1 );
  
  on_error:
-@@ -3036,23 +3010,10 @@ int libcpath_path_get_current_working_di
+@@ -3355,23 +3329,10 @@ int libcpath_path_get_current_working_di
  
  		return( -1 );
  	}
diff --git a/debian/patches/04-fix-FTBFS-GCC5.patch b/debian/patches/04-fix-FTBFS-GCC5.patch
deleted file mode 100644
index eb1f3ae..0000000
--- a/debian/patches/04-fix-FTBFS-GCC5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fix a FTBFS with GCC-5. Thanks to Linn Crosetto <linn at hp.com> for
-             the first fix (see #777938). This patch closes #777945.
-Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2015-07-02
-Index: libewf-20140608/libuna/Makefile.am
-===================================================================
---- libewf-20140608.orig/libuna/Makefile.am
-+++ libewf-20140608/libuna/Makefile.am
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/include \
- 	-I$(top_srcdir)/common \
- 	@LIBCSTRING_CPPFLAGS@ \
--	@LIBCERROR_CPPFLAGS@
-+	@LIBCERROR_CPPFLAGS@ -std=gnu89
- 
- noinst_LTLIBRARIES = libuna.la
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6726b2d..4555d93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01_fix_libbfio_check.patch
-02-fix-pkgconfig-mfcache-error.patch
 03-fix-FTBFS-hurd-386.patch
-04-fix-FTBFS-GCC5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/libewf.git