magic.add is not needed any more.

diff --git a/README b/README
index 08d183682c9a5522f439da39b0186096417561f5..6a7aac2ba50dabb670f8404c6bc3796423c485d4 100644 (file)
--- a/README
+++ b/README
@@ -92,11 +92,7 @@ Some points you might be interested in before installing the package:
     When this is done you will get a runnable xgettext program which
     can be used to recompute gettext.pot.
 
-2.  The package contains a file misc/magic.add.  This is intended to be
-    added to your /etc/magic file.  After adding this the `file' command
-    will recognize GNU message catalog files (.mo files).
-
-3.  If your system's C library already provides the gettext interface
+2.  If your system's C library already provides the gettext interface
     and its associated tools don't come from this package, it might be
     a good idea to configure the package with
         --program-prefix=g
@@ -104,19 +100,19 @@ Some points you might be interested in before installing the package:
     Systems affected by this are:
         Solaris 2.x
 
-4.  Some system have a very dumb^H^H^H^Hstrange version of msgfmt, the
+3.  Some system have a very dumb^H^H^H^Hstrange version of msgfmt, the
     one which comes with xview.  This one is *not* usable.  It's best
     you delete^H^H^H^H^H^Hrename it or install this package as in the
     point above with
        --program-prefix=g
 
-5.  On some system it is better to have strings aligned (I've been told
+4.  On some system it is better to have strings aligned (I've been told
     Sparcs like strings aligned to 8 byte boundaries).  If you want to
     have the output of msgfmt aligned you can use the -a option.  But you
     also could change the default value to be different from 1.  Take
     a look at the --alignment option of msgfmt.
 
-6.  The locale name alias scheme implemented here is in a similar form
+5.  The locale name alias scheme implemented here is in a similar form
     implemented in the X Window System.  Especially the alias data base
     file can be shared.  Normally this file is found at something like
 
@@ -131,7 +127,7 @@ Some points you might be interested in before installing the package:
     locale.alias.
     In the misc/ subdirectory you find an example for an alias database file.
 
-7.  The msgmerge program performs fuzzy search in the message sets.  It
+6.  The msgmerge program performs fuzzy search in the message sets.  It
     might run a long time on slow systems.  I saw this problem when running
     it on my old i386DX25.  The time can really be several minutes,
     especially if you have long messages and/or a great number of
@@ -139,7 +135,7 @@ Some points you might be interested in before installing the package:
        If you have a faster implementation of the fstrcmp() function and
     want to share it with the rest of use, please contact me.
 
-8.  On some systems it will not be possible to compile this package.
+7.  On some systems it will not be possible to compile this package.
     It is not only this package but any other GNU package, too.  These
     systems do not provide the simplest functionality to run configure.
     Today are known the following systems:

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 7731c0d1cdace1fb14a399f0737c5920ea182333..521dc8efd535d4f009fc1c8a16d00df5b3f2c24d 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-06  Bruno Haible  <haible@clisp.cons.org>
+
+       * magic.add: Remove file. Has been integrated into the 'file' package.
+       * Makefile.am (EXTRA_DIST): Remove it.
+
 2000-12-30  Bruno Haible  <haible@clisp.cons.org>
 
        * locale.alias: Move to ../intl.

diff --git a/misc/Makefile.am b/misc/Makefile.am
index 05f9ddd7014c08197571a418ff8cde0fb24a2d59..4a6197a3ab07e8af290fd8b2f5e3d5b1842df2ef 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the misc subdirectory of the GNU NLS Utilities
-## Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+## Copyright (C) 1995-1997, 2000, 2001 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
@@ -19,7 +19,7 @@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
-EXTRA_DIST = combine-sh gettext.perl gettext-sh magic.add tcl_gettext.c \
+EXTRA_DIST = combine-sh gettext.perl gettext-sh tcl_gettext.c \
 README-Tcl po-mode.el
 DISTCLEANFILES = gettextize
 lisp_LISP = po-mode.el

diff --git a/misc/magic.add b/misc/magic.add
deleted file mode 100644 (file)
index 85af567..0000000
--- a/misc/magic.add
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# GNU nlsutils message catalog file format
-#
-0      string          \336\22\4\225   GNU message catalog (little endian),
->4     lelong          x               revision %d,
->8     lelong          x               %d messages
-0      string          \225\4\22\336   GNU message catalog (big endian),
->4     belong          x               revision %d,
->8     belong          x               %d messages