Hello community, here is the log from the commit of package diffstat for openSUSE:Factory checked in at 2013-03-08 10:49:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffstat (Old) and /work/SRC/openSUSE:Factory/.diffstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffstat", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/diffstat/diffstat.changes 2012-01-06 11:43:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.diffstat.new/diffstat.changes 2013-03-08 10:49:10.000000000 +0100 @@ -1,0 +2,22 @@ +Wed Feb 13 07:36:01 UTC 2013 - [email protected] + +- updated to 1.56: + + add -K option which attempts to improve the annotation of "only" + files by looking for a match in the resulting set of files and + inferring whether the file was added or removed (request by Marc + Haber). + + add check of command-line options for valid numbers. + + improve merging of patches for the same filename (report/testcase by + Paul E McKenney). + + document -d option in manpage. + + document -b, -C, -s option in usage (patch by Tim Waugh, Red Hat + #852770) + + modify configure script as done for byacc in 2012/10/03, making the + 2.52-patches the prerequisite and adding support for --datarootdir + option. + + update config.guess, config.sub + + add logic to handle SVN diffs when the pathnames contain spaces + (patch by Stuart Prescott, Debian #675475). + + fix typo in package/debian/control + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffstat.spec ++++++ --- /var/tmp/diff_new_pack.r68VG4/_old 2013-03-08 10:49:11.000000000 +0100 +++ /var/tmp/diff_new_pack.r68VG4/_new 2013-03-08 10:49:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package diffstat # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: diffstat -Version: 1.55 +Version: 1.56 Release: 0 Url: http://dickey.his.com/diffstat/diffstat.html Summary: Utility That Provides Statistics Based on the Output of diff ++++++ diffstat.tar.gz ++++++ ++++ 6840 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/CHANGES new/diffstat-1.56/CHANGES --- old/diffstat-1.55/CHANGES 2012-01-03 10:38:29.000000000 +0100 +++ new/diffstat-1.56/CHANGES 2013-02-12 01:39:27.000000000 +0100 @@ -1,4 +1,31 @@ --- $Id: CHANGES,v 1.73 2012/01/03 09:38:29 tom Exp $ +-- $Id: CHANGES,v 1.81 2013/02/12 00:39:27 tom Exp $ + +2013/02/11 (diffstat 1.56) + + add -K option which attempts to improve the annotation of "only" + files by looking for a match in the resulting set of files and + inferring whether the file was added or removed (request by Marc + Haber). + + + add check of command-line options for valid numbers. + + + improve merging of patches for the same filename (report/testcase by + Paul E McKenney). + + + document -d option in manpage. + + + document -b, -C, -s option in usage (patch by Tim Waugh, Red Hat + #852770) + + + modify configure script as done for byacc in 2012/10/03, making the + 2.52-patches the prerequisite and adding support for --datarootdir + option. + + + update config.guess, config.sub + + + add logic to handle SVN diffs when the pathnames contain spaces + (patch by Stuart Prescott, Debian #675475). + + + fix typo in package/debian/control 2012/01/03 (diffstat 1.55) + add -R option, like patch's, to reverse the order of the comparison. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/configure.in new/diffstat-1.56/configure.in --- old/diffstat-1.55/configure.in 2010-07-16 11:25:15.000000000 +0200 +++ new/diffstat-1.56/configure.in 2013-02-10 16:35:51.000000000 +0100 @@ -1,18 +1,17 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 1.22 2010/07/16 09:25:15 tom Exp $ -AC_PREREQ(2.13.20020210) -AC_REVISION($Revision: 1.22 $) +dnl $Id: configure.in,v 1.24 2013/02/10 15:35:51 tom Exp $ +AC_PREREQ(2.52.20011201) +AC_REVISION($Revision: 1.24 $) AC_INIT(diffstat.c) AC_CONFIG_HEADER(config.h:config_h.in) -AC_PROG_CC +AC_CANONICAL_HOST +CF_PROG_CC AC_PROG_INSTALL CF_PROG_LINT CF_MAKE_TAGS -CF_ANSI_CC_REQD CF_DISABLE_ECHO -CF_PROG_EXT CF_WITH_INSTALL_PREFIX with_full_paths=no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/diffstat.1 new/diffstat-1.56/diffstat.1 --- old/diffstat-1.55/diffstat.1 2012-01-02 20:20:26.000000000 +0100 +++ new/diffstat-1.56/diffstat.1 2013-02-12 01:14:18.000000000 +0100 @@ -1,5 +1,5 @@ .\"***************************************************************************** -.\" Copyright 1994-2009,2010 by Thomas E. Dickey * +.\" Copyright 1994-2012,2013 by Thomas E. Dickey * .\" All Rights Reserved. * .\" * .\" Permission to use, copy, modify, and distribute this software and its * @@ -18,7 +18,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR * .\" IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * .\"***************************************************************************** -.\" $Id: diffstat.1,v 1.30 2012/01/02 19:20:26 tom Exp $ +.\" $Id: diffstat.1,v 1.32 2013/02/12 00:14:18 tom Exp $ .TH DIFFSTAT 1 .SH NAME \fBdiffstat\fP \- make histogram from diff-output @@ -79,6 +79,10 @@ The remainder, after subtracting modified and deleted lines, is shown as "unchanged lines". .TP +.BI \-d +The debug prints a lot of information. +It is normally compiled-in, but can be suppressed. +.TP .BI \-e " file" redirect standard error to \fIfile\fR. .TP @@ -112,6 +116,14 @@ .B \-k suppress the merging of filenames in the report. .TP +.B \-K +attempt to improve the annotation of "only" files +by looking for a match in the resulting set of files and +inferring whether the file was added or removed. +.IP +This does not currently work in combination with \fB\-R\fP because +\fBdiffstat\fP maintains only the resulting set of files. +.TP .B \-l lists only the filenames. No histogram is generated. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/diffstat.c new/diffstat-1.56/diffstat.c --- old/diffstat-1.55/diffstat.c 2012-01-03 10:44:24.000000000 +0100 +++ new/diffstat-1.56/diffstat.c 2013-02-12 01:03:20.000000000 +0100 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright 1994-2010,2012 by Thomas E. Dickey * + * Copyright 1994-2012,2013 by Thomas E. Dickey * * All Rights Reserved. * * * * Permission to use, copy, modify, and distribute this software and its * @@ -20,7 +20,7 @@ ******************************************************************************/ #ifndef NO_IDENT -static const char *Id = "$Id: diffstat.c,v 1.55 2012/01/03 09:44:24 tom Exp $"; +static const char *Id = "$Id: diffstat.c,v 1.56 2013/02/12 00:03:20 tom Exp $"; #endif /* @@ -28,6 +28,13 @@ * Author: T.E.Dickey * Created: 02 Feb 1992 * Modified: + * 11 Feb 2013, add -K option. Use strtol() to provide error + * checking of optarg values. + * 10 Feb 2013, document -b, -C, -s option in usage (patch by + * Tim Waugh, Red Hat #852770). Improve pathname + * merging. + * 02 Jun 2012, fix for svn diff with spaces in path (patch by + * Stuart Prescott, Debian #675465). * 03 Jan 2012, Correct case for "xz" suffix in is_compressed() * (patch from Frederic Culot in FreeBSD ports). Add * "-R" option. Improve dequoting of filenames in @@ -315,7 +322,7 @@ #define FMT_VERBOSE 4 typedef enum comment { - Normal, Only, Binary + Normal, Only, OnlyLeft, OnlyRight, Binary } Comment; #define MARKS 4 /* each of +, - and ! */ @@ -365,28 +372,29 @@ static DATA *all_data; static const char *comment_opt = ""; static char *path_opt = 0; +static int count_files; /* true if we count added/deleted files */ static int format_opt = FMT_NORMAL; +static int max_name_wide; /* maximum amount reserved for filenames */ static int max_width; /* the specified width-limit */ static int merge_names = 1; /* true if we merge similar filenames */ static int merge_opt = 0; /* true if we merge ins/del as modified */ static int min_name_wide; /* minimum amount reserved for filenames */ -static int max_name_wide; /* maximum amount reserved for filenames */ static int names_only; /* true if we list filenames only */ static int num_marks = 3; /* 3 or 4, according to "-P" option */ -static int reverse_opt; /* true if results are reversed */ -static int show_colors; /* true if showing SGR colors */ -static int show_progress; /* if not writing to tty, show progress */ -static int summary_only = 0; /* true if only summary line is shown */ static int path_dest; /* true if path_opt is destination (patched) */ static int plot_width; /* the amount left over for histogram */ static int prefix_opt = -1; /* if positive, controls stripping of PATHSEP */ +static int quiet = 0; /* -q option */ +static int reverse_opt; /* true if results are reversed */ static int round_opt = 0; /* if nonzero, round data for histogram */ +static int show_colors; /* true if showing SGR colors */ +static int show_progress; /* if not writing to tty, show progress */ +static int sort_names = 1; /* true if we sort filenames */ +static int summary_only = 0; /* true if only summary line is shown */ +static int suppress_binary = 0; /* -b option */ static int table_opt = 0; /* if nonzero, write table rather than plot */ static int trace_opt = 0; /* if nonzero, write debugging information */ -static int sort_names = 1; /* true if we sort filenames */ static int verbose = 0; /* -v option */ -static int quiet = 0; /* -q option */ -static int suppress_binary = 0; /* -b option */ static long plot_scale; /* the effective scale (1:maximum) */ #ifdef HAVE_TSEARCH @@ -398,6 +406,10 @@ /******************************************************************************/ +#ifdef GCC_NORETURN +static void failed(const char *) GCC_NORETURN; +#endif + static void failed(const char *s) { @@ -749,6 +761,27 @@ return target; } +static size_t +compare_tails(const char *target, const char *source, int *diff) +{ + size_t len1 = strlen(target); + size_t len2 = strlen(source); + size_t n; + size_t matched = 0; + + *diff = 0; + for (n = 1; n <= len1 && n <= len2; n++) { + if (target[len1 - n] != source[len2 - n]) { + *diff = (int) n; + break; + } + if (source[len2 - n] == PATHSEP) { + matched = n; + } + } + return matched; +} + /* * The 'data' parameter points to the first of two markers, while * 'path' is the pathname from the second marker. @@ -762,6 +795,7 @@ char *target = reverse_opt ? path : data->name; char *source = reverse_opt ? data->name : path; char *result = source; + int diff; TRACE(("** do_merging(\"%s\",\"%s\") diffs:%d\n", data->name, path, HadDiffs(data))); @@ -780,9 +814,7 @@ && can_be_merged(source)) { size_t len1 = strlen(target); size_t len2 = strlen(source); - size_t n; int matched = 0; - int diff = 0; int local = 0; /* @@ -825,15 +857,8 @@ * are not identical, then 'diff' will be set, but if they have * a common ending then 'matched' will be set. */ - for (n = 1; n <= len1 && n <= len2; n++) { - if (target[len1 - n] != source[len2 - n]) { - diff = (int) n; - break; - } - if (source[len2 - n] == PATHSEP) { - matched = (int) n; - } - } + diff = 0; + matched = (int) compare_tails(target, source, &diff); TRACE(("** merge @%d, prefix_opt=%d matched=%d diff=%d\n", __LINE__, prefix_opt, matched, diff)); @@ -883,6 +908,13 @@ } else { if (can_be_merged(source)) { TRACE(("** merge @%d\n", __LINE__)); + if (merge_names + && *target != '\0' + && prefix_opt < 0) { + size_t matched = compare_tails(target, source, &diff); + if (matched) + result = target + (int) (strlen(target) - matched); + } } else { TRACE(("** do not merge, retain @%d\n", __LINE__)); result = target; @@ -895,6 +927,7 @@ static int begin_data(const DATA * p) { + TRACE(("...begin_data(%s)\n", p->name)); if (!can_be_merged(p->name) && strchr(p->name, PATHSEP) != 0) { TRACE(("** begin_data:HAVE_PATH\n")); @@ -1444,6 +1477,10 @@ &hour, &minute, &second) == 9 && date_delims(yrmon, monday) && !version_num(b_fname)) + || (sscanf(buffer, + "*** %[^\t]\t(%[^)])\t(%[^)])", + b_fname, b_temp1, b_temp2) == 3 + && !version_num(b_fname)) || sscanf(buffer, "*** %[^\t ]%[\t ]%[^ ] %[^ ] %d %d:%d:%d %d", b_fname, @@ -1577,13 +1614,11 @@ finish_chunk(that); finish_chunk(&dummy); - if (buffer != 0) { - free(buffer); - free(b_fname); - free(b_temp1); - free(b_temp2); - free(b_temp3); - } + free(buffer); + free(b_fname); + free(b_temp1); + free(b_temp2); + free(b_temp3); } static void @@ -1820,6 +1855,11 @@ ModOf(p)); if (path_opt) printf("%ld,", EqlOf(p)); + if (count_files && !reverse_opt) + printf("%d,%d,%d,", + (p->cmt == OnlyRight), + (p->cmt == OnlyLeft), + (p->cmt == Binary)); printf("%s\n", name); } } else if (names_only) { @@ -1848,6 +1888,12 @@ case Only: printf("only"); break; + case OnlyLeft: + printf(count_files ? "deleted" : "only"); + break; + case OnlyRight: + printf(count_files ? "added" : "only"); + break; } printf("\n"); } @@ -1871,6 +1917,51 @@ || (p->cmt == Binary && suppress_binary)); } +/* + * Return the length of any directory-prefix from the given path. + */ +static size_t +path_length(const char *path) +{ + size_t result = 0; + char *mark = strrchr(path, PATHSEP); + if (mark != 0 && mark != path) + result = (size_t) (mark + 1 - path); + return result; +} + +/* + * If we have an "only" filename, we can guess whether it was added or removed + * by looking at its directory and comparing that to other files' directories. + * + * TODO: -K -R combination is not yet supported because that relies on storing + * both left-/right-paths for each file; only the right-path is currently used. + */ +static Comment +resolve_only(DATA * p) +{ + Comment result = p->cmt; + if (result == Only && !reverse_opt) { + DATA *q; + size_t len1 = path_length(p->name); + if (len1 != 0) { + for (q = all_data; q; q = q->link) { + result = OnlyLeft; + if (q->cmt == Normal || q->cmt == Binary) { + size_t len2 = path_length(q->name); + if (len2 >= len1) { + if (!strncmp(p->name, q->name, len1)) { + result = OnlyRight; + break; + } + } + } + } + } + } + return result; +} + static void summarize(void) { @@ -1879,6 +1970,9 @@ long total_del = 0; long total_mod = 0; long total_eql = 0; + long files_added = 0; + long files_binary = 0; + long files_removed = 0; long temp; int num_files = 0, shortest_name = -1, longest_name = -1; @@ -1923,6 +2017,35 @@ } /* + * Get additional counts for files where we cannot count lines changed. + */ + if (count_files) { + for (p = all_data; p; p = p->link) { + switch (p->cmt) { + case Binary: + files_binary++; + break; + case Only: + switch (resolve_only(p)) { + case OnlyRight: + p->cmt = OnlyRight; + files_added++; + break; + case OnlyLeft: + p->cmt = OnlyLeft; + files_removed++; + break; + default: + /* ignore - we could not guess */ + break; + } + default: + break; + } + } + } + + /* * Use a separate loop after computing prefix_len so we can apply the "-S" * or "-D" options to find files that we can use as reference for the * unchanged-count. @@ -1931,8 +2054,8 @@ if (!ignore_data(p)) { EqlOf(p) = 0; if (reverse_opt) { - int save_ins = InsOf(p); - int save_del = DelOf(p); + long save_ins = InsOf(p); + long save_del = DelOf(p); InsOf(p) = save_del; DelOf(p) = save_ins; } @@ -1981,6 +2104,8 @@ printf("INSERTED,DELETED,MODIFIED,"); if (path_opt) printf("UNCHANGED,"); + if (count_files && !reverse_opt) + printf("FILE-ADDED,FILE-DELETED,FILE-BINARY,"); } printf("FILENAME\n"); } @@ -2005,6 +2130,14 @@ printf(", %ld modification%s(!)", PLURAL(total_mod)); if (total_eql && path_opt != 0) printf(", %ld unchanged line%s(=)", PLURAL(total_eql)); + if (count_files) { + if (files_added) + printf(", %ld file%s added", PLURAL(files_added)); + if (files_removed) + printf(", %ld file%s removed", PLURAL(files_removed)); + if (files_binary) + printf(", %ld binary file%s", PLURAL(files_binary)); + } (void) putchar('\n'); } } @@ -2190,7 +2323,9 @@ "If no filename is given on the command line, reads from standard input.", "", "Options:", + " -b ignore lines matching \"Binary files XXX and YYY differ\"", " -c prefix each line with comment (#)", + " -C add SGR color escape sequences to highlight the histogram", #if OPT_TRACE " -d debug - prints a lot of information", #endif @@ -2199,6 +2334,7 @@ " -f NUM format (0=concise, 1=normal, 2=filled, 4=values)", " -h print this message", " -k do not merge filenames", + " -K resolve ambiguity of \"only\" filenames", " -l list filenames only", " -m merge insert/delete data in chunks as modified-lines", " -n NUM specify minimum width for the filenames (default: auto)", @@ -2208,6 +2344,7 @@ " -q suppress the \"0 files changed\" message for empty diffs", " -r NUM specify rounding for histogram (0=none, 1=simple, 2=adjusted)", " -R assume patch was created with old and new files swapped", + " -s show only the summary line", " -S PATH specify location of original files, use for unchanged-count", " -t print a table (comma-separated-values) rather than histogram", " -u do not sort the input list", @@ -2240,6 +2377,18 @@ return getopt(argc, argv, opts); } +static int +getopt_value(void) +{ + char *next = 0; + long value = strtol(optarg, &next, 0); + if (next == 0 || *next != '\0') { + fprintf(stderr, "expected a number, have '%s'\n", optarg); + exit(EXIT_FAILURE); + } + return (int) value; +} + int main(int argc, char *argv[]) { @@ -2249,7 +2398,7 @@ max_width = 80; while ((j = getopt_helper(argc, argv, - "bcCdD:e:f:hklmn:N:o:p:qr:RsS:tuvVw:", 'h', 'V')) + "bcCdD:e:f:hkKlmn:N:o:p:qr:RsS:tuvVw:", 'h', 'V')) != -1) { switch (j) { case 'b': @@ -2274,7 +2423,7 @@ failed(optarg); break; case 'f': - format_opt = atoi(optarg); + format_opt = getopt_value(); break; case 'h': usage(stdout); @@ -2282,6 +2431,9 @@ case 'k': merge_names = 0; break; + case 'K': + count_files = 1; + break; case 'l': names_only = 1; break; @@ -2289,20 +2441,20 @@ merge_opt = 1; break; case 'n': - min_name_wide = atoi(optarg); + min_name_wide = getopt_value(); break; case 'N': - max_name_wide = atoi(optarg); + max_name_wide = getopt_value(); break; case 'o': if (freopen(optarg, "w", stdout) == 0) failed(optarg); break; case 'p': - prefix_opt = atoi(optarg); + prefix_opt = getopt_value(); break; case 'r': - round_opt = atoi(optarg); + round_opt = getopt_value(); break; case 'R': reverse_opt = 1; @@ -2330,7 +2482,7 @@ printf("diffstat version %s\n", version); return (EXIT_SUCCESS); case 'w': - max_width = atoi(optarg); + max_width = getopt_value(); break; case 'q': quiet = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/makefile.in new/diffstat-1.56/makefile.in --- old/diffstat-1.55/makefile.in 2010-07-16 00:45:54.000000000 +0200 +++ new/diffstat-1.56/makefile.in 2013-02-10 16:53:33.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.29 2010/07/15 22:45:54 tom Exp $ +# $Id: makefile.in,v 1.30 2013/02/10 15:53:33 tom Exp $ # Makefile-template for 'diffstat' THIS = diffstat @@ -12,6 +12,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ bindir = @bindir@ mandir = @mandir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/package/debian/changelog new/diffstat-1.56/package/debian/changelog --- old/diffstat-1.55/package/debian/changelog 2012-01-03 10:39:53.000000000 +0100 +++ new/diffstat-1.56/package/debian/changelog 2013-02-10 16:56:16.000000000 +0100 @@ -1,3 +1,10 @@ +diffstat (1.56) unstable; urgency=low + + * Configure-script updates + * Debian #675475 + + -- Thomas E. Dickey <[email protected]> Tue, 03 Jan 2012 04:39:50 -0500 + diffstat (1.55) unstable; urgency=low * Add -R option. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/package/debian/control new/diffstat-1.56/package/debian/control --- old/diffstat-1.55/package/debian/control 2010-07-16 01:39:17.000000000 +0200 +++ new/diffstat-1.56/package/debian/control 2012-01-09 02:38:51.000000000 +0100 @@ -9,7 +9,7 @@ Package: diffstat Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: generate C function prototypes and convert function definitions +Description: produces graph of changes introduced by a diff between files. Diffstat is is useful for reviewing large, complex patch files. It reads from one or more input files which contain output from diff, producing a histogram of the total lines changed for each file referenced. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/package/diffstat.spec new/diffstat-1.56/package/diffstat.spec --- old/diffstat-1.55/package/diffstat.spec 2012-01-03 10:39:12.000000000 +0100 +++ new/diffstat-1.56/package/diffstat.spec 2013-02-12 01:52:16.000000000 +0100 @@ -1,7 +1,7 @@ Summary: diffstat - make histogram from diff-output %define AppProgram diffstat -%define AppVersion 1.55 -# $XTermId: diffstat.spec,v 1.3 2010/10/10 18:09:56 tom Exp $ +%define AppVersion 1.56 +# $XTermId: diffstat.spec,v 1.5 2013/02/12 00:52:16 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 @@ -18,6 +18,8 @@ %prep +%define debug_package %{nil} + %setup -q -n %{AppProgram}-%{AppVersion} %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34.pat new/diffstat-1.56/testing/case34.pat --- old/diffstat-1.55/testing/case34.pat 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34.pat 2012-06-02 02:49:12.000000000 +0200 @@ -0,0 +1,14 @@ +Index: ergh eek arf/quux bar baz +=================================================================== +--- ergh eek arf/quux bar baz (.../branch1) (revision 4) ++++ ergh eek arf/quux bar baz (.../branch2) (revision 4) +@@ -1 +1 @@ +-foo goo ++foo bar +Index: ergh eek arf/quux bar baz2 +=================================================================== +--- ergh eek arf/quux bar baz2 (.../branch1) (revision 4) ++++ ergh eek arf/quux bar baz2 (.../branch2) (revision 4) +@@ -1 +1 @@ +-foo goo ++foo bar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34.ref new/diffstat-1.56/testing/case34.ref --- old/diffstat-1.55/testing/case34.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34R.ref new/diffstat-1.56/testing/case34R.ref --- old/diffstat-1.55/testing/case34R.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34R.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34Rp0.ref new/diffstat-1.56/testing/case34Rp0.ref --- old/diffstat-1.55/testing/case34Rp0.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34Rp0.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + ergh eek arf/quux bar baz | 2 +- + ergh eek arf/quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34b.ref new/diffstat-1.56/testing/case34b.ref --- old/diffstat-1.55/testing/case34b.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34b.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34f0.ref new/diffstat-1.56/testing/case34f0.ref --- old/diffstat-1.55/testing/case34f0.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34f0.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 1 + 1 - 0 ! + quux bar baz2 | 2 1 + 1 - 0 ! + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34k.ref new/diffstat-1.56/testing/case34k.ref --- old/diffstat-1.55/testing/case34k.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34k.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34p1.ref new/diffstat-1.56/testing/case34p1.ref --- old/diffstat-1.55/testing/case34p1.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34p1.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34p9.ref new/diffstat-1.56/testing/case34p9.ref --- old/diffstat-1.55/testing/case34p9.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34p9.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34r1.ref new/diffstat-1.56/testing/case34r1.ref --- old/diffstat-1.55/testing/case34r1.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34r1.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34r2.ref new/diffstat-1.56/testing/case34r2.ref --- old/diffstat-1.55/testing/case34r2.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34r2.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/diffstat-1.55/testing/case34u.ref new/diffstat-1.56/testing/case34u.ref --- old/diffstat-1.55/testing/case34u.ref 1970-01-01 01:00:00.000000000 +0100 +++ new/diffstat-1.56/testing/case34u.ref 2012-06-02 19:06:04.000000000 +0200 @@ -0,0 +1,3 @@ + quux bar baz | 2 +- + quux bar baz2 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
