Bruno Haible wrote:
> Hi Jim,
>
>> Here's the whole thing:
>
> Thanks for showing it. The hunks I've looked at look all fine.
Thanks for the review, Bruno.
I've made one more change to the update-copyright rule,
patch below, then pushed the change that results from
running "make update-copyright".
>From 897b54c334d903950172863b57b5de744b3c5092 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Sat, 1 Jan 2011 22:09:12 +0100
Subject: [PATCH 1/2] maint: update-copyright: exempt doc/INSTALL*
* Makefile (update-copyright): Also exclude doc/INSTALL*,
since they are generated. Suggested by Bruno Haible.
---
ChangeLog | 6 ++++++
Makefile | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dc8bd40..06aa425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2011-01-01 Jim Meyering <meyer...@redhat.com>
+ maint: update-copyright: exempt doc/INSTALL*
+ * Makefile (update-copyright): Also exclude doc/INSTALL*,
+ since they are generated. Suggested by Bruno Haible.
+
+2011-01-01 Jim Meyering <meyer...@redhat.com>
+
maint: refine the update-copyright rule
* Makefile (update-copyright): Also exclude any file that includes
the "GENERATED AUTOMATICALLY" comment, being careful not to exclude
diff --git a/Makefile b/Makefile
index 745c603..c3bf4a9 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ MODULES.html: MODULES.html.sh
# as well as those in tests/unictype (generated).
# Also exclude any file that includes the "GENERATED AUTOMATICALLY" comment,
# being careful not to exclude code that merely generates the comment.
+# Also exclude doc/INSTALL*, since they too are generated.
update-copyright:
exempt=$$(mktemp); \
grep -v '^#' config/srclist.txt|grep -v '^$$' \
@@ -69,6 +70,7 @@ update-copyright:
echo "$$dst"/$$(basename "$$src"); \
done > $$exempt; \
git ls-files tests/unictype >> $$exempt; \
+ git ls-files doc/INSTALL* >> $$exempt; \
git ls-files | grep -vFf $$exempt \
| xargs grep -L '^/\*.*GENERATED AUTOMATICALLY' \
| UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 \
--
1.7.3.4
>From d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Sat, 1 Jan 2011 20:17:23 +0100
Subject: [PATCH 2/2] maint: update almost all copyright ranges to include 2011
Run the new "make update-copyright" rule.
---
ChangeLog | 7 ++++++-
MODULES.html.sh | 2 +-
README | 3 +--
build-aux/announce-gen | 2 +-
build-aux/arg-nonnull.h | 2 +-
build-aux/bootstrap | 2 +-
build-aux/bootstrap.conf | 2 +-
build-aux/c++defs.h | 2 +-
build-aux/config.libpath | 2 +-
build-aux/config.rpath | 2 +-
build-aux/csharpcomp.sh.in | 2 +-
build-aux/csharpexec.sh.in | 2 +-
build-aux/do-release-commit-and-tag | 2 +-
build-aux/git-version-gen | 2 +-
build-aux/gitlog-to-changelog | 2 +-
build-aux/gnu-web-doc-update | 2 +-
build-aux/install-reloc | 2 +-
build-aux/javacomp.sh.in | 2 +-
build-aux/javaexec.sh.in | 2 +-
build-aux/ldd.sh.in | 2 +-
build-aux/link-warning.h | 2 +-
build-aux/mktempd | 2 +-
build-aux/move-if-change | 2 +-
build-aux/ncftpput-ftp | 2 +-
build-aux/pmccabe2html | 2 +-
build-aux/reloc-ldflags | 2 +-
build-aux/relocatable.sh.in | 2 +-
build-aux/unused-parameter.h | 2 +-
build-aux/update-copyright | 2 +-
build-aux/useless-if-before-free | 2 +-
build-aux/vc-list-files | 2 +-
build-aux/warn-on-use.h | 2 +-
build-aux/x-to-1.in | 2 +-
check-module | 2 +-
config/argz.mk | 2 +-
config/srclist-update | 3 +--
doc/Makefile | 2 +-
doc/alloca-opt.texi | 2 +-
doc/alloca.texi | 2 +-
doc/c-ctype.texi | 2 +-
doc/c-strcase.texi | 2 +-
doc/c-strcaseeq.texi | 2 +-
doc/c-strcasestr.texi | 2 +-
doc/c-strstr.texi | 2 +-
...[35K lines elided]...
diff --git a/top/maint.mk b/top/maint.mk
index 315b223..5545e69 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -2,7 +2,7 @@
# This Makefile fragment tries to be general-purpose enough to be
# used by many projects via the gnulib maintainer-makefile module.
-## Copyright (C) 2001-2010 Free Software Foundation, Inc.
+## Copyright (C) 2001-2011 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/users.txt b/users.txt
index 3b626ae..4873335 100644
--- a/users.txt
+++ b/users.txt
@@ -85,7 +85,7 @@ Articles:
-----
-Copyright (C) 2006-2010 Free Software Foundation, Inc.
+Copyright (C) 2006-2011 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
--
1.7.3.4
