[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-idutils] FYI, a few patches
|
From: |
Jim Meyering |
|
Subject: |
[bug-idutils] FYI, a few patches |
|
Date: |
Sat, 15 Aug 2009 18:17:26 +0200 |
These changes are mainly to update to the latest gnulib,
and in so doing, to avoid a conflict (both packages provided hash.h).
>From 28b0d61c38f5c8136c6d8d5d984ddf1eba2d5024 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 18:03:31 +0200
Subject: [PATCH 01/10] tests: run the latest test
* testsuite/Makefile.am (EXTRA_DIST): Add mkid-langopt.
* NEWS: Tweak wording.
* testsuite/mkid-langopt: Add a comment.
---
NEWS | 4 ++--
testsuite/Makefile.am | 1 +
testsuite/mkid-langopt | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index c08f540..b10c743 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,8 @@ GNU idutils NEWS -*-
outline -*-
** Bug fixes
- mkid and xtokid now can receive language specific options from
- command line. Such options must be single-quoted.
+ mkid and xtokid now accept language specific options via the command line.
+
* Noteworthy changes in release 4.3.92 (2008-10-18) [beta]
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index cbadbfc..bd25f6b 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
CuTmpdir.pm \
check.mk \
envvar-check \
+ mkid-langopt \
single_file_token_bug.c
DISTCLEANFILES = ID
diff --git a/testsuite/mkid-langopt b/testsuite/mkid-langopt
index 957a0f0..ed6800a 100755
--- a/testsuite/mkid-langopt
+++ b/testsuite/mkid-langopt
@@ -1,3 +1,4 @@
#!/bin/sh
+# Before the 2009-aug-11 fix, this would segfault.
../src/mkid --lang-opt=C:'-i $' -l C:'-k f' || exit 1
--
1.6.4.378.g88f2f
>From a54b8c9e5674744d40fd6cde71684abeb407ae14 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 18:08:02 +0200
Subject: [PATCH 02/10] build: avoid a legitimate warning exposed by newer gcc
* libidu/scanners.c (language_save_arg): Remove decl of unused
static local, horizontal_space.
---
libidu/scanners.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/libidu/scanners.c b/libidu/scanners.c
index 19c8374..08907cb 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -101,7 +101,6 @@ language_help_me (void)
void
language_save_arg (char *arg)
{
- static char horizontal_space[] = " \t";
char *lang_name = strsep (&arg, ":");
struct language *lang = get_language (lang_name);
--
1.6.4.378.g88f2f
>From d0ec27cead89a1bbcacbe98a255fe1d3e9eb4ac1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 10:37:29 +0200
Subject: [PATCH 03/10] build: update from gnulib
* gnulib: Update submodule to latest.
---
gnulib | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gnulib b/gnulib
index 675fbd3..adfb0d9 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 675fbd30d44edd7ecfca9e9013424b187eb3db70
+Subproject commit adfb0d959e2a5d2cc0e21ffefa9738e2927256a6
--
1.6.4.378.g88f2f
>From f9c696c6409a9032e0ec919669b86ece7aaa6e3c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 10:38:49 +0200
Subject: [PATCH 04/10] build: use gnulib's getopt-gnu module (getopt is now
deprecated)
* bootstrap.conf (gnulib_modules): Gnulib's getopt module is now
deprecated; use the new, preferred name, getopt-gnu.
---
bootstrap.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 325d7e1..c70bf42 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -44,7 +44,7 @@ gnulib_modules="
fnmatch-gnu
fpending
getcwd
- getopt
+ getopt-gnu
gettext
git-version-gen
gitlog-to-changelog
--
1.6.4.378.g88f2f
>From c05e147c0a3f4d923dbab2efb67848cd704bb7a7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 10:39:55 +0200
Subject: [PATCH 05/10] build: use gnulib's update-copyright module
* bootstrap.conf (gnulib_modules): Add update-copyright.
---
bootstrap.conf | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index c70bf42..4265775 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -77,6 +77,7 @@ gnulib_modules="
strsep
strnlen1
strsep
+ update-copyright
useless-if-before-free
vc-list-files
warnings
--
1.6.4.378.g88f2f
>From 38805ea2e6a4cb1f4334428b90cb2cf22077bec8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 11:17:57 +0200
Subject: [PATCH 06/10] rename hash.? to idu-hash.? to avoid conflict with
gnulib's hash.h
Now that gnulib's exclude module uses gnulib's hash module,
which includes a hash.h file, idutils' use of a hash.h file conflicted.
Rename the one here in idutils:
* libidu/idu-hash.c: Rename from hash.c.
* libidu/idu-hash.h: Rename from hash.h.
* libidu/idfile.h: Reflect renaming.
* libidu/idread.c: Likewise.
* libidu/idwrite.c: Likewise.
* src/mkid.c: Likewise.
* libidu/Makefile.am: Likewise.
---
libidu/Makefile.am | 2 +-
libidu/idfile.h | 4 ++--
libidu/idread.c | 2 +-
libidu/{hash.c => idu-hash.c} | 2 +-
libidu/{hash.h => idu-hash.h} | 2 +-
libidu/idwrite.c | 2 +-
po/POTFILES.in | 2 +-
src/mkid.c | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
rename libidu/{hash.c => idu-hash.c} (99%)
rename libidu/{hash.h => idu-hash.h} (99%)
diff --git a/libidu/Makefile.am b/libidu/Makefile.am
index 16589e7..b9c3dac 100644
--- a/libidu/Makefile.am
+++ b/libidu/Makefile.am
@@ -3,7 +3,7 @@
noinst_LIBRARIES = libidu.a
libidu_a_SOURCES = dynvec.c dynvec.h \
- hash.c hash.h \
+ idu-hash.c idu-hash.h \
idfile.c idfile.h \
idread.c \
idwrite.c \
diff --git a/libidu/idfile.h b/libidu/idfile.h
index 31d27a9..6c2c125 100644
--- a/libidu/idfile.h
+++ b/libidu/idfile.h
@@ -1,5 +1,5 @@
/* idfile.h -- decls for ID file header and constituent file names
- Copyright (C) 1986, 1995, 1996, 1999, 2007, 2008 Free Software Foundation,
Inc.
+ Copyright (C) 1986, 1995, 1996, 1999, 2007-2009 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <string.h>
#include "obstack.h"
-#include "hash.h"
+#include "idu-hash.h"
#include "dynvec.h"
#include "tokflags.h"
diff --git a/libidu/idread.c b/libidu/idread.c
index 0900743..a51b437 100644
--- a/libidu/idread.c
+++ b/libidu/idread.c
@@ -25,7 +25,7 @@
#include <xalloc.h>
#include <error.h>
-#include "hash.h"
+#include "idu-hash.h"
#include "idfile.h"
#include "iduglobal.h"
#include "ignore-value.h"
diff --git a/libidu/hash.c b/libidu/idu-hash.c
similarity index 99%
rename from libidu/hash.c
rename to libidu/idu-hash.c
index 50389f2..638335e 100644
--- a/libidu/hash.c
+++ b/libidu/idu-hash.c
@@ -22,7 +22,7 @@
#include <xalloc.h>
#include <error.h>
-#include "hash.h"
+#include "idu-hash.h"
#include "xnls.h"
static void hash_rehash (struct hash_table* ht);
diff --git a/libidu/hash.h b/libidu/idu-hash.h
similarity index 99%
rename from libidu/hash.h
rename to libidu/idu-hash.h
index 1391b66..4e52963 100644
--- a/libidu/hash.h
+++ b/libidu/idu-hash.h
@@ -1,4 +1,4 @@
-/* hash.h -- decls for hash table
+/* idu-hash.h -- decls for hash table
Copyright (C) 1995, 1999, 2007-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
diff --git a/libidu/idwrite.c b/libidu/idwrite.c
index effd104..d290b46 100644
--- a/libidu/idwrite.c
+++ b/libidu/idwrite.c
@@ -24,7 +24,7 @@
#include "idfile.h"
#include "ignore-value.h"
-#include "hash.h"
+#include "idu-hash.h"
#include "xnls.h"
static int file_link_qsort_compare (void const *x, void const *y);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6452444..860696c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,9 +7,9 @@ lib/quotearg.c
lib/regcomp.c
lib/xalloc-die.c
libidu/fnprint.c
-libidu/hash.c
libidu/idfile.c
libidu/idread.c
+libidu/idu-hash.c
libidu/idwrite.c
libidu/scanners.c
libidu/walker.c
diff --git a/src/mkid.c b/src/mkid.c
index 7c3c524..0a64fa3 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -42,7 +42,7 @@
#include "xnls.h"
#include "idfile.h"
-#include "hash.h"
+#include "idu-hash.h"
#include "scanners.h"
#include "iduglobal.h"
--
1.6.4.378.g88f2f
>From b0b3f0e0e971aff3b233fc9a529fbb333b62a01c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 12:02:34 +0200
Subject: [PATCH 07/10] build: avoid "make distcheck" failure and distracting
diagnostics
* testsuite/check.mk (built_programs): Rewrite so that it works.
(TESTS_ENVIRONMENT): Use $$f, not $$tst. The latter included a
$(srcdir)/ prefix that was fatal in the non-srcdir build case.
---
testsuite/check.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testsuite/check.mk b/testsuite/check.mk
index baa68b3..a03405e 100644
--- a/testsuite/check.mk
+++ b/testsuite/check.mk
@@ -14,9 +14,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
built_programs = \
- (cd $(top_builddir)/src && MAKEFLAGS= $(MAKE) -s built_programs.list)
+ echo 'spy:;@echo $$(all_programs)' \
+ | MAKEFLAGS= $(MAKE) -s -C $(top_builddir)/src -f Makefile -f - spy
# Note that the first lines are statements. They ensure that environment
# variables that can perturb tests are unset or set to expected values.
@@ -31,9 +31,9 @@ TESTS_ENVIRONMENT = \
if $(PERL) -e 'use warnings' > /dev/null 2>&1; then \
grep '^\#!/usr/bin/perl -T' "$$1" > /dev/null && T_=T || T_=; \
$(PERL) -w$$T_ -I$(srcdir) -MCoreutils \
- -M"CuTmpdir qw($$tst)" -- "$$1"; \
+ -M"CuTmpdir qw($$f)" -- "$$1"; \
else \
- echo 1>&2 "$$tst: configure did not find a usable version of Perl," \
+ echo 1>&2 "$$f: configure did not find a usable version of Perl," \
"so skipping this test"; \
(exit 77); \
fi; \
@@ -53,7 +53,7 @@ TESTS_ENVIRONMENT = \
srcdir='$(srcdir)' \
top_srcdir='$(top_srcdir)' \
CONFIG_HEADER='$(abs_top_builddir)/lib/config.h' \
- CU_TEST_NAME=`basename '$(abs_srcdir)'`,$$tst \
+ CU_TEST_NAME=`basename '$(abs_srcdir)'`,$$f \
AWK='$(AWK)' \
EGREP='$(EGREP)' \
EXEEXT='$(EXEEXT)' \
--
1.6.4.378.g88f2f
>From 74b506b9821776bcd8cfed9bdba39df06c8c24c0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 13:16:35 +0200
Subject: [PATCH 08/10] maint: make @copyright line recognizable to
update-copyright
* doc/idutils.texi: Remove "(C)" from copyright line.
---
doc/idutils.texi | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/doc/idutils.texi b/doc/idutils.texi
index 7421ac0..7b5c345 100644
--- a/doc/idutils.texi
+++ b/doc/idutils.texi
@@ -34,8 +34,7 @@ END-INFO-DIR-ENTRY
@copying
This file documents the @file{idutils} database utilities.
-Copyright @copyright{} (C) 1996, 1999, 2000, 2008-2009 Free Software
-Foundation, Inc.
+Copyright @copyright{} 1996, 1999-2000, 2008-2009 Free Software Foundation,
Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
--
1.6.4.378.g88f2f
>From 2a811d081773972d10dc2283ded3a2de63222e68 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 13:19:21 +0200
Subject: [PATCH 09/10] maint: update copyright year lists to include 2009
---
NEWS | 2 +-
libidu/dynvec.c | 2 +-
libidu/dynvec.h | 2 +-
libidu/fnprint.c | 2 +-
libidu/idfile.c | 4 ++--
libidu/idfile.h | 2 +-
libidu/idread.c | 2 +-
libidu/idwrite.c | 2 +-
libidu/scanners.c | 4 ++--
libidu/scanners.h | 2 +-
libidu/tokflags.h | 2 +-
libidu/walker.c | 4 ++--
libidu/xnls.h | 2 +-
lisp/idutils.el | 2 +-
src/fid.c | 2 +-
src/fnid.c | 2 +-
src/lid.c | 4 ++--
src/mkid.c | 2 +-
src/xtokid.c | 2 +-
testsuite/Coreutils.pm | 2 +-
testsuite/envvar-check | 2 +-
testsuite/files0-from | 2 +-
testsuite/infloop-kawa-el | 2 +-
23 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/NEWS b/NEWS
index b10c743..6769546 100644
--- a/NEWS
+++ b/NEWS
@@ -198,7 +198,7 @@ Version 1.0 - September 1987, by Greg McGary
* Initial release to comp.sources.unix
-Copyright (C) 2001-2008 Free Software Foundation, Inc.
+Copyright (C) 2001-2009 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
diff --git a/libidu/dynvec.c b/libidu/dynvec.c
index e733d28..9e64e29 100644
--- a/libidu/dynvec.c
+++ b/libidu/dynvec.c
@@ -1,5 +1,5 @@
/* dynvec.c -- dynamically growable vectors
- Copyright (C) 1995, 2007-2008 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2007-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/dynvec.h b/libidu/dynvec.h
index 6cf25d5..505317e 100644
--- a/libidu/dynvec.h
+++ b/libidu/dynvec.h
@@ -1,5 +1,5 @@
/* dynvec.h -- declarations for dynamically growable vectors
- Copyright (C) 1995, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2007-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/fnprint.c b/libidu/fnprint.c
index 813a5a9..dbe3fdd 100644
--- a/libidu/fnprint.c
+++ b/libidu/fnprint.c
@@ -1,5 +1,5 @@
/* fnprint.c -- print a list of file names
- Copyright (C) 1986, 1995, 1996, 2007-2008 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 2007-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idfile.c b/libidu/idfile.c
index 5713e08..2c9b02e 100644
--- a/libidu/idfile.c
+++ b/libidu/idfile.c
@@ -1,6 +1,6 @@
/* idfile.c -- read & write mkid database file header
- Copyright (C) 1986, 1995, 1996, 1999, 2000, 2007-2009
- Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2009 Free Software
Foundation,
+ Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idfile.h b/libidu/idfile.h
index 6c2c125..9e98c94 100644
--- a/libidu/idfile.h
+++ b/libidu/idfile.h
@@ -1,5 +1,5 @@
/* idfile.h -- decls for ID file header and constituent file names
- Copyright (C) 1986, 1995, 1996, 1999, 2007-2009 Free Software Foundation,
Inc.
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2009 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idread.c b/libidu/idread.c
index a51b437..449c2d1 100644
--- a/libidu/idread.c
+++ b/libidu/idread.c
@@ -1,5 +1,5 @@
/* idread.c -- functions to read ID database files
- Copyright (C) 1995, 1996, 1999, 2007-2009 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 1999, 2007-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/idwrite.c b/libidu/idwrite.c
index d290b46..7771d34 100644
--- a/libidu/idwrite.c
+++ b/libidu/idwrite.c
@@ -1,5 +1,5 @@
/* idwrite.c -- functions to write ID database files
- Copyright (C) 1995, 1996, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2007-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/scanners.c b/libidu/scanners.c
index 08907cb..47a5801 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -1,6 +1,6 @@
/* scanners.c -- file & directory name manipulations
- Copyright (C) 1986, 1995, 1996, 1999, 2000, 2007-2009
- Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2009 Free Software
Foundation,
+ Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/scanners.h b/libidu/scanners.h
index 86674a8..3c2ea00 100644
--- a/libidu/scanners.h
+++ b/libidu/scanners.h
@@ -1,5 +1,5 @@
/* scanners.h -- defs for interface to scanners.c
- Copyright (C) 1986, 1995, 1996, 1999, 2007-2008 Free Software Foundation,
Inc.
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2009 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/tokflags.h b/libidu/tokflags.h
index 68e1809..0de7e3e 100644
--- a/libidu/tokflags.h
+++ b/libidu/tokflags.h
@@ -1,5 +1,5 @@
/* tokflags.h -- decls for per-token flags
- Copyright (C) 1995, 1996, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2007, 2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/walker.c b/libidu/walker.c
index 8a27fec..5fe2bf4 100644
--- a/libidu/walker.c
+++ b/libidu/walker.c
@@ -1,6 +1,6 @@
/* walker.c -- nifty file-tree walker
- Copyright (C) 1986, 1995, 1996, 1999, 2000, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2008-2009 Free Software
Foundation,
+ Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/libidu/xnls.h b/libidu/xnls.h
index 669fe66..842e10d 100644
--- a/libidu/xnls.h
+++ b/libidu/xnls.h
@@ -1,5 +1,5 @@
/* xnls.h -- NLS declarations
- Copyright (C) 1996, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2007, 2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/lisp/idutils.el b/lisp/idutils.el
index 643a825..27854dc 100644
--- a/lisp/idutils.el
+++ b/lisp/idutils.el
@@ -1,5 +1,5 @@
;;; idutils.el --- emacs interface to `lid -R grep', a.k.a. `gid'
-;;; Copyright (C) 1995, 1996, 2006-2009 Free Software Foundation, Inc.
+;;; Copyright (C) 1995-1996, 2006-2009 Free Software Foundation, Inc.
;;; Greg McGary <address@hidden>.
;; This file is part of GNU idutils.
diff --git a/src/fid.c b/src/fid.c
index f4ff09d..ac56373 100644
--- a/src/fid.c
+++ b/src/fid.c
@@ -1,5 +1,5 @@
/* fid.c -- list all tokens in the given file(s)
- Copyright (C) 1986, 1995, 1996, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 2008-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/src/fnid.c b/src/fnid.c
index ddee2ec..b9c44ef 100644
--- a/src/fnid.c
+++ b/src/fnid.c
@@ -1,5 +1,5 @@
/* fnid.c -- report which files constitute an ID database
- Copyright (C) 1996, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2008-2009 Free Software Foundation, Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/src/lid.c b/src/lid.c
index 5519109..cc254aa 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -1,6 +1,6 @@
/* lid.c -- primary query interface for mkid database
- Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2008 Free Software
- Foundation, Inc.
+ Copyright (C) 1986, 1995-1996, 1999-2000, 2007-2009 Free Software
Foundation,
+ Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/src/mkid.c b/src/mkid.c
index 0a64fa3..95878da 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -1,5 +1,5 @@
/* mkid.c -- build an identifer database
- Copyright (C) 1986, 1995, 1996, 1999, 2007-2009 Free Software Foundation,
Inc.
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2009 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/src/xtokid.c b/src/xtokid.c
index 8159c43..c4a952c 100644
--- a/src/xtokid.c
+++ b/src/xtokid.c
@@ -1,5 +1,5 @@
/* idx.c -- simple interface for testing scanners scanners
- Copyright (C) 1986, 1995, 1996, 1999, 2007-2009 Free Software Foundation,
Inc.
+ Copyright (C) 1986, 1995-1996, 1999, 2007-2009 Free Software Foundation,
Inc.
Written by Greg McGary <address@hidden>
This program is free software; you can redistribute it and/or modify
diff --git a/testsuite/Coreutils.pm b/testsuite/Coreutils.pm
index bfb4f13..d1b286e 100644
--- a/testsuite/Coreutils.pm
+++ b/testsuite/Coreutils.pm
@@ -1,7 +1,7 @@
package Coreutils;
# This is a testing framework.
-# Copyright (C) 1998, 2000-2002, 2004-2008 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-2002, 2004-2009 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/testsuite/envvar-check b/testsuite/envvar-check
index bb93c16..14c541e 100644
--- a/testsuite/envvar-check
+++ b/testsuite/envvar-check
@@ -1,7 +1,7 @@
# -*- sh -*-
# Check environment variables for sane values while testing.
-# Copyright (C) 2000-2001, 2003-2004, 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2004, 2006-2009 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/testsuite/files0-from b/testsuite/files0-from
index ecc8f67..3b2018e 100755
--- a/testsuite/files0-from
+++ b/testsuite/files0-from
@@ -2,7 +2,7 @@
# Exercise the --files0-from option.
# FIXME: keep this file in sync with coreutils/tests/du/files0-from.
-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 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/testsuite/infloop-kawa-el b/testsuite/infloop-kawa-el
index ee8340e..1d019a0 100755
--- a/testsuite/infloop-kawa-el
+++ b/testsuite/infloop-kawa-el
@@ -1,7 +1,7 @@
#!/bin/sh
# This would provoke an infloop with source from 4.2+ (cvs as of 2007-01-19).
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009 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
--
1.6.4.378.g88f2f
>From 7918340c5e6057a83ea9bd4d32df3fccfa57f606 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 15 Aug 2009 17:55:31 +0200
Subject: [PATCH 10/10] maint: configure update-copyright to use intervals
* cfg.mk (update-copyright-env): Define.
---
cfg.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index b2b0055..9537c59 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -43,3 +43,5 @@ sc_tight_scope:
$(MAKE) -C src $@
include $(srcdir)/dist-check.mk
+
+update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1
--
1.6.4.378.g88f2f
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug-idutils] FYI, a few patches,
Jim Meyering <=