Reported by Peter Rosin. * update-copyright: Also exclude the COPYING and INSTALL files found in the top-level directory. * COPYING, INSTALL: Revert update of copyright years done in today's commit 'v1.11-1948-g641a5a4'. --- COPYING | 2 +- INSTALL | 3 ++- Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/COPYING b/COPYING index a9a3ea0..d511905 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989-2012 Free Software Foundation, Inc., + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/INSTALL b/INSTALL index 414d0e5..a1e89e1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-2012 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/Makefile.am b/Makefile.am index 7c49ab6..b11e8fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -379,6 +379,6 @@ update-copyright: $(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \ | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \ $(GIT) ls-files \ - | grep -Ev '/(COPYING|INSTALL)' \ + | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \ | grep -Ev "^($$excluded_re)$$" \ | $(update_copyright_env) xargs $(srcdir)/lib/$@ -- 1.7.9