second update 960907 from main archive

diff --git a/ChangeLog b/ChangeLog
index ce781aa..f2df3e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Sun Sep  8 02:36:02 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+       * locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc".
+       This is consistent with all other GNU packages.  We shouldn't
+       take care for a possible clash.  Somebody will name the domain
+       of a package libc if it is not the libc itself.
+       * MakeTAGS ($P/SYS_libc.pot): Rename to $P/libc.pot.
+       * po/Makefile (domainname): Change to libc.
+       (distribute): Now ship libc.pot.
+       * catgets/gencat.c (usage): Use `PACKAGE' for package name in
+       version information banner.
+       Change bug report address to bug-glibc@prep not @gnu.
+       * db/makedb.c (PACKAGE): New macro.  Set to _libc_intl_domain.
+       (main): Use `PACKAGE' for package name in version information
+       banner.
+       Change bug report address to bug-glibc@prep not @gnu.
+       * locale/programs/locale.c (main): Use `PACKAGE' for package name
+       in version information banner.
+       Change bug report address to bug-glibc@prep not @gnu.
+       * locale/programs/localedef.c (main): Likewise.
+
+       * version.h (VERSION): Bump to 1.94.
+
 Sat Sep  7 14:00:33 1996  David Mosberger-Tang  <davidm@azstarnet.com>
 
        * catgets/catgets.c (catopen): Allocate sizeof(*result) bytes
@@ -19,7 +42,7 @@ Sat Sep  7 19:39:19 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 Sat Sep  7 05:15:45 1996  Ulrich Drepper  <drepper@cygnus.com>
 
-       * libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
+       * libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
        * libio/iofopen: Likewise.
        * libio/iofopncook.c: Likewise.
        * libio/iopopen.c: Likewise.

diff --git a/MakeTAGS b/MakeTAGS
index dcbea93..336d63f 100644 (file)
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -166,7 +166,7 @@ $P/subdirs.pot: $(subdirs:%=$P/%.pot)
 include $(common-objpfx)version.mk
 
 # Combine all the messages into the final sorted template translation file.
-$P/SYS_libc.pot: $(all-pot)
+$P/libc.pot: $(all-pot)
        @rm -f $@.new
        sed -e 's/VERSION/$(version)/' -e "s/DATE/`date +'%Y-%m-%d %k:%M'`/" \
            po/header.pot > $@.new

diff --git a/catgets/gencat.c b/catgets/gencat.c
index 2e275fc..e989a0f 100644 (file)
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -166,7 +166,7 @@ main (int argc, char *argv[])
   if (do_version)
     {
       fprintf (stderr, "%s - GNU %s %s\n", program_invocation_name,
-              "libc", VERSION);
+              PACKAGE, VERSION);
       exit (EXIT_SUCCESS);
     }
 
@@ -213,7 +213,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n\
 is -, output is written to standard output.\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
           program_invocation_name, program_invocation_name);
 
   exit (status);

diff --git a/db/makedb.c b/db/makedb.c
index d721595..3dc5b34 100644 (file)
--- a/db/makedb.c
+++ b/db/makedb.c
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA.  */
 /* Get libc version number.  */
 #include "../version.h"
 
+#define PACKAGE _libc_intl_domainname
 
 /* Long options.  */
 static const struct option long_options[] =
@@ -112,7 +113,7 @@ main (argc, argv)
 
   /* Version information is requested.  */
   if (do_version)
-    printf ("%s - GNU %s %s\n", program_invocation_name, "libc", VERSION);
+    printf ("%s - GNU %s %s\n", program_invocation_name, PACKAGE, VERSION);
 
   /* Help is requested.  */
   if (do_help)
@@ -208,7 +209,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -u, --undo          print content of database file, one entry a line\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.\n\
-Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"),
+Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
            program_invocation_name, program_invocation_name,
            program_invocation_name);
 

diff --git a/version.h b/version.h
index 03e3001..3bc16f5 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "alpha"
-#define VERSION "1.93"
+#define VERSION "1.94"