[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] maint: make copyright statements more consistent; update gnu
|
From: |
Jim Meyering |
|
Subject: |
[PATCH 2/3] maint: make copyright statements more consistent; update gnulib |
|
Date: |
Sun, 29 Jan 2012 20:22:07 +0100 |
I've further condensed copyright statements, per this:
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/29554/focus=29860
using an updated update-copyright script.
I've truncated the long, boring third patch below.
>From 2a90c5a125ac654def9c1f7d3c52fd1dd1bab6a8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 27 Jan 2012 08:47:28 +0100
Subject: [PATCH 1/3] maint: fix copyright in old fileutils ChangeLog
* old/fileutils/ChangeLog-1997: Insert omitted "Free Software" in
the name of the copyright holder. Compress year range.
---
old/fileutils/ChangeLog-1997 | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/old/fileutils/ChangeLog-1997 b/old/fileutils/ChangeLog-1997
index 72655cc..0cd413e 100644
--- a/old/fileutils/ChangeLog-1997
+++ b/old/fileutils/ChangeLog-1997
@@ -6158,8 +6158,7 @@ Mon Feb 5 17:29:20 1990 David J. MacKenzie (djm at
albert.ai.mit.edu)
-----
- Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- Foundation, Inc.
+ Copyright (C) 1990-1997 Free Software Foundation, Inc.
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
--
1.7.9.1.g63eb
>From 3068c84765ca8bb0a5ba425664fb2e7454a8bbc5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 27 Jan 2012 11:33:11 +0100
Subject: [PATCH 2/3] maint: make copyright statements more consistent; update
gnulib
* cfg.mk (update-copyright-env): Add UPDATE_COPYRIGHT_FORCE=1
to rejoin some split lines, and UPDATE_COPYRIGHT_USE_INTERVALS=2
to make update-copyright use only one year range.
* gnulib: Update to latest, for newer update-copyright script.
---
cfg.mk | 3 ++-
gnulib | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index d4654eb..b4bd222 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -388,7 +388,8 @@ announcement_Cc_ = $(translation_project_), \
-include $(srcdir)/dist-check.mk
update-copyright-env = \
- UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+ UPDATE_COPYRIGHT_FORCE=1 \
+ UPDATE_COPYRIGHT_USE_INTERVALS=2 \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79
# List syntax-check exemptions.
diff --git a/gnulib b/gnulib
index 3888ec8..4994b1a 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 3888ec889ae709349cc7d9f7c1707dedbff2e130
+Subproject commit 4994b1aab88924f5db960472c2189fa1b46c6778
--
1.7.9.1.g63eb
>From d7878454cd02518959b0d6036db3a5b6ff00ca57 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 27 Jan 2012 11:35:24 +0100
Subject: [PATCH 3/3] maint: use single copyright year range
Run "make update-copyright".
---
.vg-suppressions | 2 +-
ChangeLog-2005 | 2 +-
ChangeLog-2006 | 2 +-
ChangeLog-2007 | 2 +-
Makefile.am | 2 +-
README | 2 +-
README-valgrind | 2 +-
configure.ac | 2 +-
doc/Makefile.am | 2 +-
doc/coreutils.texi | 2 +-
doc/perm.texi | 3 +--
gl/lib/rand-isaac.c | 2 +-
gl/lib/rand-isaac.h | 2 +-
gl/lib/randint.c | 2 +-
gl/lib/randint.h | 2 +-
gl/lib/randperm.c | 2 +-
gl/lib/randread.c | 2 +-
gl/lib/randread.h | 2 +-
gl/lib/root-dev-ino.c | 2 +-
gl/lib/root-dev-ino.h | 2 +-
gl/m4/root-dev-ino.m4 | 2 +-
lib/Makefile.am | 2 +-
lib/buffer-lcm.c | 2 +-
lib/fd-reopen.c | 2 +-
lib/fd-reopen.h | 2 +-
lib/strintcmp.c | 2 +-
lib/strnumcmp-in.h | 3 +--
lib/strnumcmp.c | 2 +-
lib/t-chdir-long | 2 +-
lib/xfts.c | 2 +-
m4/ChangeLog-2007 | 2 +-
m4/boottime.m4 | 3 +--
m4/check-decl.m4 | 3 +--
m4/fd-reopen.m4 | 2 +-
m4/include-exclude-prog.m4 | 2 +-
m4/jm-macros.m4 | 2 +-
m4/lib-check.m4 | 3 +--
m4/prereq.m4 | 2 +-
m4/stat-prog.m4 | 2 +-
m4/strnumcmp.m4 | 2 +-
m4/xattr.m4 | 2 +-
m4/xfts.m4 | 2 +-
man/chmod.x | 3 +--
man/chown.x | 3 +--
man/df.x | 2 +-
man/du.x | 2 +-
man/help2man | 2 +-
man/rm.x | 3 +--
old/fileutils/ChangeLog-1997 | 2 +-
old/fileutils/NEWS | 2 +-
old/sh-utils/ChangeLog | 3 +--
old/sh-utils/ChangeLog.0 | 2 +-
old/sh-utils/NEWS | 2 +-
old/textutils/NEWS | 2 +-
src/Makefile.am | 2 +-
src/basename.c | 2 +-
src/cat.c | 2 +-
src/chgrp.c | 2 +-
src/chmod.c | 2 +-
src/chown-core.c | 2 +-
src/chown-core.h | 2 +-
src/chown.c | 2 +-
src/chroot.c | 2 +-
src/cksum.c | 2 +-
src/comm.c | 3 +--
src/copy.c | 2 +-
src/copy.h | 2 +-
src/cp-hash.c | 2 +-
src/cp.c | 2 +-
src/csplit.c | 2 +-
src/dcgen | 2 +-
src/dd.c | 2 +-
src/df.c | 2 +-
src/dircolors.hin | 2 +-
src/dirname.c | 2 +-
src/du-tests | 2 +-
src/du.c | 2 +-
src/echo.c | 3 +--
src/env.c | 2 +-
src/expand.c | 3 +--
src/expr.c | 2 +-
src/extract-magic | 2 +-
src/factor.c | 2 +-
src/fmt.c | 2 +-
src/fold.c | 2 +-
src/head.c | 2 +-
src/hostid.c | 2 +-
src/hostname.c | 2 +-
src/install.c | 2 +-
src/ioblksize.h | 2 +-
src/join.c | 2 +-
src/kill.c | 2 +-
src/link.c | 2 +-
src/ln.c | 2 +-
src/logname.c | 2 +-
src/ls.c | 3 +--
src/mkdir.c | 2 +-
src/mkfifo.c | 2 +-
src/mknod.c | 2 +-
src/mv.c | 2 +-
src/nice.c | 2 +-
src/nl.c | 2 +-
src/nohup.c | 2 +-
src/od.c | 2 +-
src/paste.c | 2 +-
src/pinky.c | 2 +-
src/pr.c | 2 +-
src/printenv.c | 2 +-
src/ptx.c | 2 +-
src/pwd.c | 2 +-
src/remove.c | 2 +-
src/remove.h | 2 +-
src/rm.c | 2 +-
src/rmdir.c | 2 +-
src/sleep.c | 3 +--
src/sort.c | 2 +-
src/split.c | 2 +-
src/stty.c | 2 +-
src/su.c | 2 +-
src/sum.c | 3 +--
src/sync.c | 2 +-
src/system.h | 2 +-
src/tac-pipe.c | 3 +--
src/tac.c | 2 +-
src/tail.c | 2 +-
src/tee.c | 2 +-
src/test.c | 2 +-
src/touch.c | 3 +--
src/tr.c | 2 +-
src/true.c | 2 +-
src/tsort.c | 2 +-
src/tty.c | 2 +-
src/uname.c | 3 +--
src/unexpand.c | 3 +--
src/uniq.c | 2 +-
src/unlink.c | 2 +-
src/uptime.c | 2 +-
src/users.c | 2 +-
src/wc.c | 2 +-
src/wheel-gen.pl | 2 +-
src/whoami.c | 3 +--
src/yes.c | 2 +-
tests/Coreutils.pm | 2 +-
tests/chgrp/deref | 2 +-
tests/chgrp/no-x | 2 +-
tests/chgrp/recurse | 2 +-
tests/chmod/c-option | 2 +-
tests/chmod/equal-x | 2 +-
tests/chmod/equals | 2 +-
tests/chmod/no-x | 2 +-
tests/chmod/setgid | 2 +-
tests/chown/basic | 2 +-
tests/chown/deref | 2 +-
tests/cp/backup-1 | 3 +--
tests/cp/backup-is-src | 2 +-
tests/cp/cp-HL | 2 +-
tests/cp/cp-mv-backup | 2 +-
tests/cp/cp-parents | 2 +-
tests/cp/deref-slink | 2 +-
tests/cp/dir-rm-dest | 2 +-
tests/cp/dir-slash | 2 +-
tests/cp/dir-vs-file | 2 +-
tests/cp/fail-perm | 2 +-
tests/cp/into-self | 2 +-
tests/cp/link | 2 +-
tests/cp/link-preserve | 2 +-
tests/cp/no-deref-link1 | 3 +--
tests/cp/no-deref-link2 | 3 +--
tests/cp/no-deref-link3 | 3 +--
tests/cp/perm | 2 +-
tests/cp/preserve-2 | 2 +-
tests/cp/r-vs-symlink | 2 +-
tests/cp/same-file | 2 +-
tests/cp/slink-2-slink | 2 +-
tests/cp/special-bits | 2 +-
tests/cp/symlink-slash | 2 +-
tests/dd/misc | 2 +-
tests/dd/not-rewound | 2 +-
tests/dd/skip-seek2 | 2 +-
tests/dd/unblock-sync | 2 +-
tests/du/8gb | 2 +-
tests/du/basic | 2 +-
tests/du/deref | 2 +-
tests/du/fd-leak | 2 +-
tests/du/files0-from | 2 +-
tests/du/hard-link | 2 +-
tests/du/inaccessible-cwd | 2 +-
tests/du/no-deref | 2 +-
tests/du/no-x | 2 +-
tests/du/restore-wd | 2 +-
tests/du/slash | 2 +-
tests/du/two-args | 2 +-
tests/envvar-check | 2 +-
tests/install/basic-1 | 2 +-
tests/install/create-leading | 2 +-
tests/ln/backup-1 | 2 +-
tests/ln/misc | 2 +-
tests/ln/sf-1 | 2 +-
tests/ln/target-1 | 2 +-
tests/ls/dangle | 2 +-
tests/ls/dired | 2 +-
tests/ls/file-type | 2 +-
tests/ls/follow-slink | 2 +-
tests/ls/infloop | 2 +-
tests/ls/inode | 2 +-
tests/ls/m-option | 2 +-
tests/ls/no-arg | 2 +-
tests/ls/recursive | 2 +-
tests/ls/rt-1 | 2 +-
tests/ls/symlink-slash | 2 +-
tests/misc/close-stdout | 2 +-
tests/misc/date-sec | 2 +-
tests/misc/df | 2 +-
tests/misc/dircolors | 2 +-
tests/misc/expr | 2 +-
tests/misc/factor | 2 +-
tests/misc/false-status | 2 +-
tests/misc/fmt-long-line | 2 +-
tests/misc/fold | 2 +-
tests/misc/head-c | 2 +-
tests/misc/head-elide-tail | 2 +-
tests/misc/head-pos | 2 +-
tests/misc/ls-misc | 2 +-
tests/misc/ls-time | 2 +-
tests/misc/md5sum | 2 +-
tests/misc/md5sum-newline | 2 +-
tests/misc/mknod | 2 +-
tests/misc/nice | 2 +-
tests/misc/nl | 2 +-
tests/misc/nohup | 2 +-
tests/misc/od-N | 2 +-
tests/misc/od-x8 | 2 +-
tests/misc/paste | 2 +-
tests/misc/pathchk1 | 2 +-
tests/misc/printf | 2 +-
tests/misc/printf-hex | 2 +-
tests/misc/seq | 2 +-
tests/misc/sha1sum | 2 +-
tests/misc/sha1sum-vec | 2 +-
tests/misc/sha224sum | 2 +-
tests/misc/sha256sum | 2 +-
tests/misc/sha384sum | 2 +-
tests/misc/sha512sum | 2 +-
tests/misc/shred-exact | 2 +-
tests/misc/shred-remove | 2 +-
tests/misc/sort-merge | 2 +-
tests/misc/stat-fmt | 2 +-
tests/misc/stty | 2 +-
tests/misc/stty-row-col | 2 +-
tests/misc/sum | 2 +-
tests/misc/sum-sysv | 2 +-
tests/misc/tac-continue | 2 +-
tests/misc/tsort | 2 +-
tests/misc/tty-eof | 2 +-
tests/misc/unexpand | 2 +-
tests/misc/wc | 2 +-
tests/mkdir/p-1 | 2 +-
tests/mkdir/p-2 | 2 +-
tests/mkdir/parents | 2 +-
tests/mkdir/perm | 2 +-
tests/mkdir/special-1 | 2 +-
tests/mkdir/t-slash | 2 +-
tests/mkdir/writable-under-readonly | 2 +-
tests/mv/backup-is-src | 2 +-
tests/mv/childproof | 2 +-
tests/mv/diag | 2 +-
tests/mv/dir-file | 2 +-
tests/mv/dup-source | 2 +-
tests/mv/force | 2 +-
tests/mv/hard-2 | 2 +-
tests/mv/hard-3 | 2 +-
tests/mv/hard-4 | 2 +-
tests/mv/hard-link-1 | 2 +-
tests/mv/i-1 | 2 +-
tests/mv/i-2 | 2 +-
tests/mv/i-3 | 2 +-
tests/mv/i-4 | 2 +-
tests/mv/i-link-no | 2 +-
tests/mv/into-self | 2 +-
tests/mv/into-self-2 | 2 +-
tests/mv/into-self-3 | 2 +-
tests/mv/into-self-4 | 2 +-
tests/mv/leak-fd | 2 +-
tests/mv/mv-special-1 | 2 +-
tests/mv/part-fail | 2 +-
tests/mv/part-rename | 2 +-
tests/mv/part-symlink | 2 +-
tests/mv/partition-perm | 2 +-
tests/mv/perm-1 | 2 +-
tests/mv/to-symlink | 2 +-
tests/mv/trailing-slash | 2 +-
tests/mv/update | 2 +-
tests/mv/vfat | 2 +-
tests/other-fs-tmpdir | 3 +--
tests/readlink/can-e | 2 +-
tests/readlink/can-f | 2 +-
tests/readlink/can-m | 2 +-
tests/readlink/rl-1 | 2 +-
tests/rm/cycle | 2 +-
tests/rm/dangling-symlink | 2 +-
tests/rm/deep-1 | 2 +-
tests/rm/dir-no-w | 2 +-
tests/rm/dot-rel | 2 +-
tests/rm/empty-name | 2 +-
tests/rm/f-1 | 2 +-
tests/rm/fail-2eperm | 2 +-
tests/rm/fail-eperm | 2 +-
tests/rm/hash | 2 +-
tests/rm/i-1 | 2 +-
tests/rm/i-no-r | 2 +-
tests/rm/inaccessible | 2 +-
tests/rm/ir-1 | 2 +-
tests/rm/no-give-up | 2 +-
tests/rm/r-1 | 3 +--
tests/rm/r-2 | 3 +--
tests/rm/r-3 | 2 +-
tests/rm/readdir-bug | 2 +-
tests/rm/rm1 | 2 +-
tests/rm/rm3 | 2 +-
tests/rm/rm4 | 2 +-
tests/rm/rm5 | 2 +-
tests/rm/sunos-1 | 3 +--
tests/rm/unread3 | 2 +-
tests/rm/unreadable | 2 +-
tests/rmdir/fail-perm | 2 +-
tests/rmdir/ignore | 2 +-
tests/rmdir/t-slash | 2 +-
tests/split/lines | 2 +-
tests/tail-2/assert | 2 +-
tests/tail-2/assert-2 | 2 +-
tests/tail-2/big-4gb | 2 +-
tests/tail-2/infloop-1 | 2 +-
tests/tail-2/pid | 2 +-
tests/tail-2/proc-ksyms | 2 +-
tests/tail-2/start-middle | 2 +-
tests/tail-2/tail-n0f | 2 +-
tests/tail-2/wait | 2 +-
tests/touch/dangling-symlink | 2 +-
tests/touch/empty-file | 2 +-
tests/touch/fail-diag | 2 +-
tests/touch/fifo | 2 +-
tests/touch/no-create-missing | 2 +-
tests/touch/no-rights | 2 +-
tests/touch/obsolescent | 2 +-
tests/touch/relative | 2 +-
345 files changed, 345 insertions(+), 373 deletions(-)
diff --git a/.vg-suppressions b/.vg-suppressions
index 21015e2..d2191dc 100644
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -1,6 +1,6 @@
# Suppress valgrind diagnostics we don't care about.
-# Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-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
diff --git a/ChangeLog-2005 b/ChangeLog-2005
index 3d08a87..c334927 100644
--- a/ChangeLog-2005
+++ b/ChangeLog-2005
@@ -11609,7 +11609,7 @@
-----
- Copyright (C) 2002-2005, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
diff --git a/ChangeLog-2006 b/ChangeLog-2006
index 13f1232..b430beb 100644
--- a/ChangeLog-2006
+++ b/ChangeLog-2006
@@ -4033,7 +4033,7 @@
-----
- Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2006-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
diff --git a/ChangeLog-2007 b/ChangeLog-2007
index a170a98..c232c29 100644
--- a/ChangeLog-2007
+++ b/ChangeLog-2007
@@ -4015,7 +4015,7 @@
-----
- Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
diff --git a/Makefile.am b/Makefile.am
index eb92deb..72d93d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
# Make coreutils. -*-Makefile-*-
-# Copyright (C) 1990, 1993-2012 Free Software Foundation, Inc.
+# Copyright (C) 1990-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
diff --git a/README b/README
index 93bbfac..3cc476a 100644
--- a/README
+++ b/README
@@ -240,7 +240,7 @@ the address on the last line of --help output.
========================================================================
-Copyright (C) 1998, 2002-2012 Free Software Foundation, Inc.
+Copyright (C) 1998-2012 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.3 or
diff --git a/README-valgrind b/README-valgrind
index a17d53e..4cb01a1 100644
--- a/README-valgrind
+++ b/README-valgrind
@@ -1,7 +1,7 @@
#! /bin/bash
# Convert this package for use with valgrind.
-# Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-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
diff --git a/configure.ac b/configure.ac
index c17abd7..07597e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- autoconf -*-
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1991, 1993-2012 Free Software Foundation, Inc.
+# Copyright (C) 1991-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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a33e2f9..0de9213 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
# Make coreutils documentation. -*-Makefile-*-
-# Copyright (C) 1995-1998, 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 1995-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
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 0d3b739..6f24dd3 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -140,7 +140,7 @@
This manual documents version @value{VERSION} of the @sc{gnu} core
utilities, including the standard programs for text and file manipulation.
-Copyright @copyright{} 1994-1996, 2000-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/perm.texi b/doc/perm.texi
index 17777b5..84f8500 100644
--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -1,7 +1,6 @@
@c File mode bits
-@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006, 2008-2012 Free Software
-@c Foundation, Inc.
+@c Copyright (C) 1994-2012 Free Software Foundation, Inc.
@c Permission is granted to copy, distribute and/or modify this document
@c under the terms of the GNU Free Documentation License, Version 1.3 or
...
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH 2/3] maint: make copyright statements more consistent; update gnulib,
Jim Meyering <=