FYI: 55-gary-gnu-version-standards.patch

[Gary V. Vaughan]

Applied to HEAD.
--
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * config/mkstamp: Change output format to ` $rev $date'.
        * configure.ac: Make the banner more like suggestions in
        http://www.gnu.org/prep/standards_toc.html Section 4.6.
        * libtoolize.in: Make --version output conform to the GNU
        standard.
        * ltmain.in: Ditto. And tweak the generated file headers to
        match.

Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.26
diff -u -p -u -r1.26 configure.ac
--- configure.ac 25 Nov 2003 15:48:22 -0000 1.26
+++ configure.ac 26 Nov 2003 12:33:59 -0000
@@ -96,7 +96,7 @@ TIMESTAMP=
 case $LT_ALPHA in
   [[acegikmoqsuwy]])
     TIMESTAMP=`${CONFIG_SHELL} ${ac_aux_dir}/mkstamp < ${srcdir}/ChangeLog`
-    AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION$TIMESTAMP])
+    AS_BOX([Configuring AC_PACKAGE_TARNAME (Build:$TIMESTAMP) 
AC_PACKAGE_VERSION])
     echo
     ;;
 esac
Index: libtoolize.in
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.in,v
retrieving revision 1.28
diff -u -p -u -r1.28 libtoolize.in
--- libtoolize.in 7 Nov 2003 14:04:16 -0000 1.28
+++ libtoolize.in 26 Nov 2003 12:33:59 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# libtoolize (GNU @PACKAGE@) @VERSION@@TIMESTAMP@
+# libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
 # Written by Gary V. Vaughan <address@hidden>
 
 # Copyright (C) 2003 Free Software Foundation, Inc.
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.359
diff -u -p -u -r1.359 ltmain.in
--- ltmain.in 22 Nov 2003 14:12:57 -0000 1.359
+++ ltmain.in 26 Nov 2003 12:33:59 -0000
@@ -245,7 +245,7 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    $echo "$PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION"
     $echo
     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
     $echo "This is free software; see the source for copying conditions.  
There is NO"
@@ -660,7 +660,7 @@ compiler."
     # but don't create it if we're doing a dry run.
     test -z "$run" && cat > ${libobj}T <<EOF
 # $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -4300,7 +4300,7 @@ EOF
 
          test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
 /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
@@ -4630,7 +4630,7 @@ static const void *lt_preloaded_setup() 
            cat > $cwrappersource <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
@@ -4964,7 +4964,7 @@ EOF
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -5395,7 +5395,7 @@ fi\
          esac
          $echo > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
Index: config/mkstamp
===================================================================
RCS file: /cvsroot/libtool/libtool/config/mkstamp,v
retrieving revision 1.1
diff -u -p -u -r1.1 mkstamp
--- config/mkstamp 25 Sep 2003 11:22:27 -0000 1.1
+++ config/mkstamp 26 Nov 2003 12:33:59 -0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # mkstamp - extract data from Revision and Date RCS tags in a file
-# Copyright (C) 1999 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2003 Free Software Foundation, Inc.
 # Alexandre Oliva <address@hidden>
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -24,14 +24,14 @@
 # the same distribution terms that you use for the rest of that program.
 
 # This script expects to find a line containing both Revision and Date
-# tags, and it edits this line so that it looks line ` ($rev $date)'
+# tags, and it edits this line so that it looks like ` $rev $date'
 
 # Command-line arguments are passed down to sed; additional -e cmd
 # arguments are acceptable.  If no input filename is specified in the
 # command line, sed will read from stdin.
 
 exec sed -e '
-       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% (\1 \2)%
+       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% \1 \2%
        t end
        d
        : end' ${1+"$@"}

pgp7RiqHcCnfJ.pgp
Description: PGP signature