diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | ChangeLog-2008 | 4 | ||||
| -rw-r--r-- | HACKING | 2 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | README-hacking | 2 | ||||
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | bootstrap.conf | 2 | ||||
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/diffutils.texi | 2 | ||||
| -rwxr-xr-x | exgettext | 3 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/cmpbuf.c | 4 | ||||
| -rw-r--r-- | lib/cmpbuf.h | 2 | ||||
| -rw-r--r-- | lib/prepargs.c | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 2 | ||||
| -rwxr-xr-x | man/help2man | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | po/en.po | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/analyze.c | 2 | ||||
| -rw-r--r-- | src/cmp.c | 4 | ||||
| -rw-r--r-- | src/context.c | 4 | ||||
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/diff.h | 4 | ||||
| -rw-r--r-- | src/diff3.c | 4 | ||||
| -rw-r--r-- | src/dir.c | 2 | ||||
| -rw-r--r-- | src/ed.c | 4 | ||||
| -rw-r--r-- | src/ifdef.c | 2 | ||||
| -rw-r--r-- | src/io.c | 4 | ||||
| -rw-r--r-- | src/normal.c | 2 | ||||
| -rw-r--r-- | src/sdiff.c | 4 | ||||
| -rw-r--r-- | src/side.c | 4 | ||||
| -rw-r--r-- | src/system.h | 4 | ||||
| -rw-r--r-- | src/util.c | 4 | ||||
| -rwxr-xr-x | tests/help-version | 2 | ||||
| -rw-r--r-- | tests/init.sh | 2 |
41 files changed, 59 insertions, 55 deletions
@@ -33,7 +33,7 @@ Patrick D'Cruze Eli Zaretskii -Copyright (C) 2001, 2006, 2009-2013 Free Software Foundation, Inc. +Copyright (C) 2001, 2006, 2009-2013, 2015 Free Software Foundation, Inc. This file is part of GNU diffutils. diff --git a/ChangeLog-2008 b/ChangeLog-2008 index 5238b63..9945407 100644 --- a/ChangeLog-2008 +++ b/ChangeLog-2008 @@ -4265,8 +4265,8 @@ Thu Nov 3 16:30:24 1988 Randall Smith (randy at gluteus.ai.mit.edu) ----- - Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013 Free Software - Foundation, Inc. + Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013, 2015 Free + Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this @@ -581,7 +581,7 @@ Then just open the index.html file (in the generated lcov-html directory) in your favorite web browser. ======================================================================== -Copyright (C) 2009-2013 Free Software Foundation, Inc. +Copyright (C) 2009-2013, 2015 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/Makefile.am b/Makefile.am index cf0ce1d..7a1f431 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ # Main Automakefile for GNU diffutils. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015 Free Software +# Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -353,8 +353,8 @@ User-visible changes in version 2.0: -Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013 Free Software -Foundation, Inc. +Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015 Free +Software Foundation, Inc. This file is part of GNU Diffutils. @@ -51,8 +51,8 @@ Please report bugs to <bug-diffutils@gnu.org>. ----- -Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013 Free Software Foundation, -Inc. +Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015 Free Software +Foundation, Inc. This file is part of GNU Diffutils. diff --git a/README-hacking b/README-hacking index 530ef09..24f2a3f 100644 --- a/README-hacking +++ b/README-hacking @@ -94,7 +94,7 @@ each program. One way to do this is to use vc-dwim ----- -Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc. +Copyright (C) 2002-2007, 2009-2013, 2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4,7 +4,7 @@ scriptversion=2013-12-05.23; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bootstrap.conf b/bootstrap.conf index ac85adf..9b2de22 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/configure.ac b/configure.ac index f7efcb1..667ad61 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Configure template for GNU Diffutils. -# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013 Free Software -# Foundation, Inc. +# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015 Free +# Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/Makefile.am b/doc/Makefile.am index 286f7a4..641fc96 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Makefile for GNU diffutils documentation. -# Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/diffutils.texi b/doc/diffutils.texi index 5e84ff7..3e25807 100644 --- a/doc/diffutils.texi +++ b/doc/diffutils.texi @@ -14,7 +14,7 @@ and documents the @acronym{GNU} @command{diff}, @command{diff3}, differences between files and the @acronym{GNU} @command{patch} command for using their output to update files. -Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2014 Free +Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc. @quotation @@ -1,7 +1,8 @@ #! /bin/sh # Wrapper around gettext for programs using the msgid convention. -# Copyright (C) 1998, 2001, 2004, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015 Free Software Foundation, +# Inc. # Written by Paul Eggert <eggert@twinsun.com>. diff --git a/gnulib b/gnulib -Subproject cc0009850129a39e514e00df66a7b5cc3609fb8 +Subproject aecd38787af5ca0000e184912194e8c83123eb7 diff --git a/lib/Makefile.am b/lib/Makefile.am index 2e98878..b8c6eb6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,7 @@ # Automakefile for GNU Diffutils library. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015 Free Software +# Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c index a47cb70..498b43a 100644 --- a/lib/cmpbuf.c +++ b/lib/cmpbuf.c @@ -1,7 +1,7 @@ /* Buffer primitives for comparison operations. - Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013 Free Software - Foundation, Inc. + Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015 Free + Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/cmpbuf.h b/lib/cmpbuf.h index 732d7ab..ecd2e21 100644 --- a/lib/cmpbuf.h +++ b/lib/cmpbuf.h @@ -1,6 +1,6 @@ /* Buffer primitives for comparison operations. - Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2013, 2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/prepargs.c b/lib/prepargs.c index ec19a08..285ad2b 100644 --- a/lib/prepargs.c +++ b/lib/prepargs.c @@ -1,6 +1,7 @@ /* Parse arguments from a string and prepend them to an argv. - Copyright (C) 1999-2002, 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006, 2009-2013, 2015 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/man/Makefile.am b/man/Makefile.am index 36eb35f..fd136d2 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU diffutils man pages -# Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2002, 2009-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/man/help2man b/man/help2man index 834b5ee..7c92fb5 100755 --- a/man/help2man +++ b/man/help2man @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Generate a short man page from --help and --version output. -# Copyright (C) 1997-2005, 2009-2011, 2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2005, 2009-2011, 2013, 2015 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/po/POTFILES.in b/po/POTFILES.in index b6764e6..74fb756 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of files that contain translatable strings. -# Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ # English messages for GNU diffutils -# Copyright 1998, 2001-2003, 2009-2013 Free Software Foundation, Inc. +# Copyright 1998, 2001-2003, 2009-2013, 2015 Free Software Foundation, Inc. # Paul Eggert <eggert@twinsun.com>, 1998 # msgid "" diff --git a/src/Makefile.am b/src/Makefile.am index 99fbfcc..ca2d25c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU diffutils programs. -# Copyright (C) 2001-2002, 2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2006, 2009-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/analyze.c b/src/analyze.c index f062fd3..893d07c 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -1,7 +1,7 @@ /* Analyze file differences for GNU DIFF. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013 Free Software Foundation, Inc. + 2009-2013, 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* cmp - compare two files byte by byte - Copyright (C) 1990-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013 Free - Software Foundation, Inc. + Copyright (C) 1990-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013, 2015 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/context.c b/src/context.c index 32053d1..e0f21c4 100644 --- a/src/context.c +++ b/src/context.c @@ -1,7 +1,7 @@ /* Context-format output routines for GNU DIFF. - Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2006, 2009-2013 - Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, + 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* diff - compare files line by line Copyright (C) 1988-1989, 1992-1994, 1996, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013 Free Software Foundation, Inc. + 2009-2013, 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* Shared definitions for GNU DIFF - Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2009-2013 Free - Software Foundation, Inc. + Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2009-2013, 2015 + Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/diff3.c b/src/diff3.c index e25ef5d..26a95ea 100644 --- a/src/diff3.c +++ b/src/diff3.c @@ -1,7 +1,7 @@ /* diff3 - compare three files line by line - Copyright (C) 1988-1989, 1992-1996, 1998, 2001-2002, 2004, 2006, 2009-2013 - Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1992-1996, 1998, 2001-2002, 2004, 2006, 2009-2013, + 2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,7 +1,7 @@ /* Read, sort and compare two directories. Used for GNU DIFF. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013 Free Software Foundation, Inc. + 2009-2013, 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* Output routines for ed-script format. - Copyright (C) 1988-1989, 1991-1993, 1995, 1998, 2001, 2004, 2006, 2009-2013 - Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1991-1993, 1995, 1998, 2001, 2004, 2006, 2009-2013, + 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/ifdef.c b/src/ifdef.c index 34a5175..c41f0aa 100644 --- a/src/ifdef.c +++ b/src/ifdef.c @@ -1,6 +1,6 @@ /* #ifdef-format output routines for GNU DIFF. - Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013 Free + Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013, 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* File I/O for GNU DIFF. - Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013 - Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, + 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/normal.c b/src/normal.c index ea9de57..721fd1a 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1,6 +1,6 @@ /* Normal-format output routines for GNU DIFF. - Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013 Free + Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/sdiff.c b/src/sdiff.c index 329fa52..1c66beb 100644 --- a/src/sdiff.c +++ b/src/sdiff.c @@ -1,7 +1,7 @@ /* sdiff - side-by-side merge of file differences - Copyright (C) 1992-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013 Free - Software Foundation, Inc. + Copyright (C) 1992-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013, 2015 + Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* sdiff-format output routines for GNU DIFF. - Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013 Free Software - Foundation, Inc. + Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015 Free + Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/system.h b/src/system.h index 1f81a72..19a1f3a 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /* System dependent declarations. - Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013 - Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, + 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* Support routines for GNU DIFF. - Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013 - Free Software Foundation, Inc. + Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, + 2015 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/tests/help-version b/tests/help-version index 36ea213..5f01f76 100755 --- a/tests/help-version +++ b/tests/help-version @@ -2,7 +2,7 @@ # Make sure all these programs work properly # when invoked with --help or --version. -# Copyright (C) 2000-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/init.sh b/tests/init.sh index bd2048e..671f802 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2013, 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |