diff options
author | Jim Meyering <meyering@fb.com> | 2018-01-06 16:49:13 -0800 |
---|---|---|
committer | Jim Meyering <meyering@fb.com> | 2018-01-06 16:51:19 -0800 |
commit | 4a38f715f1fe171f6792f3044bd15d6a263b8c1c (patch) | |
tree | 90886977791930f5ee2dec6b3b0e6cfe73a8fcb5 | |
parent | 81eea1db38a934e38b9307059a57c1c76fbf6163 (diff) | |
download | diffutils-4a38f715f1fe171f6792f3044bd15d6a263b8c1c.tar.gz |
maint: update gnulib and copyright dates for 2018
* gnulib: Update to latest.
* all files: Run "make update-copyright".
* bootstrap: Update from gnulib.
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | ChangeLog-2008 | 2 | ||||
-rw-r--r-- | HACKING | 2 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | README-hacking | 2 | ||||
-rwxr-xr-x | bootstrap | 12 | ||||
-rw-r--r-- | bootstrap.conf | 2 | ||||
-rw-r--r-- | cfg.mk | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 2 | ||||
-rw-r--r-- | doc/diffutils.texi | 2 | ||||
-rwxr-xr-x | exgettext | 2 | ||||
m--------- | gnulib | 0 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/cmpbuf.c | 2 | ||||
-rw-r--r-- | lib/cmpbuf.h | 2 | ||||
-rw-r--r-- | lib/prepargs.c | 2 | ||||
-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 | 2 | ||||
-rw-r--r-- | src/context.c | 2 | ||||
-rw-r--r-- | src/die.h | 2 | ||||
-rw-r--r-- | src/diff.c | 2 | ||||
-rw-r--r-- | src/diff.h | 2 | ||||
-rw-r--r-- | src/diff3.c | 2 | ||||
-rw-r--r-- | src/dir.c | 2 | ||||
-rw-r--r-- | src/ed.c | 2 | ||||
-rw-r--r-- | src/ifdef.c | 2 | ||||
-rw-r--r-- | src/io.c | 2 | ||||
-rw-r--r-- | src/normal.c | 2 | ||||
-rw-r--r-- | src/sdiff.c | 2 | ||||
-rw-r--r-- | src/side.c | 2 | ||||
-rw-r--r-- | src/system.h | 2 | ||||
-rw-r--r-- | src/util.c | 2 | ||||
-rwxr-xr-x | tests/cmp | 2 | ||||
-rw-r--r-- | tests/envvar-check | 2 | ||||
-rwxr-xr-x | tests/help-version | 2 | ||||
-rw-r--r-- | tests/init.sh | 2 |
44 files changed, 48 insertions, 48 deletions
@@ -33,7 +33,7 @@ Patrick D'Cruze Eli Zaretskii -Copyright (C) 2001, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. +Copyright (C) 2001, 2006, 2009-2013, 2015-2018 Free Software Foundation, Inc. This file is part of GNU diffutils. diff --git a/ChangeLog-2008 b/ChangeLog-2008 index 714c354..c62c7dc 100644 --- a/ChangeLog-2008 +++ b/ChangeLog-2008 @@ -4265,7 +4265,7 @@ 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, 2015-2017 + Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013, 2015-2018 Free Software Foundation, Inc. Copying and distribution of this file, with or without @@ -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, 2015-2017 Free Software Foundation, Inc. +Copyright (C) 2009-2013, 2015-2018 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 eacce96..5041753 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Main Automakefile for GNU diffutils. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2018 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify @@ -407,7 +407,7 @@ User-visible changes in version 2.0: -Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free +Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2018 Free Software Foundation, Inc. This file is part of GNU Diffutils. @@ -51,7 +51,7 @@ Please report bugs to <bug-diffutils@gnu.org>. ----- -Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015-2017 Free Software +Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015-2018 Free Software Foundation, Inc. This file is part of GNU Diffutils. diff --git a/README-hacking b/README-hacking index 4628c8e..f1a4228 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, 2015-2017 Free Software Foundation, Inc. +Copyright (C) 2002-2007, 2009-2013, 2015-2018 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,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2017-01-09.19; # UTC +scriptversion=2018-01-07.00; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 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 @@ -17,7 +17,7 @@ scriptversion=2017-01-09.19; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Originally written by Paul Eggert. The canonical version of this # script is maintained as build-aux/bootstrap in gnulib, however, to @@ -141,7 +141,7 @@ po_download_command_format=\ # Fallback for downloading .po files (if rsync fails). po_download_command_format2=\ "wget --mirror -nd -q -np -A.po -P '%s' \ - http://translationproject.org/latest/%s/" + https://translationproject.org/latest/%s/" # Prefer a non-empty tarname (4th argument of AC_INIT if given), else # fall back to the package name (1st argument with munging) @@ -699,7 +699,7 @@ download_po_files() { echo "$me: getting translations into $subdir for $domain..." cmd=$(printf "$po_download_command_format" "$domain" "$subdir") eval "$cmd" && return - # Fallback to HTTP. + # Fallback to HTTPS. cmd=$(printf "$po_download_command_format2" "$subdir" "$domain") eval "$cmd" } @@ -792,7 +792,7 @@ symlink_to_dir() # aren't confused into doing unnecessary builds. Conversely, if the # existing symlink's timestamp is older than the source, make it afresh, # so that broken tools aren't confused into skipping needed builds. See - # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>. + # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>. test -h "$dst" && src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && diff --git a/bootstrap.conf b/bootstrap.conf index b83f39a..219bf54 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2013, 2015-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2013, 2015-2018 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, 2015-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2013, 2015-2018 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 6e130f4..681ba6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure template for GNU Diffutils. -# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2017 +# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2018 # Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify diff --git a/doc/Makefile.am b/doc/Makefile.am index 2fbfc69..4f2b9f9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Makefile for GNU diffutils documentation. -# Copyright (C) 2001-2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015-2018 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 8479b3f..eb98d74 100644 --- a/doc/diffutils.texi +++ b/doc/diffutils.texi @@ -14,7 +14,7 @@ and documents the GNU @command{diff}, @command{diff3}, differences between files and the GNU @command{patch} command for using their output to update files. -Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2017 Free +Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2018 Free Software Foundation, Inc. @quotation @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper around gettext for programs using the msgid convention. -# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015-2017 Free Software +# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015-2018 Free Software # Foundation, Inc. # Written by Paul Eggert <eggert@twinsun.com>. diff --git a/gnulib b/gnulib -Subproject 19882ec15628386c45977ade98293e26791b7a1 +Subproject 16fc1cdc25991b996e454254ca1365f966d00a5 diff --git a/lib/Makefile.am b/lib/Makefile.am index ce32659..c2407cc 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU Diffutils library. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2018 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c index 8e185bd..70f5f75 100644 --- a/lib/cmpbuf.c +++ b/lib/cmpbuf.c @@ -1,6 +1,6 @@ /* Buffer primitives for comparison operations. - Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015-2017 Free + Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/cmpbuf.h b/lib/cmpbuf.h index cf63a3b..90cc14c 100644 --- a/lib/cmpbuf.h +++ b/lib/cmpbuf.h @@ -1,6 +1,6 @@ /* Buffer primitives for comparison operations. - Copyright (C) 2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2013, 2015-2018 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 c4928cd..e34607f 100644 --- a/lib/prepargs.c +++ b/lib/prepargs.c @@ -1,6 +1,6 @@ /* Parse arguments from a string and prepend them to an argv. - Copyright (C) 1999-2002, 2006, 2009-2013, 2015-2017 Free Software + Copyright (C) 1999-2002, 2006, 2009-2013, 2015-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/man/Makefile.am b/man/Makefile.am index 98bfb4b..8ac311f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU diffutils man pages -# Copyright (C) 2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. +# Copyright (C) 2002, 2009-2013, 2015-2018 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 54e5a31..304985c 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, 2015-2017 Free Software Foundation, +# Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2018 Free Software Foundation, # Inc. # This program is free software; you can redistribute it and/or modify diff --git a/po/POTFILES.in b/po/POTFILES.in index 08690f8..2f02513 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, 2015-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015-2018 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, 2015-2017 Free Software Foundation, +# Copyright 1998, 2001-2003, 2009-2013, 2015-2018 Free Software Foundation, # Inc. # Paul Eggert <eggert@twinsun.com>, 1998 # diff --git a/src/Makefile.am b/src/Makefile.am index 50acad9..35ddefe 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, 2015-2017 Free Software Foundation, +# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2018 Free Software Foundation, # Inc. # This program is free software: you can redistribute it and/or modify diff --git a/src/analyze.c b/src/analyze.c index 403ae73..3c5b002 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, 2015-2017 Free Software Foundation, Inc. + 2009-2013, 2015-2018 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 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 e96007d..4dd882d 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,5 +1,5 @@ /* Report an error and exit. - Copyright 2016-2017 Free Software Foundation, Inc. + Copyright 2016-2018 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 @@ /* diff - compare files line by line Copyright (C) 1988-1989, 1992-1994, 1996, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013, 2015-2017 Free Software Foundation, Inc. + 2009-2013, 2015-2018 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/diff3.c b/src/diff3.c index 5f3c7cb..0d31cf4 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 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, 2015-2017 Free Software Foundation, Inc. + 2009-2013, 2015-2018 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/ifdef.c b/src/ifdef.c index c7dae8d..0ecc2c0 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, 2015-2017 + Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013, 2015-2018 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/normal.c b/src/normal.c index 0f809da..c6aac07 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, 2015-2017 + Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/sdiff.c b/src/sdiff.c index 1ae3dcb..1b23a0c 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,6 +1,6 @@ /* sdiff-format output routines for GNU DIFF. - Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015-2017 Free + Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/system.h b/src/system.h index a8936ba..0c351b9 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 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, - 2015-2017 Free Software Foundation, Inc. + 2015-2018 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ #!/bin/sh # Test 'cmp'. -# Copyright 2017 Free Software Foundation, Inc. +# Copyright 2017-2018 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/envvar-check b/tests/envvar-check index e602485..a64f769 100644 --- a/tests/envvar-check +++ b/tests/envvar-check @@ -1,7 +1,7 @@ # -*- sh -*- # Check environment variables for sane values while testing. -# Copyright (C) 2000-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 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/help-version b/tests/help-version index c3a91b3..295ab05 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, 2015-2017 Free Software Foundation, Inc. +# Copyright (C) 2000-2013, 2015-2018 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 584194f..705a698 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 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 |