Hello community, here is the log from the commit of package diffstat for openSUSE:Factory checked in at 2014-06-18 07:50:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffstat (Old) and /work/SRC/openSUSE:Factory/.diffstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffstat" Changes: -------- --- /work/SRC/openSUSE:Factory/diffstat/diffstat.changes 2013-10-30 15:25:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.diffstat.new/diffstat.changes 2014-06-18 07:52:46.000000000 +0200 @@ -1,0 +2,18 @@ +Mon Jun 9 07:54:14 UTC 2014 - pgaj...@suse.com + +- updated to 1.59: + + add -E option to filter escape-sequences, e.g., from colordiff + (Ubuntu #1304262). + + merge/adapt improvments to makefile and configure script from + openembedded.org (forwarded by Ross Burton). + + remove unused $(libdir) from makefile "installdirs" target + + amend definition in CF_POPEN_TEST to permit use of autoheader. + + workaround for gratuitous renaming of AC_ACVERSION in 2.69 + + added "docs" rule to makefile + + improvements to configure macros: + + added check for -Wlogical-op to gcc warnings + + suppress check for defining _XOPEN_SOURCE on Solaris + + trim an unwanted -no-gcc option for Intel compiler + + update config.guess, config.sub + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffstat.spec ++++++ --- /var/tmp/diff_new_pack.SIPkq8/_old 2014-06-18 07:52:47.000000000 +0200 +++ /var/tmp/diff_new_pack.SIPkq8/_new 2014-06-18 07:52:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package diffstat # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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.58 +Version: 1.59 Release: 0 Url: http://dickey.his.com/diffstat/diffstat.html Summary: Utility That Provides Statistics Based on the Output of diff ++++++ diffstat.tar.gz ++++++ ++++ 2554 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.58/CHANGES new/diffstat-1.59/CHANGES --- old/diffstat-1.58/CHANGES 2013-10-29 00:48:13.000000000 +0100 +++ new/diffstat-1.59/CHANGES 2014-06-05 23:09:32.000000000 +0200 @@ -1,11 +1,33 @@ --- $Id: CHANGES,v 1.86 2013/10/28 23:48:13 tom Exp $ +-- $Id: CHANGES,v 1.90 2014/06/05 21:09:32 tom Exp $ + +2014/06/05 (diffstat 1.59) + + add -E option to filter escape-sequences, e.g., from colordiff + (Ubuntu #1304262). + + + merge/adapt improvments to makefile and configure script from + openembedded.org (forwarded by Ross Burton). + + remove unused $(libdir) from makefile "installdirs" target + + amend definition in CF_POPEN_TEST to permit use of autoheader. + + workaround for gratuitous renaming of AC_ACVERSION in 2.69 + + + added "docs" rule to makefile + + + improvements to configure macros: + + added check for -Wlogical-op to gcc warnings + + suppress check for defining _XOPEN_SOURCE on Solaris + + trim an unwanted -no-gcc option for Intel compiler + + + update config.guess, config.sub 2013/10/28 (diffstat 1.58) + add COPYING file (request by Dagobert Michelsen). + + improved portability for cross-compiling, by supplying missing getopt function as well as improving checks for popen/pclose prototypes. + + updated configure macros, e.g., for MingW and MSYS fixes. + + update config.guess, config.sub 2013/04/15 (diffstat 1.57) 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.58/COPYING new/diffstat-1.59/COPYING --- old/diffstat-1.58/COPYING 2013-10-29 00:45:51.000000000 +0100 +++ new/diffstat-1.59/COPYING 2014-01-11 13:57:08.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright 1994-2012,2013 by Thomas E. Dickey +Copyright 1994-2013,2014 by Thomas E. Dickey All Rights Reserved. Permission to use, copy, modify, and distribute this software and its 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.58/COPYING.asc new/diffstat-1.59/COPYING.asc --- old/diffstat-1.58/COPYING.asc 2013-10-29 00:48:41.000000000 +0100 +++ new/diffstat-1.59/COPYING.asc 2014-01-11 13:57:26.000000000 +0100 @@ -2,7 +2,7 @@ Version: GnuPG v1.4.10 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlJu99MACgkQcCNT4Pfkjts35wCfcOB1pZVbBZRPIdiZ/gUBjaSC -YoUAnRYyeDWyUlRXBgms56fEEchZT/P5 -=DxT+ +iEYEABECAAYFAlLRP7IACgkQcCNT4PfkjtvdygCfQgDoICYF7VocKEb+FJ++Glou +R3gAoLmOq0LmlGyKr1y2oSKnyWErNqgP +=tcQA -----END PGP SIGNATURE----- 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.58/configure.in new/diffstat-1.59/configure.in --- old/diffstat-1.58/configure.in 2013-10-29 00:14:45.000000000 +0100 +++ new/diffstat-1.59/configure.in 2014-01-11 13:57:53.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 1.26 2013/10/28 23:14:45 tom Exp $ +dnl $Id: configure.in,v 1.27 2014/01/11 12:57:53 tom Exp $ AC_PREREQ(2.52.20011201) -AC_REVISION($Revision: 1.26 $) +AC_REVISION($Revision: 1.27 $) AC_INIT(diffstat.c) AC_CONFIG_HEADER(config.h:config_h.in) @@ -52,3 +52,4 @@ ### output makefile and config.h AC_OUTPUT(makefile,,,cat) +CF_MAKE_DOCS(diffstat,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.58/diffstat.1 new/diffstat-1.59/diffstat.1 --- old/diffstat-1.58/diffstat.1 2013-02-12 01:14:18.000000000 +0100 +++ new/diffstat-1.59/diffstat.1 2014-06-05 23:11:15.000000000 +0200 @@ -1,5 +1,5 @@ .\"***************************************************************************** -.\" Copyright 1994-2012,2013 by Thomas E. Dickey * +.\" Copyright 1994-2013,2014 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.32 2013/02/12 00:14:18 tom Exp $ +.\" $Id: diffstat.1,v 1.33 2014/06/05 21:11:15 tom Exp $ .TH DIFFSTAT 1 .SH NAME \fBdiffstat\fP \- make histogram from diff-output @@ -86,6 +86,10 @@ .BI \-e " file" redirect standard error to \fIfile\fR. .TP +.BI \-E +strip out ANSI escape sequences on each line before parsing the differences. +This allows \fBdiffstat\fP to be used with \fBcolordiff\fP. +.TP .BI \-f " format" specify the format of the histogram. .RS 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.58/diffstat.c new/diffstat-1.59/diffstat.c --- old/diffstat-1.58/diffstat.c 2013-10-29 00:02:45.000000000 +0100 +++ new/diffstat-1.59/diffstat.c 2014-06-05 23:07:34.000000000 +0200 @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright 1994-2012,2013 by Thomas E. Dickey * + * Copyright 1994-2013,2014 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.58 2013/10/28 23:02:45 tom Exp $"; +static const char *Id = "$Id: diffstat.c,v 1.59 2014/06/05 21:07:34 tom Exp $"; #endif /* @@ -28,6 +28,7 @@ * Author: T.E.Dickey * Created: 02 Feb 1992 * Modified: + * 05 Jun 2014, add -E option to filter colordiff output. * 28 Oct 2013, portability improvements for MinGW. * 15 Apr 2013, modify to accommodate output of "diff -q", which * tells only if the files are different. Work @@ -402,6 +403,7 @@ 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 trim_escapes = 0; /* -E 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 verbose = 0; /* -v option */ @@ -1232,6 +1234,30 @@ else break; } + + /* + * Trim escapes from colordiff. + */ +#define isFINAL(c) (UC(*s) >= '\140' && UC(*s) <= '\176') + if (trim_escapes && (strchr(buffer, '\033') != 0)) { + char *d = buffer; + s = d; + while (*s != '\0') { + if (*s == '\033') { + while (*s != '\0' && !isFINAL(*s)) { + ++s; + } + if (*s != '\0') { + ++s; + continue; + } else { + break; + } + } + *d++ = *s++; + } + *d = '\0'; + } ++line_no; TRACE(("[%05d] %s\n", line_no, buffer)); @@ -2400,6 +2426,7 @@ #endif " -D PATH specify location of patched files, use for unchanged-count", " -e FILE redirect standard error to FILE", + " -E trim escape-sequences, e.g., from colordiff", " -f NUM format (0=concise, 1=normal, 2=filled, 4=values)", " -h print this message", " -k do not merge filenames", @@ -2467,7 +2494,7 @@ max_width = 80; while ((j = getopt_helper(argc, argv, - "bcCdD:e:f:hkKlmn:N:o:p:qr:RsS:tuvVw:", 'h', 'V')) + "bcCdD:e:Ef:hkKlmn:N:o:p:qr:RsS:tuvVw:", 'h', 'V')) != -1) { switch (j) { case 'b': @@ -2491,6 +2518,9 @@ if (freopen(optarg, "w", stderr) == 0) failed(optarg); break; + case 'E': + trim_escapes = 1; + break; case 'f': format_opt = getopt_value(); break; 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.58/makefile.in new/diffstat-1.59/makefile.in --- old/diffstat-1.58/makefile.in 2013-10-29 00:07:47.000000000 +0100 +++ new/diffstat-1.59/makefile.in 2014-06-05 00:29:29.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 1.31 2013/10/28 23:07:47 tom Exp $ +# $Id: makefile.in,v 1.33 2014/06/04 22:29:29 openembedded.org Exp $ # Makefile-template for 'diffstat' THIS = diffstat @@ -82,22 +82,22 @@ $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext) installdirs : - mkdir -p $(BINDIR) $(libdir) $(man1dir) + mkdir -p $(BINDIR) $(man1dir) uninstall : rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext) -mostlyclean : +mostlyclean :: rm -f *.o core *~ *.out *.err *.BAK *.atac -clean : mostlyclean +clean :: mostlyclean rm -f $(PROG) -distclean : clean +distclean :: clean rm -f makefile config.log config.cache config.status config.h rm -f tags TAGS # don't remove configure! -realclean : distclean +realclean :: distclean check : $(PROG) $(SHELL) -c 'PATH=`pwd`:$${PATH}; export PATH; \ 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.58/package/debian/changelog new/diffstat-1.59/package/debian/changelog --- old/diffstat-1.58/package/debian/changelog 2013-10-28 22:40:54.000000000 +0100 +++ new/diffstat-1.59/package/debian/changelog 2014-06-05 23:12:15.000000000 +0200 @@ -1,3 +1,9 @@ +diffstat (1.59) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dic...@invisible-island.net> Thu, 05 Jun 2014 17:12:15 -0400 + diffstat (1.58) unstable; urgency=low * maintenance updates 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.58/package/debian/copyright new/diffstat-1.59/package/debian/copyright --- old/diffstat-1.58/package/debian/copyright 2013-10-28 22:42:22.000000000 +0100 +++ new/diffstat-1.59/package/debian/copyright 2014-06-05 23:13:05.000000000 +0200 @@ -1,7 +1,7 @@ Upstream source http://invisible-island.net/diffstat/diffstat.html /****************************************************************************** - * Copyright 1994-2012,2013 by Thomas E. Dickey * + * Copyright 1994-2013,2014 by Thomas E. Dickey * * All Rights Reserved. * * * * Permission to use, copy, modify, and distribute this software and its * @@ -25,7 +25,7 @@ Files: aclocal.m4 Licence: other-BSD -Copyright: 2003-2012,2013 by Thomas E. Dickey +Copyright: 2003-2013,2014 by Thomas E. Dickey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -86,7 +86,7 @@ shared with many OS's install programs. Files: debian/* -Copyright: 2010-2012,2013 Thomas E. Dickey +Copyright: 2010-2013,2014 Thomas E. Dickey Licence: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, 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.58/package/diffstat.spec new/diffstat-1.59/package/diffstat.spec --- old/diffstat-1.58/package/diffstat.spec 2013-10-28 22:40:08.000000000 +0100 +++ new/diffstat-1.59/package/diffstat.spec 2014-06-05 23:12:15.000000000 +0200 @@ -1,7 +1,7 @@ Summary: diffstat - make histogram from diff-output %define AppProgram diffstat -%define AppVersion 1.58 -# $XTermId: diffstat.spec,v 1.7 2013/10/28 21:40:08 tom Exp $ +%define AppVersion 1.59 +# $XTermId: diffstat.spec,v 1.8 2014/06/05 21:12:15 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
