Another couple of copyright-related fixlets. I've applied the first one to maint, the second one to master.
Regards, Stefano
>From db5ddc2bfceeb4470d02c2ff2375cf5900415493 Mon Sep 17 00:00:00 2001 Message-Id: <db5ddc2bfceeb4470d02c2ff2375cf5900415493.1329384847.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Thu, 16 Feb 2012 10:33:30 +0100 Subject: [PATCH] update-copyright: don't touch files synced from external packages * Makefile.am (update-copyright): Do not update copyright years of files synced from external packages, as given by the '$(FETCHFILES)' variable. Silence the recipe since we are at it. --- Makefile.am | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 76c3e69..d02731f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -821,5 +821,9 @@ update_copyright_env = \ .PHONY: update-copyright update-copyright: - git ls-files | grep -Ev 'COPYING|INSTALL' \ + $(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 "^($$excluded_re)$$" \ | $(update_copyright_env) xargs $(srcdir)/lib/$@ -- 1.7.9
>From 0313d37bd0f5016e85aaea03bb5b1309cf03db19 Mon Sep 17 00:00:00 2001 Message-Id: <0313d37bd0f5016e85aaea03bb5b1309cf03db19.1329385366.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Thu, 16 Feb 2012 10:42:38 +0100 Subject: [PATCH] maint: add some missing copyright notices * tests/ChangeLog-old: Add copyright notice. * tests/aclocal.in: Likewise. * tests/automake.in: Likewise. * tests/extract-testsuite-summary: Likewise. * tests/prove-runner: Likewise. --- tests/ChangeLog-old | 7 +++++++ tests/aclocal.in | 15 +++++++++++++++ tests/automake.in | 15 +++++++++++++++ tests/extract-testsuite-summary | 15 +++++++++++++++ tests/prove-runner | 15 +++++++++++++++ 5 files changed, 67 insertions(+), 0 deletions(-) diff --git a/tests/ChangeLog-old b/tests/ChangeLog-old index d76ca2b..8464944 100644 --- a/tests/ChangeLog-old +++ b/tests/ChangeLog-old @@ -1439,3 +1439,10 @@ Sat Feb 10 17:08:39 1996 Tom Tromey <tro...@creche.cygnus.com> * mdate.test, vtexi.test, acoutput.test: New files. * Started. + +----- + +Copyright 2012 Free Software Foundation, Inc. + +Copying and distribution of this file, with or without modification, are +permitted provided the copyright notice and this notice are preserved. diff --git a/tests/aclocal.in b/tests/aclocal.in index 5326ad0..18ee13a 100644 --- a/tests/aclocal.in +++ b/tests/aclocal.in @@ -1,6 +1,21 @@ #!/bin/sh # @configure_input@ +# Copyright (C) 2012 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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/>. + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh diff --git a/tests/automake.in b/tests/automake.in index d4c4c5c..14f437f 100644 --- a/tests/automake.in +++ b/tests/automake.in @@ -1,6 +1,21 @@ #!/bin/sh # @configure_input@ +# Copyright (C) 2012 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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/>. + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh diff --git a/tests/extract-testsuite-summary b/tests/extract-testsuite-summary index a3a0d87..28a9c35 100644 --- a/tests/extract-testsuite-summary +++ b/tests/extract-testsuite-summary @@ -2,6 +2,21 @@ # Extract the testsuite summary generated by the parallel-tests harness # from the output of "make check". +# Copyright (C) 2012 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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/>. + use warnings FATAL => 'all'; use strict; diff --git a/tests/prove-runner b/tests/prove-runner index e687c0a..33dab19 100755 --- a/tests/prove-runner +++ b/tests/prove-runner @@ -2,6 +2,21 @@ # Helper script to run the automake testsuite through the `prove' utility. # See the "prove" and "installprove" targets in tests/Makefile.am. +# Copyright (C) 2012 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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/>. + set -u nl=' -- 1.7.9