From ab8185ca51f89315ca808e84c826af94c32fa5b7 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 23 Aug 2015 20:23:07 +0200 Subject: [PATCH] fix add-clamp-mtime.diff to reflect upstream source change --- debian/patches/add-clamp-mtime.diff | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/add-clamp-mtime.diff b/debian/patches/add-clamp-mtime.diff index c9d60158..17e752d6 100644 --- a/debian/patches/add-clamp-mtime.diff +++ b/debian/patches/add-clamp-mtime.diff @@ -157,14 +157,14 @@ index 4f5017d..cbaa9df 100644 recursion_option = FNM_LEADING_DIR; unquote_option = true; tar_sparse_major = 1; -@@ -2408,7 +2418,7 @@ decode_options (int argc, char **argv) +@@ -2490,7 +2490,7 @@ decode_options (int argc, char **argv) _("Multiple archive files require '-M' option"))); if (listed_incremental_option - && NEWER_OPTION_INITIALIZED (newer_mtime_option)) + && TIME_OPTION_INITIALIZED (newer_mtime_option)) - USAGE_ERROR ((0, 0, - _("Cannot combine --listed-incremental with --newer"))); + option_conflict_error ("--listed-incremental", "--newer"); + if (incremental_level != -1 && !listed_incremental_option) @@ -2461,6 +2471,13 @@ decode_options (int argc, char **argv) USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives"))); -- 2.30.2