Author: adamg Date: Sun May 3 18:18:15 2009 GMT Module: packages Tag: HEAD ---- Log message: - updated to file-5.01
---- Files affected: packages/file: file-debian.patch (1.24 -> 1.25) ---- Diffs: ================================================================ Index: packages/file/file-debian.patch diff -u packages/file/file-debian.patch:1.24 packages/file/file-debian.patch:1.25 --- packages/file/file-debian.patch:1.24 Sun Mar 15 14:47:37 2009 +++ packages/file/file-debian.patch Sun May 3 20:18:10 2009 @@ -1,13 +1,23 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 202-magic-update-awk.dpatch by Werner Fink <[email protected]> -## -## DP: Updates (and re-enables) awk magic. - -...@dpatch@ - -diff -Naurp file-4.24.orig/magic/Magdir/commands file-4.24/magic/Magdir/commands ---- file-4.24.orig/magic/Magdir/commands 2008-05-04 14:12:49.000000000 +0000 -+++ file-4.24/magic/Magdir/commands 2008-05-21 09:36:15.000000000 +0000 +Author: Daniel Baumann <[email protected]> +Description: Addding mime to asf magic. + +diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation +--- file.orig/magic/Magdir/animation 2008-11-07 22:49:20.000000000 +0000 ++++ file/magic/Magdir/animation 2009-02-18 11:57:43.000000000 +0000 +@@ -697,6 +697,7 @@ + + # Microsoft Advanced Streaming Format (ASF) <[email protected]> + 0 belong 0x3026b275 Microsoft ASF ++!:mime video/x-ms-asf + + # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/> + 0 string \x8aMNG MNG video data, +Author: Werner Fink <[email protected]> +Description: Updates (and re-enables) awk magic. + +diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands +--- file.orig/magic/Magdir/commands 2008-05-04 14:12:49.000000000 +0000 ++++ file/magic/Magdir/commands 2008-05-21 09:36:15.000000000 +0000 @@ -49,6 +49,7 @@ # update to distinguish from *.vcf files # this is broken because postscript has /EBEGIN{ for example. @@ -16,16 +26,29 @@ # AT&T Bell Labs' Plan 9 shell 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable -#!/bin/sh /usr/share/dpatch/dpatch-run -## 203-magic-update-reiserfs.dpatch by Werner Fink <[email protected]> -## -## DP: Updating reiserfs magic to detect ReiserFS V3.6.19. - -...@dpatch@ - -diff -Naurp file-4.24.orig/magic/Magdir/filesystems file-4.24/magic/Magdir/filesystems ---- file-4.24.orig/magic/Magdir/filesystems 2008-05-04 14:12:49.000000000 +0000 -+++ file-4.24/magic/Magdir/filesystems 2008-05-21 09:43:04.000000000 +0000 +Author: Daniel Baumann <[email protected]> +Description: Adding another shebang path for bash. + +diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands +--- file.orig/magic/Magdir/commands 2008-04-16 12:28:04.000000000 +0000 ++++ file/magic/Magdir/commands 2009-02-18 11:58:44.000000000 +0000 +@@ -56,6 +56,10 @@ + # bash shell magic, from Peter Tobias ([email protected]) + 0 string/b #!\ /bin/bash Bourne-Again shell script text executable + !:mime text/x-shellscript ++0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable ++!:mime text/x-shellscript ++0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable ++!:mime text/x-shellscript + 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable + !:mime text/x-shellscript + +Author: Werner Fink <[email protected]> +Description: Updating reiserfs magic to detect ReiserFS V3.6.19. + +diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems +--- file.orig/magic/Magdir/filesystems 2008-05-04 14:12:49.000000000 +0000 ++++ file/magic/Magdir/filesystems 2008-05-21 09:43:04.000000000 +0000 @@ -1178,6 +1178,7 @@ # reiserfs - [email protected] 0x10034 string ReIsErFs ReiserFS V3.5 @@ -34,30 +57,8 @@ >0x1002c leshort x block size %d >0x10032 leshort &2 (mounted or unclean) >0x10000 lelong x num blocks %d -#!/bin/sh /usr/share/dpatch/dpatch-run -## 204-magic-update-asf.dpatch by Daniel Baumann <[email protected]> -## -## DP: Add mime to asf magic. - -...@dpatch@ - -diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation ---- file.orig/magic/Magdir/animation 2008-05-26 23:24:27.000000000 +0200 -+++ file/magic/Magdir/animation 2008-05-31 15:03:45.000000000 +0200 -@@ -686,6 +686,7 @@ - - # Microsoft Advanced Streaming Format (ASF) <[email protected]> - 0 belong 0x3026b275 Microsoft ASF -+!:mime video/x-ms-asf - - # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/> - 0 string \x8aMNG MNG video data, -#!/bin/sh /usr/share/dpatch/dpatch-run -## 205-magic-update-tcsh.dpatch -## -## DP: Add another shebang path for tcsh. - -...@dpatch@ +Author: Daniel Baumann <[email protected]> +Description: Addding another shebang path for tcsh. diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands --- file.orig/magic/Magdir/commands 2008-04-16 12:28:04.000000000 +0000 @@ -71,33 +72,8 @@ 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable !:mime text/x-shellscript 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable -#!/bin/sh /usr/share/dpatch/dpatch-run -## 206-magic-update-bash.dpatch -## -## DP: Add another shebang path for bash. - -...@dpatch@ - -diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands ---- file.orig/magic/Magdir/commands 2008-07-15 13:31:02.000000000 +0000 -+++ file/magic/Magdir/commands 2008-07-15 13:30:55.000000000 +0000 -@@ -58,6 +58,10 @@ o string/b #!\ /usr/bin/tcsh Tenex C she - # bash shell magic, from Peter Tobias ([email protected]) - 0 string/b #!\ /bin/bash Bourne-Again shell script text executable - !:mime text/x-shellscript -+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable -+!:mime text/x-shellscript -+0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable -+!:mime text/x-shellscript - 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable - !:mime text/x-shellscript - -#!/bin/sh /usr/share/dpatch/dpatch-run -## 207-magic-update-zip.dpatch -## -## DP: Update zip magic. - -...@dpatch@ +Author: n/a +Description: Updating zip magic. diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos --- file.orig/magic/Magdir/msdos 2008-05-31 22:17:03.000000000 +0200 @@ -111,12 +87,8 @@ >(8.s*16) search/0x20 PKSFX \b, ZIP self-extracting archive (PKZIP) # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive # -#!/bin/sh /usr/share/dpatch/dpatch-run -## 207-magic-update-real.dpatch -## -## DP: Update RealMedia magic. - -...@dpatch@ +Author: n/a +Description: Update RealMedia magic. diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio --- file.orig/magic/Magdir/audio 2008-05-31 22:17:03.000000000 +0200 @@ -130,12 +102,8 @@ !:mime application/vnd.rn-realmedia #video/x-pn-realvideo #video/vnd.rn-realvideo -#!/bin/sh /usr/share/dpatch/dpatch-run -## 209-magic-update-os2.dpatch -## -## DP: Update OS/2 REXX magic. - -...@dpatch@ +Author: n/a +Description: Updating OS/2 REXX magic. diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos --- file.orig/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200 @@ -153,12 +121,8 @@ 0 leshort 0x14c MS Windows COFF Intel 80386 object file #>4 ledate x stamp %s -#!/bin/sh /usr/share/dpatch/dpatch-run -## 210-magic-update-digifax.dpatch -## -## DP: Update Digifax magic. - -...@dpatch@ +Author: n/a +Description: Updating Digifax magic. diff -Naurp file.orig/magic/Magdir/modem file/magic/Magdir/modem --- file.orig/magic/Magdir/modem 2008-06-13 15:00:30.000000000 +0200 @@ -176,12 +140,8 @@ 0 short 0x0100 raw G3 data, byte-padded 0 short 0x1400 raw G3 data -#!/bin/sh /usr/share/dpatch/dpatch-run -## 211-magic-update-mono.dpatch -## -## DP: Update Mono magic. - -...@dpatch@ +Author: n/a +Description: Updating Mono magic. diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos --- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000 @@ -194,12 +154,8 @@ >>&0xf4 search/0x140 \x0\x40\x1\x0 >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive -#!/bin/sh /usr/share/dpatch/dpatch-run -## 212-magic-update-pfm.dpatch -## -## DP: Update pfm magic. - -...@dpatch@ +Author: n/a +Description: Updating pfm magic. diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos --- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000 @@ -218,12 +174,8 @@ #0 string \000\001 pfm? #>3 string \022\000\000Copyright\ yes #>3 string \002\000\000Copyright\ yes -#!/bin/sh /usr/share/dpatch/dpatch-run -## 213-magic-update-ocaml.dpatch by Eric Cooper <[email protected]> -## -## DP: Update ocaml magic (Closes: #488992). - -...@dpatch@ +Author: Eric Cooper <[email protected]> +Description: Updating ocaml magic (Closes: #488992). diff -Naurp file.orig/magic/Magdir/ocaml file/magic/Magdir/ocaml --- file.orig/magic/Magdir/ocaml 2008-07-15 14:13:20.000000000 +0000 @@ -243,12 +195,8 @@ >8 string N abstract syntax tree interface file ->9 string >\0 (Version %3.3s). +>9 string >\0 (Version %3.3s) -#!/bin/sh /usr/share/dpatch/dpatch-run -## 214-magic-update-linuxswap.dpatch by Russell Coker <[email protected]> -## -## DP: Adding volume label and UUID support for linux swap (Closes: #489865). - -...@dpatch@ +Author: Russell Coker <[email protected]> +Description: Adding volume label and UUID support for linux swap (Closes: #489865). diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux --- file.orig/magic/Magdir/linux 2008-06-04 18:02:25.000000000 +0000 @@ -269,21 +217,17 @@ +>0x404 long x size %d pages, +>1052 string \0 no label, +>1052 string >\0 LABEL=%s, -+>0x40c belong x UUID=%x -+>0x410 beshort x \b-%x -+>0x412 beshort x \b-%x -+>0x414 beshort x \b-%x -+>0x416 belong x \b-%x -+>0x41a beshort x \b%x ++>0x40c belong x UUID=%08x ++>0x410 beshort x \b-%04x ++>0x412 beshort x \b-%04x ++>0x414 beshort x \b-%04x ++>0x416 belong x \b-%08x ++>0x41a beshort x \b%04x # ECOFF magic for OSF/1 and Linux (only tested under Linux though) # # from Erik Troan ([email protected]) examining od dumps, so this -#!/bin/sh /usr/share/dpatch/dpatch-run -## 215-magic-update-linuxext.dpatch by Russell Coker <[email protected]> -## -## DP: Adding volume label and UUID support for linux ext (Closes: #489865). - -...@dpatch@ +Author: Russell Coker <[email protected]> +Description: Adding volume label and UUID support for linux ext (Closes: #489865). diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems --- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000 @@ -303,12 +247,12 @@ # else large INCOMPAT? ->>0x460 lelong >0x000003f ext4 filesystem data +>>0x460 lelong >0x000003f ext4 filesystem data -+>0x468 belong x \b, UUID=%x -+>0x46c beshort x \b-%x -+>0x46e beshort x \b-%x -+>0x470 beshort x \b-%x -+>0x472 belong x \b-%x -+>0x476 beshort x \b%x ++>0x468 belong x \b, UUID=%08x ++>0x46c beshort x \b-%04x ++>0x46e beshort x \b-%04x ++>0x470 beshort x \b-%04x ++>0x472 belong x \b-%08x ++>0x476 beshort x \b%04x +>0x478 string >0 \b, volume name "%s" # General flags for any ext* fs ->0x460 lelong &0x0000004 (needs journal recovery) @@ -346,16 +290,207 @@ # SGI disk labels - Nathan Scott <[email protected]> 0 belong 0x0BE5A941 SGI disk label (volume header) -#!/bin/sh /usr/share/dpatch/dpatch-run -## 318-magic-add-par2.dpatch by Daniel van Eeden <[email protected]> -## -## DP: New magic for PAR2 archive files (Closes: #294070). - -...@dpatch@ - -diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive ---- file-4.24.orig/magic/Magdir/archive 2008-02-28 18:57:34.000000000 +0000 -+++ file-4.24/magic/Magdir/archive 2008-04-07 08:05:47.000000000 +0000 +Author: Toeroek Edwin <[email protected]> +Description: Updating llvm magic (Closes: #505805). + +diff -Naurp file.orig/magic/Magdir/llvm file/magic/Magdir/llvm +--- file.orig/magic/Magdir/llvm 2008-10-19 14:31:15.000000000 +0000 ++++ file/magic/Magdir/llvm 2008-11-15 19:15:51.000000000 +0000 +@@ -1,10 +1,12 @@ + + #------------------------------------------------------------------------------ + # llvm: file(1) magic for LLVM byte-codes +-# URL: http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature ++# URL: http://llvm.org/docs/BitCodeFormat.html + # From: Al Stone <[email protected]> + + 0 string llvm LLVM byte-codes, uncompressed + 0 string llvc0 LLVM byte-codes, null compression + 0 string llvc1 LLVM byte-codes, gzip compression + 0 string llvc2 LLVM byte-codes, bzip2 compression ++0 string \xde\xc0\x17\x0b LLVM bitcode, wrapper ++0 string BC\xc0\xde LLVM bitcode +Author: Daniel Baumann <[email protected]> +Description: Adding mime entries for ruby (Closes: #502201). + +diff -Naurp file.orig/magic/Magdir/ruby file/magic/Magdir/ruby +--- file.orig/magic/Magdir/ruby 2008-10-19 14:31:15.000000000 +0000 ++++ file/magic/Magdir/ruby 2008-11-15 19:28:44.000000000 +0000 +@@ -5,6 +5,10 @@ + + # Ruby scripts + 0 search/1/b #!\ /usr/bin/ruby Ruby script text executable ++!:mime application/x-ruby + 0 search/1/b #!\ /usr/local/bin/ruby Ruby script text executable ++!:mime application/x-ruby + 0 search/1 #!/usr/bin/env\ ruby Ruby script text executable ++!:mime application/x-ruby + 0 search/1 #!\ /usr/bin/env\ ruby Ruby script text executable ++!:mime application/x-ruby +Author: Ori Avtalion <[email protected]> +Description: Adding mime entries for gimp (Closes: #501200). + +diff -Naurp file.orig/magic/Magdir/gimp file/magic/Magdir/gimp +--- file.orig/magic/Magdir/gimp 2008-10-19 14:31:15.000000000 +0000 ++++ file/magic/Magdir/gimp 2008-11-15 19:32:22.000000000 +0000 +@@ -10,6 +10,7 @@ + # ('Bucky' LaDieu, [email protected]) + + 0 string gimp\ xcf GIMP XCF image data, ++!:mime image/x-xcf + >9 string file version 0, + >9 string v version + >>10 string >\0 %s, +Author: Adam Buchbinder <[email protected]> +Description: pdating wav magics (Closes: #508174). + +diff -Naurp file.orig/magic/Magdir/riff file/magic/Magdir/riff +--- file.orig/magic/Magdir/riff 2008-12-05 17:28:11.000000000 -0500 ++++ file/magic/Magdir/riff 2008-12-05 17:33:48.000000000 -0500 +@@ -39,12 +39,14 @@ + >>20 leshort 2 \b, Microsoft ADPCM + >>20 leshort 6 \b, ITU G.711 A-law + >>20 leshort 7 \b, ITU G.711 mu-law ++>>20 leshort 8 \b, Microsoft DTS + >>20 leshort 17 \b, IMA ADPCM + >>20 leshort 20 \b, ITU G.723 ADPCM (Yamaha) + >>20 leshort 49 \b, GSM 6.10 + >>20 leshort 64 \b, ITU G.721 ADPCM + >>20 leshort 80 \b, MPEG + >>20 leshort 85 \b, MPEG Layer 3 ++>>20 leshort 0x2001 \b, DTS + >>22 leshort =1 \b, mono + >>22 leshort =2 \b, stereo + >>22 leshort >2 \b, %d channels +Author: Adam Buchbinder <[email protected]> +Description: Fixing false matches against Z-machine pattern. A particular MP3 file as well as a particular file from texlive-omega match the pattern for Z-machine games. Make the pattern a bit more restrictive to get rid of the false matches. (Closes: #499748) + +diff -Naurp file.orig/magic/Magdir/adventure file/magic/Magdir/adventure +--- file.orig/magic/Magdir/adventure 2009-03-21 09:20:03.000000000 +0000 ++++ file/magic/Magdir/adventure 2009-03-21 09:27:01.000000000 +0000 +@@ -17,17 +17,23 @@ + #------------------------------------------------------------------------------ + # Z-machine: file(1) magic for Z-machine binaries. + # +-# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which +-# appears to be a version-0 Z-machine binary. ++# Updated by Adam Buchbinder <[email protected]> + # +-# The (false match) message is to correct that behavior. Perhaps it is +-# not needed. ++# The first byte is the Z-machine revision; it is always between 1 and 8. We ++# had false matches (for instance, inbig5.ocp from the Omega TeX extension as ++# well as an occasional MP3 file), so we sanity-check the version number. + # +-16 belong&0xfe00f0f0 0x3030 Infocom game data +->0 ubyte 0 (false match) +->0 ubyte >0 (Z-machine %d, +->>2 ubeshort x Release %d / +->>18 string >\0 Serial %.6s) ++# It might be possible to sanity-check the release number as well, as it seems ++# (at least in classic Infocom games) to always be a relatively small number, ++# always under 150 or so, but as this isn't rigorous, we'll wait on that until ++# it becomes clear that it's needed. ++# ++0 ubyte >0 ++>0 ubyte <9 ++>>16 belong&0xfe00f0f0 0x3030 Infocom game data ++>>>0 ubyte x (Z-machine %d, ++>>>>2 ubeshort x Release %d / ++>>>>18 string >\0 Serial %.6s) + + #------------------------------------------------------------------------------ + # Glulx: file(1) magic for Glulx binaries. +Author: Adam Buchbinder <[email protected]> +Description: + The XWD magic is too simple--it just matches a single big-endian long at the + beginning of the file. This patch implements a few other checks + (Closes: #511764). + +diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images +--- file.orig/magic/Magdir/images 2009-03-21 09:20:04.000000000 +0000 ++++ file/magic/Magdir/images 2009-03-21 09:34:29.000000000 +0000 +@@ -308,11 +308,20 @@ + # As described in /usr/X11R6/include/X11/XWDFile.h + # used by the xwd program. + # Bradford Castalia, idaeim, 1/01 +-4 belong 7 XWD X Window Dump image data +->100 string >\0 \b, "%s" +->16 belong x \b, %dx +->20 belong x \b%dx +->12 belong x \b%d ++# updated by Adam Buchbinder, 2/09 ++# The following assumes version 7 of the format; the first long is the length ++# of the header, which is at least 25 4-byte longs, and the one at offset 8 ++# is a constant which is always either 1 or 2. Offset 12 is the pixmap depth, ++# which is a maximum of 32. ++0 belong >100 ++>8 belong <3 ++>>12 belong <33 ++>>>4 belong 7 XWD X Window Dump image data ++!:mime image/x-xwindowdump ++>>>>100 string >\0 \b, "%s" ++>>>>16 belong x \b, %dx ++>>>>20 belong x \b%dx ++>>>>12 belong x \b%d + + # PDS - Planetary Data System + # These files use Parameter Value Language in the header section. +Author: Adam Buchbinder <[email protected]> +Description: + UTF-32BE text is detected by the presence of the Byte Order Mark, in UTF-32BE + encoding. The stock version of the BOM is incorrect; it should read 00 00 FE + FF, according to the Unicode FAQ: http://unicode.org/faq/utf_bom.html#bom4 + (Closes: #513526). + +diff -Naurp file.orig/magic/Magdir/unicode file/magic/Magdir/unicode +--- file.orig/magic/Magdir/unicode 2009-03-21 09:20:03.000000000 +0000 ++++ file/magic/Magdir/unicode 2009-03-21 17:02:09.000000000 +0000 +@@ -9,6 +9,6 @@ + 0 string +/v+ Unicode text, UTF-7 + 0 string +/v/ Unicode text, UTF-7 + 0 string \335\163\146\163 Unicode text, UTF-8-EBCDIC +-0 string \376\377\000\000 Unicode text, UTF-32, big-endian ++0 string \000\000\376\377 Unicode text, UTF-32, big-endian + 0 string \377\376\000\000 Unicode text, UTF-32, little-endian + 0 string \016\376\377 Unicode text, SCSU (Standard Compression Scheme for Unicode) +Author: Adam Buchbinder <[email protected]> +Description: Updating magic for spectrum tap files (Closes: #501589). + +diff -Naurp file.orig/magic/Magdir/spectrum file/magic/Magdir/spectrum +--- file.orig/magic/Magdir/spectrum 2009-03-21 09:20:03.000000000 +0000 ++++ file/magic/Magdir/spectrum 2009-03-21 17:24:09.000000000 +0000 +@@ -19,13 +19,17 @@ + # Tape file. This assumes the .TAP starts with a Spectrum-format header, + # which nearly all will. + # +-0 string \023\000\000 Spectrum .TAP data +->4 string x "%-10.10s" +->3 byte 0 - BASIC program +->3 byte 1 - number array +->3 byte 2 - character array +->3 byte 3 - memory block +->>14 belong 0x001B0040 (screen) ++# Update: Sanity-check string contents to be printable. ++# -Adam Buchbinder <[email protected]> ++# ++0 string \023\000\000 ++>4 string >\0 ++>>4 string <\177 Spectrum .TAP data "%-10.10s" ++>>>3 byte 0 - BASIC program ++>>>3 byte 1 - number array ++>>>3 byte 2 - character array ++>>>3 byte 3 - memory block ++>>>>14 belong 0x001B0040 (screen) + + # The following three blocks are from [email protected] + # TZX tape images +Author: Daniel van Eeden <[email protected]> +Description: New magic for PAR2 archive files (Closes: #294070). + +diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive +--- file.orig/magic/Magdir/archive 2008-02-28 18:57:34.000000000 +0000 ++++ file/magic/Magdir/archive 2008-04-07 08:05:47.000000000 +0000 @@ -803,3 +803,6 @@ >24 belong 1 SHA-1 checksum >24 belong 2 MD5 checksum @@ -363,36 +498,27 @@ +# Type: Parity Archive +# From: Daniel van Eeden <[email protected]> +0 string PAR2 Parity Archive Volume Set -#!/bin/sh /usr/share/dpatch/dpatch-run -## 319-magic-add-pe5.dpatch by Simon Horman <[email protected]> -## -## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397). - -...@dpatch@ +Author: Simon Horman <[email protected]> +Description: New magic for the Ulead Photo Explorer5 image format (Closes: #339397). -diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images ---- file.orig/magic/Magdir/images 2008-07-02 15:16:52.000000000 +0000 -+++ file/magic/Magdir/images 2008-07-15 13:39:37.000000000 +0000 -@@ -605,3 +605,9 @@ +diff -Naurp file.org/magic/Magdir/images file/magic/Magdir/images +--- file.org/magic/Magdir/images 2009-02-02 15:55:49.000000000 +0000 ++++ file/magic/Magdir/images 2009-02-18 11:28:44.000000000 +0000 +@@ -605,3 +605,8 @@ # JPEG 2000 Code Stream Bitmap # From Petr Splichal <[email protected]> 0 string \xFF\x4F\xFF\x51\x00 JPEG-2000 Code Stream Bitmap data + -+# Type: Ulead Photo Explorer5 (.pe5) -+# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese) -+# From: Simon Horman <[email protected]> -+0 string IIO2H Ulead Photo Explorer5 -+ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 320-magic-add-pmenu.dpatch by Edward Betts <[email protected]> -## -## DP: New magic for pmenu (Closes: #38543). - -...@dpatch@ - -diff -Naurp file-4.23.orig/magic/Magdir/commands file-4.23/magic/Magdir/commands ---- file-4.23.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000 +0000 -+++ file-4.23/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000 ++# Type: Ulead Photo Explorer5 (.pe5) ++# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese) ++# From: Simon Horman <[email protected]> ++0 string IIO2H Ulead Photo Explorer5 +Author: Edward Betts <[email protected]> +Description: New magic for pmenu (Closes: #38543). + +diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands +--- file.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000 +0000 ++++ file/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000 @@ -55,3 +55,8 @@ 0 string Zend\x00 PHP script Zend Optimizer data @@ -402,16 +528,12 @@ +# URL: http://packages.debian.org/pdmenu +# From: Edward Betts <[email protected]> +0 string #!/usr/bin/pdmenu Pdmenu configuration file text -#!/bin/sh /usr/share/dpatch/dpatch-run -## 321-magic-add-powertab.dpatch by Jelmer Vernooij <[email protected]> -## -## DP: New magic for Power-Tab - -...@dpatch@ - -diff -Naur file-4.20.orig/magic/Magdir/chord file-4.20/magic/Magdir/chord ---- file-4.20.orig/magic/Magdir/chord 2003-03-24 14:48:32.000000000 +0000 -+++ file-4.20/magic/Magdir/chord 2007-05-17 16:33:26.000000000 +0000 +Author: Jelmer Vernooij <[email protected]> +Description: New magic for Power-Tab + +diff -Naurp file.orig/magic/Magdir/chord file/magic/Magdir/chord +--- file.orig/magic/Magdir/chord 2008-02-19 17:27:28.000000000 +0000 ++++ file/magic/Magdir/chord 2009-02-18 11:42:42.000000000 +0000 @@ -7,3 +7,8 @@ # 0 string {title Chord text file @@ -421,30 +543,22 @@ <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file-debian.patch?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
