tags 585426 +patch thanks Hi,
The problem reported was this: On Wed, Jun 16, 2010 at 4:02 PM, Sandro Tosi <[email protected]> wrote: >> -D --debug enable debugging information >> each set of duplicates without prompting the user The second line of the --debug option doesn't make any sense. This "bug" was introduced through the patch 50_bts284274_hardlinkreplace.dpatch, that by mistake added this line to the --debug option after also adding other stuff. I have fixed the patch so that it doesn't add an unnecessary line. I'm attaching the debdiff output and the fixed patch. Hope it helps! -- Besos, Marga
diff -u fdupes-1.50-PR2/debian/changelog fdupes-1.50-PR2/debian/changelog --- fdupes-1.50-PR2/debian/changelog +++ fdupes-1.50-PR2/debian/changelog @@ -1,3 +1,11 @@ +fdupes (1.50-PR2-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fixed debian/patches/50_bts284274_hardlinkreplace.dpatch to remove + confusing line from the --debug help. Closes: #585426 + + -- Margarita Manterola <[email protected]> Wed, 11 May 2011 09:48:57 -0300 + fdupes (1.50-PR2-3) unstable; urgency=low * debian/control diff -u fdupes-1.50-PR2/debian/patches/50_bts284274_hardlinkreplace.dpatch fdupes-1.50-PR2/debian/patches/50_bts284274_hardlinkreplace.dpatch --- fdupes-1.50-PR2/debian/patches/50_bts284274_hardlinkreplace.dpatch +++ fdupes-1.50-PR2/debian/patches/50_bts284274_hardlinkreplace.dpatch @@ -5,9 +5,9 @@ ## DP: Replace duplicate files with hardlinks @DPATCH@ -diff -urNad fdupes-1.50-PR2~/fdupes.1 fdupes-1.50-PR2/fdupes.1 ---- fdupes-1.50-PR2~/fdupes.1 2009-07-31 00:38:28.000000000 +0200 -+++ fdupes-1.50-PR2/fdupes.1 2009-07-31 00:42:14.000000000 +0200 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fdupes-1.50-PR2~/fdupes.1 fdupes-1.50-PR2/fdupes.1 +--- fdupes-1.50-PR2~/fdupes.1 2011-05-11 09:48:05.000000000 -0300 ++++ fdupes-1.50-PR2/fdupes.1 2011-05-11 09:48:05.000000000 -0300 @@ -58,10 +58,17 @@ .B CAVEATS below) @@ -26,9 +26,9 @@ .B -v --version display fdupes version .TP -diff -urNad fdupes-1.50-PR2~/fdupes.c fdupes-1.50-PR2/fdupes.c ---- fdupes-1.50-PR2~/fdupes.c 2009-07-31 00:38:28.000000000 +0200 -+++ fdupes-1.50-PR2/fdupes.c 2009-07-31 00:41:08.000000000 +0200 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fdupes-1.50-PR2~/fdupes.c fdupes-1.50-PR2/fdupes.c +--- fdupes-1.50-PR2~/fdupes.c 2011-05-11 09:48:05.000000000 -0300 ++++ fdupes-1.50-PR2/fdupes.c 2011-05-11 09:48:45.000000000 -0300 @@ -53,6 +53,8 @@ #define F_NOPROMPT 0x0400 #define F_SUMMARIZEMATCHES 0x0800 @@ -127,7 +127,7 @@ int sort_pairs_by_arrival(file_t *f1, file_t *f2) { if (f2->duplicates != 0) -@@ -971,10 +1055,14 @@ +@@ -971,10 +1055,13 @@ printf(" \twith -s or --symlinks, or when specifying a\n"); printf(" \tparticular directory more than once; refer to the\n"); printf(" \tfdupes documentation for additional information\n"); @@ -139,11 +139,10 @@ printf(" \teach set of duplicates and delete the rest without\n"); printf(" \twithout prompting the user\n"); + printf(" -D --debug \tenable debugging information\n"); -+ printf(" \teach set of duplicates without prompting the user\n"); printf(" -v --version \tdisplay fdupes version\n"); printf(" -h --help \tdisplay this help message\n\n"); #ifdef OMIT_GETOPT_LONG -@@ -1010,12 +1098,14 @@ +@@ -1010,12 +1097,14 @@ { "symlinks", 0, 0, 's' }, { "hardlinks", 0, 0, 'H' }, { "relink", 0, 0, 'l' }, @@ -158,7 +157,7 @@ { "summarize", 0, 0, 'm'}, { "summary", 0, 0, 'm' }, { 0, 0, 0, 0 } -@@ -1029,7 +1119,7 @@ +@@ -1029,7 +1118,7 @@ oldargv = cloneargs(argc, argv); @@ -167,7 +166,7 @@ #ifndef OMIT_GETOPT_LONG , long_options, NULL #endif -@@ -1068,6 +1158,12 @@ +@@ -1068,6 +1157,12 @@ case 'd': SETFLAG(flags, F_DELETEFILES); break; @@ -180,7 +179,7 @@ case 'v': printf("fdupes %s\n", VERSION); exit(0); -@@ -1102,6 +1198,16 @@ +@@ -1102,6 +1197,16 @@ exit(1); } @@ -197,7 +196,7 @@ if (ISFLAG(flags, F_RECURSEAFTER)) { firstrecurse = nonoptafter("--recurse:", argc, oldargv, argv, optind); -@@ -1187,12 +1293,23 @@ +@@ -1187,12 +1292,23 @@ else
50_bts284274_hardlinkreplace.dpatch
Description: Binary data
