From 78029cd561557cb28cc66856afd7cc7b96ea3470 Mon Sep 17 00:00:00 2001
From: "Joel E. Denny" <jdenny@ces.clemson.edu>
Date: Sun, 27 Jul 2008 15:49:04 -0400
Subject: [PATCH] Remove remaining dependence on CVS Id keyword.

* ChangeLog: For the sake of people still using CVS, don't use dollars
when mentioning Id.
* data/xslt/bison.xsl: Remove Id from header comments, where it was
unusual anyway.
* data/xslt/xml2dot.xsl: Likewise.
* data/xslt/xml2text.xsl: Likewise.
* data/xslt/xml2xhtml.xsl: Likewise.
* doc/Doxyfile.in (PROJECT_NUMBER): Don't use ID.
* doc/Makefile.am (neutralize): Remove, no longer needed.
(.x.1): Don't use neutralize.
(edit): Don't substitute for ID.
(Doxyfile): Don't define Id, and thus don't depend on ChangeLog.
---
 ChangeLog               | 18 +++++++++++++++++-
 data/xslt/bison.xsl     |  3 +--
 data/xslt/xml2dot.xsl   |  3 +--
 data/xslt/xml2text.xsl  |  3 +--
 data/xslt/xml2xhtml.xsl |  1 -
 doc/Doxyfile.in         |  2 +-
 doc/Makefile.am         | 16 ++++------------
 tests/Makefile.am       |  4 ++--
 8 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f31ec68..48d80a9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	Remove remaining dependence on CVS Id keyword.
+	* ChangeLog: For the sake of people still using CVS, don't use dollars
+	when mentioning Id.
+	* data/xslt/bison.xsl: Remove Id from header comments, where it was
+	unusual anyway.
+	* data/xslt/xml2dot.xsl: Likewise.
+	* data/xslt/xml2text.xsl: Likewise.
+	* data/xslt/xml2xhtml.xsl: Likewise.
+	* doc/Doxyfile.in (PROJECT_NUMBER): Don't use ID.
+	* doc/Makefile.am (neutralize): Remove, no longer needed.
+	(.x.1): Don't use neutralize.
+	(edit): Don't substitute for ID.
+	(Doxyfile): Don't define Id, and thus don't depend on ChangeLog.
+
 2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	Fix dependence on computed configure variables.
@@ -21,7 +37,7 @@
 	* .gitignore (/.tarball-version, /GNUmakefile, /*~): Add.
 	* .prev-version: New.
 	* .version.in: Remove.
-	* ChangeLog: Remove the $Id$ previously used for capturing the CVS
+	* ChangeLog: Remove the Id previously used for capturing the CVS
 	revision.
 	* GNUmakefile: Remove, now copied from Gnulib.
 	* Makefile.am: Add code suggested by comments in
diff --git a/data/xslt/bison.xsl b/data/xslt/bison.xsl
index 30fb97e0..9a6ce8a4 100644
--- a/data/xslt/bison.xsl
+++ b/data/xslt/bison.xsl
@@ -2,9 +2,8 @@
 
 <!--
     bison.xsl - common templates for Bison XSLT.
-    $Id$
 
-    Copyright (C) 2007 Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2dot.xsl b/data/xslt/xml2dot.xsl
index e106da1e..130692e3 100644
--- a/data/xslt/xml2dot.xsl
+++ b/data/xslt/xml2dot.xsl
@@ -2,9 +2,8 @@
 
 <!--
     xml2dot.xsl - transform Bison XML Report into DOT.
-    $Id$
 
-    Copyright (C) 2007 Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index 0e4811d7..a7835129 100644
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -2,9 +2,8 @@
 
 <!--
     xml2text.xsl - transform Bison XML Report into plain text.
-    $Id$
 
-    Copyright (C) 2007 Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
     This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index b2be72b0..91dc6300 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -2,7 +2,6 @@
 
 <!--
     xml2html.xsl - transform Bison XML Report into XHTML.
-    $Id$
 
     Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index ee9c4391..61274390 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -23,7 +23,7 @@ PROJECT_NAME           = "@PACKAGE_NAME@"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = "@PACKAGE_VERSION@ @ID@"
+PROJECT_NUMBER         = "@PACKAGE_VERSION@"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0dd43727..36370fca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008 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
@@ -58,10 +59,6 @@ common_dep = $(top_srcdir)/configure $(srcdir)/common.x
 srcsrcdir = $(top_srcdir)/bin
 $(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
 
-# Output from --help and --version that must not appear in the man page.
-neutralize = \
-  perl -0777 -pi -e 's/\.PP\nId:.*\n//g'
-
 # Differences to ignore when comparing the man page (the date).
 remove_time_stamp = \
   sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
@@ -87,7 +84,6 @@ PREPATH = $(top_builddir)/src
 	    --include=$*.x						     \
 	    --include=$(srcdir)/common.x				     \
 	    --output=$@.t `echo '$*' | sed 's,.*/,,'`
-	$(neutralize) $@.t
 	if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&		     \
 	   $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then     \
 		touch $@;						     \
@@ -111,8 +107,7 @@ doc: html
 html-local: Doxyfile
 	$(DOXYGEN)
 
-edit = sed -e "s|@ID@|$$Id|" \
-	   -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 	   -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 	   -e 's,@top_builddir\@,$(top_builddir),g' \
 	   -e 's,@top_srcdir\@,$(top_srcdir),g'
@@ -121,10 +116,7 @@ EXTRA_DIST += Doxyfile.in
 CLEANFILES += Doxyfile
 # Sed is used to generate Doxyfile from Doxyfile.in instead of
 # configure, because the former is way faster than the latter.
-# Moreover, this file is updated whenever ChangeLog is touched: using
-# sed instead of configure saves us a lot of time.
-Doxyfile: $(top_srcdir)/ChangeLog $(srcdir)/Doxyfile.in
-	Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog`; \
+Doxyfile: $(srcdir)/Doxyfile.in
 	$(edit) $(srcdir)/Doxyfile.in >Doxyfile
 
 CLEANDIRS += html latex
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4a6e726..f686fdbf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,8 +2,8 @@
 
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-## Foundation, Inc.
+## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
-- 
2.47.2