Re: license discrepancy

[Eric Blake]

According to Eric Blake on 1/6/2010 10:09 AM:
> Jim Meyering <jim <at> meyering.net> writes:
> 
>>> OK to apply?
>> Sure.  Thanks.
>> It'd be nice to have a syntax-check rule for this.
> 
> I'm not sure how best to do that, but I agree.  I'll see if I can come up 
> with 
> something.

Which I did.

> 
> Meanwhile, I won't be applying this until the gnulib thread that I just 
> created 
> about maint.mk settles out (as presented, 'make syntax-check' fails on 
> sc_immutable_NEWS, but I only want to run 'make update-NEWS-hash' once).

So here's the end result, now pushed.

-- 
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden

From 72a0a8264d1eeacfc92231e71d75d2eb7ee3e08f Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 6 Jan 2010 09:12:10 -0700
Subject: [PATCH] maint: apply correct license to auxiliary files

* gnulib: Update, for maint.mk improvements.
* HACKING: Use GFDL 1.3, not 1.2.
* NEWS: Likewise.
* README: Likewise.
* cfg.mk (old_NEWS_hash): Update accordingly.
* .gitignore: Ignore file created by 'make update-NEWS-hash'.
---
 .gitignore |    1 +
 HACKING    |    2 +-
 NEWS       |    2 +-
 README     |    2 +-
 cfg.mk     |    2 +-
 gnulib     |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b9036a..3075883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.I[12]
 *.[EIOX]
+*.bak
 *.o
 */.deps
 *~
diff --git a/HACKING b/HACKING
index 0ecca0f..124c666 100644
--- a/HACKING
+++ b/HACKING
@@ -484,7 +484,7 @@ in your favorite web browser.
 Copyright (C) 2009-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free
diff --git a/NEWS b/NEWS
index 686ed56..a22fa7a 100644
--- a/NEWS
+++ b/NEWS
@@ -2882,7 +2882,7 @@ packages, see ./old/*/NEWS.
 Copyright (C) 2001-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free
diff --git a/README b/README
index 4982683..3ecafc3 100644
--- a/README
+++ b/README
@@ -232,7 +232,7 @@ the address on the last line of --help output.
 Copyright (C) 1998, 2002-2010 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free
diff --git a/cfg.mk b/cfg.mk
index ab483b7..8d8a0db 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -26,7 +26,7 @@ bootstrap-tools = autoconf,automake,gnulib,bison
 # Now that we have better tests, make this the default.
 export VERBOSE = yes

-old_NEWS_hash = 919fd726a332310f8448ebcddd2b10e9
+old_NEWS_hash = 67237f9a765e6e1af0cb89e428ed2663

 # Ensure that the list of O_ symbols used to compute O_FULLBLOCK is complete.
 dd = $(srcdir)/src/dd.c
diff --git a/gnulib b/gnulib
index f9eed4b..cb361c9 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f9eed4bc005946e46ce0888ba759f06442c4754e
+Subproject commit cb361c968d771304ab68ed5cb8016a6b0c1b8cf2
-- 
1.6.4.2

signature.asc
Description: OpenPGP digital signature