bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: License pedantry


From: Bruno Haible
Subject: Re: License pedantry
Date: Thu, 17 Sep 2009 22:08:01 +0200
User-agent: KMail/1.9.9

Hi Ian,

Ian Beckwith wrote:
> I've recently adopted the Debian gnulib package.

Welcome! It was a bit unfortunate that gnulib was "frozen" in Debian for
about a year, although gnulib attempts to be constantly moving and
improving. See
  http://www.gnu.org/software/gnulib/manual/html_node/Steady-Development.html

If you want to add value to gnulib, compared to the git repository, you
might want to periodically update to a stable snapshot of gnulib. This means,
for example, once in a month, take a snapshot of gnulib, then for a week
watch closely all patches that go into gnulib's git repository, looking out
for riskless fixes. Then publish a tarball with these fixes. This would
be added value in terms of reliability/quality, because despite our efforts
to not break the gnulib git, sometimes a particular module is broken for a
day or two.

Also, I see in http://packages.debian.org/lenny/gnulib that the formal
dependencies listed in gnulib/DEPENDENCIES (make, autoconf, automake,
bison, gperf etc.) are not listed among the Debian dependencies. These
tools are all needed in order to execute "gnulib-tool --create-testdir"
of the whole module set.

> Documenting the copyright and licenses of all the files (a tedious but
> (currently) necessary process), I spotted a few extremely minor issues,
> and ran into a few things I'd like clarifying.
> 
> The attached patch:
> 
> * Replaces incorrect FSF addresses with pointers to www.gnu.org/licenses.
>   (picked up by 'licensecheck', in the debian devscripts package).

Yes, there is no need to have variants of the license header. When
lib/stpcpy.c (copied from glibc) has the standard header, lib/glob.c
(also copied from glibc) can have it as well. I'm applying the attached
patch.

> * Removes a stray 'dnl' in the middle of a copyright notice.
> * Updates users.txt with pointers to the gnuit home and gitweb pages.

Thanks, I'm committing these two parts in your name without modification.

> modules/COPYING and modules/README both claim to apply to all the
> files in modules/, but have different copyright years and slightly
> different license wording.

I'm adjusting the copyright years. The wording is semantically equivalent,
therefore I'm leaving it as is.

Bruno


2009-09-17  Bruno Haible  <address@hidden>

        * lib/atoll.c: Use the standard header with GPL copyright.
        * lib/argz.in.h: Likewise.
        * lib/glob.c: Likewise.
        * lib/glob-libc.h: Likewise.
        * lib/random_r.c: Likewise.
        * lib/siglist.h: Likewise.
        * lib/strsignal.h: Likewise.
        Reported by Ian Beckwith <address@hidden>.

--- lib/argz.in.h.orig  2009-09-17 21:42:17.000000000 +0200
+++ lib/argz.in.h       2009-09-17 21:38:47.000000000 +0200
@@ -2,20 +2,18 @@
    Copyright (C) 1995,96,97,98,99,2000,2004,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _ARGZ_H
 #define _ARGZ_H        1
--- lib/atoll.c.orig    2009-09-17 21:42:17.000000000 +0200
+++ lib/atoll.c 2009-09-17 21:38:47.000000000 +0200
@@ -1,20 +1,18 @@
 /* Copyright (C) 1991, 1997, 1998, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
 # include <config.h>
--- lib/glob-libc.h.orig        2009-09-17 21:42:17.000000000 +0200
+++ lib/glob-libc.h     2009-09-17 21:38:46.000000000 +0200
@@ -1,20 +1,18 @@
 /* Copyright (C) 1991,92,95-98,2000,2001,2004-2007 Free Software Foundation, 
Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef        _GLOB_H
 #define        _GLOB_H 1
--- lib/glob.c.orig     2009-09-17 21:42:17.000000000 +0200
+++ lib/glob.c  2009-09-17 21:38:46.000000000 +0200
@@ -2,20 +2,18 @@
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>
--- lib/random_r.c.orig 2009-09-17 21:42:17.000000000 +0200
+++ lib/random_r.c      2009-09-17 21:38:45.000000000 +0200
@@ -1,20 +1,18 @@
 /*
-   Copyright (C) 1995, 2005, 2008 Free Software Foundation
+   Copyright (C) 1995, 2005, 2008 Free Software Foundation, Inc.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /*
    Copyright (C) 1983 Regents of the University of California.
--- lib/siglist.h.orig  2009-09-17 21:42:17.000000000 +0200
+++ lib/siglist.h       2009-09-17 21:38:46.000000000 +0200
@@ -2,20 +2,18 @@
    Copyright (C) 1996,97,98,99,2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* This file should be usable for any platform, since it just associates
    the SIG* macros with text names and descriptions.  The actual values
--- lib/strsignal.c.orig        2009-09-17 21:42:17.000000000 +0200
+++ lib/strsignal.c     2009-09-17 21:38:46.000000000 +0200
@@ -1,20 +1,18 @@
 /* Copyright (C) 1991, 1994-2002, 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>



2009-09-17  Bruno Haible  <address@hidden>

        * modules/COPYING: Update copyright years.
        * modules/README: Likeiwse.
        * doc/gnulib-intro.texi (Copyright): Use a wildcard year.
        Reported by Ian Beckwith <address@hidden>.

--- doc/gnulib-intro.texi.orig  2009-09-17 22:05:46.000000000 +0200
+++ doc/gnulib-intro.texi       2009-09-17 22:04:31.000000000 +0200
@@ -284,7 +284,7 @@
 Documentation files are under this copyright:
 
 @quotation
-Copyright @copyright{} 2004-2008 Free Software Foundation, address@hidden
+Copyright @copyright{} 2004-200Y Free Software Foundation, address@hidden
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
--- modules/COPYING.orig        2009-09-17 22:05:46.000000000 +0200
+++ modules/COPYING     2009-09-17 22:01:24.000000000 +0200
@@ -2,7 +2,7 @@
 The following copyright notice applies to each of these
 description files.
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2002-2009 Free Software Foundation, Inc.
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.
--- modules/README.orig 2009-09-17 22:05:46.000000000 +0200
+++ modules/README      2009-09-17 22:01:29.000000000 +0200
@@ -9,7 +9,7 @@
 
 All the files in this directory are distributed under the following copyright:
 
-  Copyright (C) 2002-2007 Free Software Foundation, Inc.
+  Copyright (C) 2002-2009 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   in any medium, are permitted without royalty provided the copyright
   notice and this notice are preserved.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]