Re: [PATCH] maint: update all copyright year number ranges

[Bernhard Voelker]

On 01/01/2015 06:13 AM, Pádraig Brady wrote:
> Run "make update-copyright" and then...
>
> * tests/sample-test: Adjust to use the single most recent year.
> * tests/du/bind-mount-dir-cycle-v2.sh: Fix case in copyright message,
> so that year is updated automatically in future.
>
> http://git.sv.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=e0afeb00

Thanks.
Besides that you didn't merge the copyright year numbers in the later
update of gnulib in bootstrap and tests/init.sh, I noticed that I made
a mistake 2 years ago when adding the exemption list .x-update-copyright:
it is processed as an extended regular expression ...
The following fixes it.

Have a nice day,
Berny

From 7f235156bcf644c4cccc5670f0468d89c64b822d Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <address@hidden>
Date: Thu, 1 Jan 2015 19:56:25 +0100
Subject: [PATCH] maint: update further copyright year number ranges

* bootstrap: Update copyright year manually (missing in previous
gnulib update).
* tests/init.sh: Likewise.

The entries in the exemption list are processed by
"grep -vEf ./.x-update-copyright", and therefore evaluated as an
extended regular expression (ERE).  Thus, the "bootstrap" entry
also matched for bootstrap.conf which we want to be updated.

* .x-update-copyright: Change all entries to EREs, i.e. including
the caret ^ and dollar sign $ meta-characters matching the beginning
and the end of a line.
* bootstrap.conf: Update copyright year by "make update-copyright".

Finally, the only one showing up with the following command should
be the COPYING file:
  $ git grep 'Copyright .* Free Software' | grep -v '2015 Free Software'
---
 .x-update-copyright | 8 ++++----
 bootstrap           | 4 ++--
 bootstrap.conf      | 2 +-
 tests/init.sh       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.x-update-copyright b/.x-update-copyright
index 725ac75..9b83e1c 100644
--- a/.x-update-copyright
+++ b/.x-update-copyright
@@ -1,4 +1,4 @@
-COPYING
-bootstrap
-man/help2man
-tests/init\.sh
+^COPYING$
+^bootstrap$
+^man/help2man$
+^tests/init\.sh$
diff --git a/bootstrap b/bootstrap
index 1f4c97b..47a5764 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2014-12-08.12; # 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
@@ -221,7 +221,7 @@ check_exists() {
       ($2 --version </dev/null)
     fi
   else
-  ($1 --version </dev/null) >/dev/null 2>&1
+    ($1 --version </dev/null) >/dev/null 2>&1
   fi

   test $? -lt 126
diff --git a/bootstrap.conf b/bootstrap.conf
index 7706c5a..4283140 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.

-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-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 fbd293d..37fc7b6 100755
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests

-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-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
--
2.1.2