Merge branch 'upstream'

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

9 files changed, 52 insertions, 52 deletions

diff --git a/jmake/Jmakefile b/jmake/Jmakefile
index 3394fb1..22d336a 100644
--- a/jmake/Jmakefile
+++ b/jmake/Jmakefile
@@ -2,7 +2,7 @@
  * Jmakefile for jmake
  */
 
-;# $Id: Jmakefile 173 2014-04-05 08:10:18Z rmanfredi $
+;# $Id$
 ;#
 ;#  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 ;#  
diff --git a/jmake/bindex.SH b/jmake/bindex.SH
index ee45b2e..fe46eb8 100755
--- a/jmake/bindex.SH
+++ b/jmake/bindex.SH
@@ -22,7 +22,7 @@ $spitshell >>bindex <<'!NO!SUBS!'
 	eval 'exec perl -S $0 ${1+"$@"}'
 		if $running_under_some_shell;
 
-# $Id: bindex.SH 31 2010-03-06 20:15:24Z rmanfredi $
+# $Id$
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 #  
diff --git a/jmake/files/Jmake.rules b/jmake/files/Jmake.rules
index f02bd9b..519be95 100644
--- a/jmake/files/Jmake.rules
+++ b/jmake/files/Jmake.rules
@@ -1,12 +1,12 @@
 ;########################################################################
 ;# Jmake rules for building libraries, programs, scripts, and data files
-;# $Id: Jmake.rules 195 2015-04-27 21:30:17Z rmanfredi $
+;# $Id$
 
 /*
  *		   MACHINE-INDEPENDENT RULES -- DO NOT MODIFY
  */
 
-/* $Id: Jmake.rules 195 2015-04-27 21:30:17Z rmanfredi $
+/* $Id$
  *
  *  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
  *  
diff --git a/jmake/files/Jmake.tmpl b/jmake/files/Jmake.tmpl
index 7765fba..313f795 100644
--- a/jmake/files/Jmake.tmpl
+++ b/jmake/files/Jmake.tmpl
@@ -1,7 +1,7 @@
 /*
  * Generic jmake template
  *
- * $Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $
+ * $Id$
  *
  *  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
  *  
@@ -27,7 +27,7 @@
  */
 
 : Makefile.SH generated from Jmake.tmpl and Jmakefile <TAG>
-: $Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $
+: $Id$
 
 /*************************************************************************
  *                                                                       *
diff --git a/jmake/fixcpp.SH b/jmake/fixcpp.SH
index fa816f4..ef2ddad 100755
--- a/jmake/fixcpp.SH
+++ b/jmake/fixcpp.SH
@@ -21,7 +21,7 @@ $startperl
 	eval 'exec perl -S \$0 \${1+"\$@"}'
 		if \$running_under_some_shell;
 
-# $Id: fixcpp.SH 42 2010-11-28 18:15:13Z rmanfredi $
+# $Id$
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 #  
diff --git a/jmake/jmake.SH b/jmake/jmake.SH
index 6f97180..3aa3c6d 100755
--- a/jmake/jmake.SH
+++ b/jmake/jmake.SH
@@ -21,7 +21,7 @@ $startperl
 	eval 'exec perl -S \$0 \${1+"\$@"}'
 		if \$running_under_some_shell;
 
-# $Id: jmake.SH 47 2010-11-28 22:23:13Z rmanfredi $
+# $Id$
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 #  
diff --git a/jmake/jmake.man b/jmake/jmake.man
index bbc36ac..43fa694 100644
--- a/jmake/jmake.man
+++ b/jmake/jmake.man
@@ -1,28 +1,28 @@
-.\" $Id: jmake.man 47 2010-11-28 22:23:13Z rmanfredi $
-.\"
-.\"  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-.\"
-.\"  You may redistribute only under the terms of the Artistic Licence,
-.\"  as specified in the README file that comes with the distribution.
-.\"  You may reuse parts of this distribution only within the terms of
-.\"  that same Artistic Licence; a copy of which may be found at the root
-.\"  of the source tree for dist 4.0.
-.\"
-.\" $Log: jmake.man,v $
-.\" Revision 3.0.1.3  2004/08/22 09:01:55  ram
-.\" patch71: renamed |test as |case as the construct has its syntax
-.\" patch71: added |subst section to allow variable substitutions
-.\"
-.\" Revision 3.0.1.2  2004/08/21 23:19:52  ram
-.\" patch71: added '|shell' section to emit verbatim code in Makefile.SH
-.\" patch71: new '|test' to conditionally generate Makefile sections
-.\"
-.\" Revision 3.0.1.1  1995/05/12  11:57:58  ram
-.\" patch54: updated my e-mail address
-.\"
-.\" Revision 3.0  1993/08/18  12:04:18  ram
-.\" Baseline for dist 3.0 netwide release.
-.\"
+''' $Id$
+'''
+'''  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
+'''
+'''  You may redistribute only under the terms of the Artistic Licence,
+'''  as specified in the README file that comes with the distribution.
+'''  You may reuse parts of this distribution only within the terms of
+'''  that same Artistic Licence; a copy of which may be found at the root
+'''  of the source tree for dist 4.0.
+'''
+''' $Log: jmake.man,v $
+''' Revision 3.0.1.3  2004/08/22 09:01:55  ram
+''' patch71: renamed |test as |case as the construct has its syntax
+''' patch71: added |subst section to allow variable substitutions
+'''
+''' Revision 3.0.1.2  2004/08/21 23:19:52  ram
+''' patch71: added '|shell' section to emit verbatim code in Makefile.SH
+''' patch71: new '|test' to conditionally generate Makefile sections
+'''
+''' Revision 3.0.1.1  1995/05/12  11:57:58  ram
+''' patch54: updated my e-mail address
+'''
+''' Revision 3.0  1993/08/18  12:04:18  ram
+''' Baseline for dist 3.0 netwide release.
+'''
 .TH JMAKE 1 ram
 .SH NAME
 jmake \- a generic makefile builder
diff --git a/jmake/jmkmf.SH b/jmake/jmkmf.SH
index ebae15e..64edf18 100755
--- a/jmake/jmkmf.SH
+++ b/jmake/jmkmf.SH
@@ -21,7 +21,7 @@ $startsh
 $spitshell >>jmkmf <<'!NO!SUBS!'
 # @(#) Generates a Makefile from a Jmakefile
 
-# $Id: jmkmf.SH 1 2006-08-24 12:32:52Z rmanfredi $
+# $Id$
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 #  
diff --git a/jmake/jmkmf.man b/jmake/jmkmf.man
index 051c143..0aec07b 100644
--- a/jmake/jmkmf.man
+++ b/jmake/jmkmf.man
@@ -1,20 +1,20 @@
-.\" $Id: jmkmf.man 3 2006-08-25 21:39:07Z rmanfredi $
-.\"
-.\"  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-.\"  
-.\"  You may redistribute only under the terms of the Artistic Licence,
-.\"  as specified in the README file that comes with the distribution.
-.\"  You may reuse parts of this distribution only within the terms of
-.\"  that same Artistic Licence; a copy of which may be found at the root
-.\"  of the source tree for dist 4.0.
-.\"
-.\" $Log: jmkmf.man,v $
-.\" Revision 3.0.1.1  1995/05/12  11:58:03  ram
-.\" patch54: updated my e-mail address
-.\"
-.\" Revision 3.0  1993/08/18  12:04:20  ram
-.\" Baseline for dist 3.0 netwide release.
-.\"
+''' $Id$
+'''
+'''  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
+'''
+'''  You may redistribute only under the terms of the Artistic Licence,
+'''  as specified in the README file that comes with the distribution.
+'''  You may reuse parts of this distribution only within the terms of
+'''  that same Artistic Licence; a copy of which may be found at the root
+'''  of the source tree for dist 4.0.
+'''
+''' $Log: jmkmf.man,v $
+''' Revision 3.0.1.1  1995/05/12  11:58:03  ram
+''' patch54: updated my e-mail address
+'''
+''' Revision 3.0  1993/08/18  12:04:20  ram
+''' Baseline for dist 3.0 netwide release.
+'''
 .TH JMKMF 1 ram
 .SH NAME
 jmkmf \- runs jmake with the correct options
@@ -66,7 +66,7 @@ end of the name as in
 and
 .I make Makefiles.
 .SH AUTHOR
-Raphael Manfredi <ram@hptnos02.grenoble.hp.com>
+Raphael Manfredi <Raphael.Manfredi@pobox.com>
 .SH FILES
 .PD 0
 .TP 20