prepare for 4.02

diff --git a/ChangeLog b/ChangeLog
index 97a46bedf7a45a3b42e5efe365ed17505fc1767c..227994eab6de39e89a3d508fb9b159064d44d143 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-02 13:50  Christos Zoulas  <christos@zoulas.com>
+
+       * Magic additions (Alex Ott)
+       * Fix bug that broke VPATH compilation (Peter Breitenlohner)
+
 2003-03-28 16:03  Christos Zoulas  <christos@zoulas.com>
 
        * remove packed attribute from magic struct.

diff --git a/configure.in b/configure.in
index 258ae6f5e7ecf110f42fc7ea579e4cb17584a83e..aeb29da542b4d15636a034f47bc16110ebbfe5ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/file.c)
-AM_INIT_AUTOMAKE(file, 4.01)
+AM_INIT_AUTOMAKE(file, 4.02)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 

diff --git a/magic/Magdir/commands b/magic/Magdir/commands
index a9dd089bf8e09f82ffbc3343a5c6abd205d8997d..35d0e32eaacc6acea491e2e8a265ed4fb39a9ea9 100644 (file)
--- a/magic/Magdir/commands
+++ b/magic/Magdir/commands
@@ -13,6 +13,8 @@
 
 #
 # zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson)
+0      string/b        #!\ /bin                Paul Falstad's zsh script text executable
+0      string/b        #!\ /usr/bin            Paul Falstad's zsh script text executable
 0      string/b        #!\ /usr/local/bin/zsh  Paul Falstad's zsh script text executable
 0      string/b        #!\ /usr/local/bin/ash  Neil Brown's ash script text executable
 0      string/b        #!\ /usr/local/bin/ae   Neil Brown's ae script text executable

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 27a38ebb4a16e6f9ca57a5a9777885ba1f60ac21..19130733832762ff9b7afd5c8c386df661348b39 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -359,3 +359,6 @@
 >>14   leshort         x      %hd dpi,
 >2     byte            0       uncompressed
 >2     byte            1       RLE compressed
+
+# Adobe Photoshop
+0      string          8BPS Adobe Photoshop Image

diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index a81eb9352a2bd5e7ace260af59611806d516ecdb..fc8f0e601fa1bd21ab2d9b0c31941afac1a829fe 100644 (file)
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -56,6 +56,8 @@
 >8      string          AVI\            \b, AVI
 # Animated Cursor format
 >8     string          ACON            \b, animated cursor
+# Corel Draw Picture
+>8     string          CDRA            \b, Corel Draw Picture
 
 #
 # XXX - some of the below may only appear in little-endian form.
@@ -99,6 +101,8 @@
 >8     string          ACON            \b, animated cursor
 # Notation Interchange File Format (big-endian only)
 >8     string          NIFF            \b, Notation Interchange File Format
+# Corel Draw Picture
+>8     string          CDRA            \b, Corel Draw Picture
 
 # SoundFont 2 <mpruett@sgi.com>
 >8     string          sfbk            SoundFont 2

diff --git a/magic/Makefile.am b/magic/Makefile.am
index 21f549a3e70bcbc409a7fa524598bb16af3576d2..1971943ba518adc31e496d754b13fb0caa5fd161 100644 (file)
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -16,10 +16,10 @@ magic: Header Localstuff $(magic_FRAGMENTS)
        done >> $@
 
 magic.mgc: magic
-       $(top_builddir)/src/file -C -m magic
+       $(top_builddir)/src/file -C -m $(srcdir)/magic
 
 magic.mime.mgc: magic.mime
-       $(top_builddir)/src/file -C -m magic.mime
+       $(top_builddir)/src/file -C -m $(srcdir)/magic.mime
 
 magic_FRAGMENTS = \
 Magdir/acorn \

diff --git a/magic/magic.mime b/magic/magic.mime
index c9ae6ba8cd140775de0feac747174dddf3f5f391..3112da62f23aa92a8e272152a653d1805dcf7dbf 100644 (file)
--- a/magic/magic.mime
+++ b/magic/magic.mime
@@ -92,6 +92,8 @@
 >8     string          AVI             video/x-msvideo
 #
 0      belong          0x2e7261fd      application/x-realaudio
+>8     string          CDRA            image/x-coreldraw
+
 
 # MPEG Layer 3 sound files
 0       beshort                &0xffe0         audio/mpeg
@@ -549,3 +551,6 @@
 # specifications at http://hdf.ncsa.uiuc.edu/
 0      belong          0x0e031301      Hierarchical Data Format (version 4) data
 0      string          \211HDF\r\n\032 Hierarchical Data Format (version 5) data
+
+# Adobe Photoshop
+0      string          8BPS                    image/x-photoshop

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 905cc4ee5002724698bbfd15735971493d2c153f..9590737ccc00b0ad18800044825d0e93d4763732 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -1,11 +1,14 @@
 #define        FILE_VERSION_MAJOR      4
-#define        patchlevel              01
+#define        patchlevel              2
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.45 2003/03/26 15:37:25 christos Exp $
+ * $Id: patchlevel.h,v 1.46 2003/04/02 18:57:43 christos Exp $
  *
  * $Log: patchlevel.h,v $
+ * Revision 1.46  2003/04/02 18:57:43  christos
+ * prepare for 4.02
+ *
  * Revision 1.45  2003/03/26 15:37:25  christos
  * - Pass lint
  * - make NULL in magic_file mean stdin