From c96813d2771332823de83659c36b9e83a2dd5f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 6 Nov 2014 23:23:22 +0100 Subject: [PATCH] ddrescue: Cleanup patch Drop extra line due to amended commit --- sys-fs/ddrescue/patches/ddrescue-1.19.patchset | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sys-fs/ddrescue/patches/ddrescue-1.19.patchset b/sys-fs/ddrescue/patches/ddrescue-1.19.patchset index f30fc6bf7..7d55ca232 100644 --- a/sys-fs/ddrescue/patches/ddrescue-1.19.patchset +++ b/sys-fs/ddrescue/patches/ddrescue-1.19.patchset @@ -1,4 +1,4 @@ -From 1e614d3caf1f17a9c47e78aa879b20a1e6a5e0ae Mon Sep 17 00:00:00 2001 +From dfb317fc2a8456f2d6dbf1793301a32161daccbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 28 Oct 2014 15:27:22 +0100 Subject: [PATCH] Add device name detection on Haiku @@ -8,13 +8,12 @@ to ddrescue.h to avoid redeclaring it. Also drop linux.h since it's then useless. --- Makefile.in | 7 ++++--- - ddrescue.h | 1 + extra.h | 23 +++++++++++++++++++++++ haiku.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ linux.cc | 6 +----- linux.h | 18 ------------------ main.cc | 2 +- - 7 files changed, 82 insertions(+), 27 deletions(-) + 6 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 extra.h create mode 100644 haiku.cc delete mode 100644 linux.h @@ -49,15 +48,6 @@ index de0c787..86ac8b5 100644 ddrescuelog.o : Makefile arg_parser.h block.h ddrescue.h main_common.cc -diff --git a/ddrescue.h b/ddrescue.h -index 59d3111..ddd2c65 100644 ---- a/ddrescue.h -+++ b/ddrescue.h -@@ -264,3 +264,4 @@ const char * format_time( long t ); - bool interrupted(); - void set_signals(); - int signaled_exit(); -+ diff --git a/extra.h b/extra.h new file mode 100644 index 0000000..a013c38