SOURCES: file-debian.patch - updated for 4.19

Wed Dec 20 19:59:29 CET 2006

Author: qboosh                       Date: Wed Dec 20 18:59:29 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.19

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

---- Diffs:

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

--- SOURCES/file-debian.patch:1.15	Mon Nov 13 16:28:07 2006
+++ SOURCES/file-debian.patch	Wed Dec 20 19:59:24 2006
@@ -1,8 +1,8 @@
---- file-4.18/doc/file.man.orig	2006-05-03 21:20:25.000000000 +0200
-+++ file-4.18/doc/file.man	2006-11-13 16:15:03.159505000 +0100
+--- 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__ "May 2006" "Copyright but distributable"
++.TH FILE __CSECTION__ "November 2006" "Copyright but distributable"
  .\" $Id$
  .SH NAME
  file
@@ -31,7 +31,7 @@
  magic file
  .I __MAGIC__.mgc ,
  or 
-@@ -369,12 +370,6 @@
+@@ -373,12 +374,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.
@@ -44,7 +44,7 @@
  .SH EXAMPLES
  .nf
  $ file file.c file /dev/{wd0a,hda}
-@@ -528,3 +523,7 @@
+@@ -532,3 +527,7 @@
  .B ftp.astron.com
  in the directory
  .I /pub/file/file-X.YZ.tar.gz
@@ -52,17 +52,6 @@
 +This version contains some extensions from
 +.B Debian
 +(mainly new magic entries).
---- file-4.07.orig/src/Makefile.am
-+++ file-4.07/src/Makefile.am
-@@ -4,7 +4,7 @@
- 
- bin_PROGRAMS = file
- 
--AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
-+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- 
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
- 	compress.c is_tar.c readelf.c print.c fsmagic.c \
 --- file-4.07.orig/magic/Header
 +++ file-4.07/magic/Header
 @@ -1,5 +1,5 @@
@@ -75,9 +64,9 @@
 +# 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.17/magic/magic.mime.orig	2006-03-02 22:50:32.000000000 +0100
-+++ file-4.17/magic/magic.mime	2006-03-19 11:46:24.803922750 +0100
-@@ -195,7 +195,7 @@
+--- 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
@@ -86,7 +75,7 @@
  #MP3 with ID3 tag
  0	string		ID3		audio/mpeg
  # Ogg/Vorbis
-@@ -295,10 +295,10 @@
+@@ -293,10 +293,10 @@
  # because it tries to uncompress it to figure out what's inside.
  
  # standard unix compress
@@ -99,34 +88,7 @@
  
  0		string			PK\003\004		application/x-zip
  
-@@ -399,19 +399,14 @@
- #
- # from Daniel Quinlan <quinlan at yggdrasil.com>
- #
--0	string		\<HEAD	text/html
--0	string		\<head	text/html
--0	string		\<TITLE	text/html
--0	string		\<title	text/html
--0       string          \<html	text/html
--0       string          \<HTML	text/html
-+0	string/cB	\<!DOCTYPE\ html	text/html
-+0	string/cb	\<head	text/html
-+0	string/cb	\<title	text/html
-+0       string/bc	\<html	text/html
- 0	string		\<!--	text/html
--0	string		\<h1	text/html
--0	string		\<H1	text/html
--0	string		\<!doctype\ HTML	text/html
--0	string		\<!DOCTYPE\ HTML	text/html
--0	string		\<!doctype\ html	text/html
--0	string		\<!doctype\ HTML	text/html
-+0	string/c	\<h1	text/html
-+
-+0	string		\<?xml			text/xml
- 
- #------------------------------------------------------------------------------
- # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
-@@ -474,7 +469,7 @@
+@@ -469,7 +469,7 @@
  0	beshort		0xffd8		image/jpeg
  
  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt at uchicago.edu)
@@ -135,18 +97,18 @@
  #>14	byte		12		(OS/2 1.x format)
  #>14	byte		64		(OS/2 2.x format)
  #>14	byte		40		(Windows 3.x format)
-@@ -789,6 +784,7 @@
+@@ -788,6 +788,7 @@
  #
- 0	string		FWS             
+ 0	string		FWS
  >3	byte		x			application/x-shockwave-flash
 +0	string		CWS			application/x-shockwave-flash
  
  # The following paramaters are created for Namazu.
  # <http://www.namazu.org/>
-@@ -924,3 +920,8 @@
- # From: Denis Knauf, via gentoo.
- 0	string	fLaC		audio/x-flac
- 0	string	CWS		application/x-shockwave-flash
+@@ -936,3 +937,8 @@
+ 
+ # 
+ 128	string		DICM		application/dicom
 +
 +# Gnumeric spreadsheet
 +# This entry is only semi-helpful, as Gnumeric compresses its files, so
================================================================

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

