summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2005-08-18 15:52:54 +0000
committerChristos Zoulas <christos@zoulas.com>2005-08-18 15:52:54 +0000
commitbc2b379d131b13f34cd8bf051560d178eba50aab (patch)
tree856f03b86566693970eca5b82f6d44afecbe5a3c
parent538024a13d5046f1b955b3cc269bded030b501a3 (diff)
downloadfile-git-FILE4_15.tar.gz
welcome to 5.15FILE4_15
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--magic/Magdir/audio2
-rw-r--r--magic/Magdir/scientific3
-rw-r--r--src/patchlevel.h7
5 files changed, 9 insertions, 7 deletions
diff --git a/configure b/configure
index 760f1d94..745b1d3f 100755
--- a/configure
+++ b/configure
@@ -1808,7 +1808,7 @@ fi
# Define the identity of the package.
PACKAGE=file
- VERSION=4.14
+ VERSION=4.15
cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 44e5bc0d..a2f5c134 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT
AC_CONFIG_SRCDIR([src/file.c])
-AM_INIT_AUTOMAKE(file, 4.14)
+AM_INIT_AUTOMAKE(file, 4.15)
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index 32e4d43f..96171f4e 100644
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -432,7 +432,7 @@
# From: Alex Beregszaszi <alex@fsn.hu>
0 string MP+ Musepack
->3s byte&0x0f x SV%d
+>3 byte&0x0f x SV%d
0 string \0BONK BONK,
#>5 byte x version %d
diff --git a/magic/Magdir/scientific b/magic/Magdir/scientific
index 8554c265..81beac12 100644
--- a/magic/Magdir/scientific
+++ b/magic/Magdir/scientific
@@ -52,8 +52,7 @@
>>772 belong >0 \b%d
-1028 string MMX\000\000\000\000\000\000\000\000\000\000\000\000\000 MAR Area
-Detector Image,
+1028 string MMX\000\000\000\000\000\000\000\000\000\000\000\000\000 MAR Area Detector Image,
>1072 ulong >1 Compressed(%d),
>1100 ulong >1 %d headers,
>1104 ulong >0 %d x
diff --git a/src/patchlevel.h b/src/patchlevel.h
index ad28fee3..fd0afefe 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -1,11 +1,14 @@
#define FILE_VERSION_MAJOR 4
-#define patchlevel 14
+#define patchlevel 15
/*
* Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.57 2005/06/25 15:52:14 christos Exp $
+ * $Id: patchlevel.h,v 1.58 2005/08/18 15:52:56 christos Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.58 2005/08/18 15:52:56 christos
+ * welcome to 5.15
+ *
* Revision 1.57 2005/06/25 15:52:14 christos
* Welcome to 4.14
*