[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: It's 2007
From: |
Jim Meyering |
Subject: |
Re: It's 2007 |
Date: |
Thu, 04 Jan 2007 14:57:38 +0100 |
Eric Blake <address@hidden> wrote:
> According to Jim Meyering on 1/1/2007 11:18 AM:
>>>> * lib/version-etc.c (COPYRIGHT_YEAR): Bump for new year.
>>
>> FYI, coreutils' Makefile.maint has a rule (copyright-check)
>> to check for that. So it would have been fixed right after
>> my first coreutils "make distcheck" of the new year.
>
> Ah, but it does not check for the correct copyright in src/groups.sh; the
> latest checkout gives the wrong year for 'groups --version'. For that
> matter, couldn't you automate the conversion of groups.sh => groups to
> define @YEAR@ as an autoconf substitution of the year of the most recent
> ChangeLog entry?
Good catch.
Thanks for the suggestion.
2007-01-04 Jim Meyering <address@hidden>
Ensure that "group --version" always prints the current year.
* src/groups.sh (version): Use @CURRENT_YEAR@, rather than 2006.
* src/Makefile.am (.sh): Also substitute for @address@hidden
Suggestion from Eric Blake.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c39ee0..ddd13ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-## 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1990, 1991, 1993-2007 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
@@ -120,6 +119,7 @@ SUFFIXES = .sh
rm -f $@ address@hidden
sed \
-e 's!@''bindir''@!$(bindir)!' \
+ -e 's/@''CURRENT_YEAR'@/`date +%Y`/ \
-e 's/@''GNU_PACKAGE''@/$(GNU_PACKAGE)/' \
-e 's/@''PACKAGE_BUGREPORT''@/$(PACKAGE_BUGREPORT)/' \
-e 's/@''VERSION''@/$(VERSION)/' $< > address@hidden
diff --git a/src/groups.sh b/src/groups.sh
index 86343fc..f416fdb 100755
--- a/src/groups.sh
+++ b/src/groups.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# groups -- print the groups a user is in
-# Copyright (C) 1991, 1997, 2000, 2002, 2004, 2006 Free Software Foundation,
Inc.
+# Copyright (C) 1991, 1997, 2000, 2002, 2004-2007 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
@@ -32,7 +32,7 @@ Same as id -Gn. If no USERNAME, use current process.
Report bugs to <@PACKAGE_BUGREPORT@>."
version='groups (@GNU_PACKAGE@) @VERSION@
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) @CURRENT_YEAR@ Free Software Foundation, Inc.
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.
--
1.4.4.3.g5485
- Re: It's 2007, Eric Blake, 2007/01/04
- Re: It's 2007,
Jim Meyering <=