SOURCES: file-debian.patch - updated for 4.20

Sun Mar 18 13:59:28 CET 2007

Author: qboosh                       Date: Sun Mar 18 12:59:28 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.20

---- Files affected:
SOURCES:
   file-debian.patch (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SOURCES/file-debian.patch
diff -u SOURCES/file-debian.patch:1.16 SOURCES/file-debian.patch:1.17

--- SOURCES/file-debian.patch:1.16	Wed Dec 20 19:59:24 2006
+++ SOURCES/file-debian.patch	Sun Mar 18 13:59:23 2007
@@ -1,27 +1,19 @@
---- file-4.19/doc/file.man.orig	2006-11-17 17:11:10.000000000 +0100
-+++ file-4.19/doc/file.man	2006-12-20 19:19:10.027798813 +0100
-@@ -1,4 +1,4 @@
--.TH FILE __CSECTION__ "Copyright but distributable"
-+.TH FILE __CSECTION__ "November 2006" "Copyright but distributable"
- .\" $Id$
- .SH NAME
- file
-@@ -56,10 +56,9 @@
- meaning anything else (data is usually `binary' or non-printable).
+--- file-4.20/doc/file.man.orig	2007-01-25 22:05:46.000000000 +0100
++++ file-4.20/doc/file.man	2007-03-18 13:32:16.817249006 +0100
+@@ -47,9 +47,8 @@
+ or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
 -When modifying the file
--.I __MAGIC__
--or the program itself, 
--.B "preserve these keywords" .
+-.Pa __MAGIC__
+-or the program itself, make sure to
 +When adding local definitions to
-+.IR /etc/magic ,
-+.BR "preserve these keywords" .
++.Pa /etc/magic ,
+ .Em "preserve these keywords" .
  People depend on knowing that all the readable files in a directory
- have the word ``text'' printed.
- Don't do as Berkeley did and change ``shell commands text''
-@@ -98,7 +97,9 @@
- The concept of `magic number' has been applied by extension to data files.
+ have the word 
+@@ -99,7 +98,9 @@
+ has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
  offset into the file can usually be described in this way.
 -The information identifying these files is read from the compiled
@@ -29,28 +21,28 @@
 +.I /etc/magic
 +and the compiled
  magic file
- .I __MAGIC__.mgc ,
+ .Pa __MAGIC__.mgc ,
  or 
-@@ -373,12 +374,6 @@
+@@ -413,12 +414,6 @@
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.
 -If your old
--.B file
+-.Nm
 -command uses a magic file,
 -keep the old magic file around for comparison purposes
 -(rename it to 
--.IR __MAGIC__.orig ).
- .SH EXAMPLES
- .nf
+-.Pa __MAGIC__.orig ).
+ .Sh EXAMPLES
+ .Bd -literal -offset indent 
  $ file file.c file /dev/{wd0a,hda}
-@@ -532,3 +527,7 @@
- .B ftp.astron.com
+@@ -592,3 +587,7 @@
+ .Dv ftp.astron.com
  in the directory
- .I /pub/file/file-X.YZ.tar.gz
-+.PP
+ .Dv /pub/file/file-X.YZ.tar.gz
++.Pp
 +This version contains some extensions from
-+.B Debian
++.Dv Debian
 +(mainly new magic entries).
 --- file-4.07.orig/magic/Header
 +++ file-4.07/magic/Header
@@ -64,18 +56,18 @@
 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
 +# this file as a wishlist bug against file (using the reportbug utility).
 +
---- file-4.19/magic/magic.mime.orig	2006-11-25 19:26:08.000000000 +0100
-+++ file-4.19/magic/magic.mime	2006-12-20 19:27:11.023209179 +0100
-@@ -193,7 +193,7 @@
- 0       beshort         0x4De1          audio/MP4A-LATM
- 
- # MPEG Layer 3 sound files
--0       beshort		&0xffe0		audio/mpeg
-+0       beshort&0xfffe  =0xfffa         audio/mpeg
+--- file-4.20/magic/magic.mime.orig	2007-01-25 23:10:35.000000000 +0100
++++ file-4.20/magic/magic.mime	2007-03-18 13:39:47.458929612 +0100
+@@ -196,7 +196,7 @@
+ # modified by Joerg Jenderek
+ # GRR the original test are too common for many DOS files
+ # so test 1 <= kbits nibble <= E
+-0       beshort		&0xffe0		
++0       beshort&0xffe0	=0xfffa
+ >2	ubyte&0xF0	>0x0F		
+ >>2	ubyte&0xF0	<0xE1		audio/mpeg
  #MP3 with ID3 tag
- 0	string		ID3		audio/mpeg
- # Ogg/Vorbis
-@@ -293,10 +293,10 @@
+@@ -298,10 +298,10 @@
  # because it tries to uncompress it to figure out what's inside.
  
  # standard unix compress
@@ -88,7 +80,7 @@
  
  0		string			PK\003\004		application/x-zip
  
-@@ -469,7 +469,7 @@
+@@ -474,7 +474,7 @@
  0	beshort		0xffd8		image/jpeg
  
  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt at uchicago.edu)
@@ -97,7 +89,7 @@
  #>14	byte		12		(OS/2 1.x format)
  #>14	byte		64		(OS/2 2.x format)
  #>14	byte		40		(Windows 3.x format)
-@@ -788,6 +788,7 @@
+@@ -801,6 +801,7 @@
  #
  0	string		FWS
  >3	byte		x			application/x-shockwave-flash
@@ -105,7 +97,7 @@
  
  # The following paramaters are created for Namazu.
  # <http://www.namazu.org/>
-@@ -936,3 +937,8 @@
+@@ -951,3 +952,8 @@
  
  # 
  128	string		DICM		application/dicom
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/file-debian.patch?r1=1.16&r2=1.17&f=u

