On 01/04/2016 01:37 AM, James Youngman wrote: > Thanks for doing this. > > Sorry about the mid-air collision on the copyright updates. All the > other patches look good to me, please apply!
Thanks for the review - I pushed at the master branch. 4 questions: a) There are some parts left from my PATCH 5/8. I've updated the patch (see attached). Shall I push it? b) Do you want me to push to the 4.6 branch, too? (see c)). c) Will we maintain a 4.6 and a 4.7 line in parallel (although we don't have anything big for master)? I must confess that I'm a bit confused with this model. Other projects just leave bug fixing up to downstream distributions which can pick commits as they like. Furthermore, it is common to have a 2-block release version string only; by this, they can use gnulib's "build-aux/git-version-gen", and have a proper distribution tarball name matching the Git revision (e.g. "grep-2.22.15-40ed.tar.xz") at any time instead of a static name "...-4.7.0-git". Would you consider this a good thing for findutils, too? d) Another 'make update-copyright' would complain - (how) can we fix this, too? po/findutils.pot: warning: copyright statement not found Thanks & have a nice day, Berny
>From 4e884455aefe6636417b1132de02da4365520fb2 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker <m...@bernhard-voelker.de> Date: Mon, 4 Jan 2016 01:08:29 +0100 Subject: [PATCH] maint: adjust some copyright headers manually MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the prerequesite that 'make update-copyright' will correctly work on these files in future. * configure.ac: Add copyright header, using data from the oldest log entry of this file. * po/fi.po (header comment): Substitute copyright sign "©" by "(C)". * po/it.po: Likewise. * po/vi.po: Likewise. --- configure.ac | 20 ++++++++++++++++++++ po/fi.po | 3 ++- po/it.po | 3 ++- po/vi.po | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index add312c..7264792 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,23 @@ +# -*- autoconf -*- +# Process this file with autoconf to produce a configure script. + +# Copyright (C) 1996-2016 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 3 of the License, 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/>. + +dnl Written by Kevin Dalley. + dnl Process this file with autoconf to produce a configure script. AC_INIT([GNU findutils], 4.7.0-git, [bug-findutils@gnu.org]) AC_CONFIG_AUX_DIR(build-aux) diff --git a/po/fi.po b/po/fi.po index 9c6f2fc..f2966e5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,5 +1,6 @@ # Finnish translation of findutils. -# Copyright © 2002, 2009, 2010, 2013, 2014 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009, 2010, 2013, 2014, 2015, 2016 Free Software +# Foundation, Inc. # This file is distributed under the same license as the findutils package. # Matti Koskimies <ma...@apulanta.fi>, 2002. # Jorma Karvonen <karvonen.jo...@gmail.com>, 2009, 2010, 2013-2014. diff --git a/po/it.po b/po/it.po index 1359f85..62d818a 100644 --- a/po/it.po +++ b/po/it.po @@ -1,5 +1,6 @@ # Italian messages for GNU findutils. -# Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +# 2010, 2011, 2012, 2013, 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the findutils package. # Marco d'Itri <m...@linux.it>, 2001. # Giovanni Bortolozzo <bo...@pluto.linux.it>, 1997-2000. diff --git a/po/vi.po b/po/vi.po index c71b595..c6026d9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,6 +1,6 @@ # Vietnamese translation for FindUtils. # Bản dá»ch tiếng Viá»t dà nh cho FindUtils. -# Copyright © 2015 Free Software Foundation, Inc. +# Copyright (C) 2015, 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the findutils package. # Clytie Siddall <cly...@riverland.net.au>, 2006-2010. # Nguyá» n Thái Ngá»c Duy <pclo...@gmail.com>, 2012. -- 2.1.4
