OBS User unknown 2007-08-03 20:47:37 +00:00 committed by Git OBS Bridge
parent f7752e0bc6
commit f09095cc0f
5 changed files with 123 additions and 198 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
size 429405

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d933caa25caacd57dc8b37f68d222acec3ba3c9d076828d34f006499f6301fb2
size 417120

View File

@ -1,196 +1,11 @@
https://bugs.freedesktop.org/show_bug.cgi?id=8170
================================================================================
--- freedesktop.org.xml.in
Index: freedesktop.org.xml.in
===================================================================
--- freedesktop.org.xml.in.orig
+++ freedesktop.org.xml.in
@@ -2316,38 +2316,168 @@
<glob pattern="*.pict1"/>
<glob pattern="*.pict2"/>
</mime-type>
- <mime-type type="image/x-macpaint">
- <_comment>MacPaint Bitmap image</_comment>
- <glob pattern="*.pntg"/>
+ <mime-type type="application/x-ufraw">
+ <sub-class-of type="text/xml"/>
+ <_comment>UFRaw ID file</_comment>
+ <acronym>UFRaw</acronym>
+ <expanded-acronym>Unidentified Flying Raw</expanded-acronym>
+ <glob pattern="*.ufraw"/>
+ </mime-type>
+ <mime-type type="image/x-dcraw">
+ <_comment>Digital raw image</_comment>
+ <acronym>DCRaw</acronym>
+ <expanded-acronym>Digital camera Raw</expanded-acronym>
+ </mime-type>
+ <mime-type type="image/x-adobe-dng">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Adobe Digital Negative</_comment>
+ <acronym>DNG</acronym>
+ <expanded-acronym>Digital Negative</expanded-acronym>
+ <glob pattern="*.dng"/>
</mime-type>
- <mime-type type="image/x-minolta-mrw">
- <comment>Minolta raw image</comment>
- <glob pattern="*.mrw" />
- </mime-type>
+ <!-- Canon has 2 format: CRW and CR2 !-->
+ <!-- CRW is easy !-->
<mime-type type="image/x-canon-crw">
- <comment>Canon raw image</comment>
+ <sub-class-of type="image/x-dcraw"/>
+ <_comment>Canon raw image</_comment>
+ <acronym>CRW</acronym>
+ <expanded-acronym>Canon RaW</expanded-acronym>
+ <magic priority="50">
+ <match value="II\x1a\x00\x00\x00HEAPCCDR" type="string" offset="0"/>
+ </magic>
<glob pattern="*.crw"/>
+ </mime-type>
+ <!-- CR2 is a TIFF !-->
+ <mime-type type="image/x-canon-cr2">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Canon raw image</_comment>
+ <acronym>CR2</acronym>
+ <expanded-acronym>Canon Raw 2</expanded-acronym>
<glob pattern="*.cr2"/>
</mime-type>
- <mime-type type="image/x-nikon-nef">
- <comment>Nikon raw image</comment>
- <glob pattern="*.nef"/>
+ <mime-type type="image/x-fuji-raf">
+ <sub-class-of type="image/x-dcraw"/>
+ <_comment>Fuji raw image</_comment>
+ <acronym>RAF</acronym>
+ <expanded-acronym>RAw Format</expanded-acronym>
+ <magic priority="50">
+ <match value="FUJIFILMCCD-RAW " type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.raf"/>
</mime-type>
<mime-type type="image/x-kodak-dcr">
- <comment>Kodak raw image</comment>
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Kodak raw image</_comment>
+ <acronym>DCR</acronym>
+ <expanded-acronym>Digital Camera Raw</expanded-acronym>
<glob pattern="*.dcr"/>
</mime-type>
+ <mime-type type="image/x-kodak-k25">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Kodak raw image</_comment>
+ <acronym>K25</acronym>
+ <expanded-acronym>Kodak DC25</expanded-acronym>
+ <glob pattern="*.k25"/>
+ </mime-type>
<mime-type type="image/x-kodak-kdc">
- <comment>Kodak raw image</comment>
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Kodak raw image</_comment>
+ <acronym>KDC</acronym>
+ <expanded-acronym>Kodak Digital Camera</expanded-acronym>
<glob pattern="*.kdc"/>
</mime-type>
+ <mime-type type="image/x-minolta-mrw">
+ <sub-class-of type="image/x-dcraw"/>
+ <_comment>Minolta raw image</_comment>
+ <acronym>MRW</acronym>
+ <expanded-acronym>Minolta RaW</expanded-acronym>
+ <magic priority="50">
+ <match value="\x00MRM" type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.mrw" />
+ </mime-type>
+ <mime-type type="image/x-nikon-nef">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Nikon raw image</_comment>
+ <acronym>NEF</acronym>
+ <expanded-acronym>Nikon Electronic Format</expanded-acronym>
+ <glob pattern="*.nef"/>
+ </mime-type>
<mime-type type="image/x-olympus-orf">
- <comment>Olympus raw image</comment>
+ <sub-class-of type="image/x-dcraw"/>
+ <_comment>Olympus raw image</_comment>
+ <acronym>ORF</acronym>
+ <expanded-acronym>Olympus Raw Format</expanded-acronym>
+ <magic priority="50">
+ <!-- an ORF file is basically a TIFF file with a non standard !-->
+ <!-- header IIRO which is not nice since it is only composed !-->
+ <!-- of ASCII codes. Fortunately, the TIFF header is followed !-->
+ <!-- by the offset of the first TIFF ifd which is always !-->
+ <!-- 0x00000008 (Little endian) for an ORF !-->
+ <match value="IIRO\x08\x00\x00\x00" type="string" offset="0"/>
+ </magic>
<glob pattern="*.orf"/>
</mime-type>
- <mime-type type="image/x-fuji-raf">
- <comment>Fuji raw image</comment>
- <glob pattern="*.raf"/>
+ <mime-type type="image/x-panasonic-raw">
+ <sub-class-of type="image/x-dcraw"/>
+ <_comment>Panasonic raw image</_comment>
+ <magic priority="50">
+ <!-- Some kind of TIFF file with a non-standard version in prefix !-->
+ <match value="IIU\x00\x08\x00\x00\x00" type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.raw"/>
+ </mime-type>
+ <mime-type type="image/x-pentax-pef">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <_comment>Pentax raw image</_comment>
+ <acronym>PEF</acronym>
+ <expanded-acronym>Pentax Electronic Format</expanded-acronym>
+ <glob pattern="*.pef"/>
+ </mime-type>
+ <mime-type type="image/x-sigma-x3f">
+ <sub-class-of type="image/x-dcraw"/>
+ <_comment>Sigma raw image</_comment>
+ <acronym>X3F</acronym>
+ <expanded-acronym>X3 Foveon</expanded-acronym>
+ <magic priority="50">
+ <!-- The header is "FOVb" (Foveon) !-->
+ <match value="FOVb" type="string" offset="0">
+ <!-- Followed by a 32bit LSB specifying the version number (major.minor) !-->
+ <match value="0x00FF00FF" type="little32" offset="4" mask="0xFF00FF00" />
+ </match>
+ </magic>
+ <glob pattern="*.x3f"/>
+ </mime-type>
+ <mime-type type="image/x-sony-srf">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <acronym>SRF</acronym>
+ <expanded-acronym>Sony Raw Format</expanded-acronym>
+ <_comment>Sony raw image</_comment>
+ <glob pattern="*.srf"/>
+ </mime-type>
+ <mime-type type="image/x-sony-sr2">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <acronym>SR2</acronym>
+ <expanded-acronym>Sony Raw format 2</expanded-acronym>
+ <_comment>Sony raw image</_comment>
+ <glob pattern="*.sr2"/>
+ </mime-type>
+ <mime-type type="image/x-sony-arw">
+ <sub-class-of type="image/x-dcraw"/>
+ <sub-class-of type="image/tiff"/>
+ <acronym>ARW</acronym>
+ <expanded-acronym>Alpha Raw format</expanded-acronym>
+ <_comment>Sony raw image</_comment>
+ <glob pattern="*.arw"/>
</mime-type>
<mime-type type="image/png">
<_comment>PNG image</_comment>
@@ -2557,6 +2687,10 @@
<_comment>LightWave scene</_comment>
<glob pattern="*.lws"/>
@@ -3014,6 +3014,10 @@ command to generate the output files.
<_comment>MacPaint Bitmap image</_comment>
<glob pattern="*.pntg"/>
</mime-type>
+ <mime-type type="image/x-macpaint">
+ <_comment>MacPaint Bitmap image</_comment>

View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Fri Aug 3 21:59:54 CEST 2007 - maw@suse.de
- Update to version 0.22:
* Mime-type Changes:
- Clean up the Netscape/Mozilla bookmarks mime-types
- Fix Powerpoint magic detection
- Add another magic matchlet to HTML
- Add magic detection for OpenOffice.org files
- Add MP2 audio, EMF mime-types
- Add more aliases for 3GPP videos
- Add magic detection to WMF
- Add more suffixes for WordPerfect documents
- Add mime-types for SIS/SISX archives
- Add x-epoc media type
- Add *.hxx as a suffix for C++ headers
- Add Erlang mime-type
- Add another Fortran magic detection
- Add Plucker mime-type
- Add winmail.dat files as TNEF files
- Add WMLScript mime-type
- Add JAD mime-type
- Add iRiver PLA playlist mime-type
- Add Nintendo DS ROM mime-type
- Add video/avi as an alias for AVI files
- Update Ogg mime-types to match Xiph's latest documents
* Other:
- Improve Window compatibility
- Update the glib requirements
shared-mime-info 0.21 (2007-04-18)
* Mime-type Changes:
- Add *.m2t as a pattern for MPEG-2 files
- Add comments for the XMCD database and ARC mime-types
- Fix comments for Adobe FrameMaker documents
- Make application/m3u an alias for audio/x-mpegurl
- Make audio/x-mpeg an alias for audio/mpeg
- Add XPS to the mime-types
- Fix RealVideo documents mime-types
- Make application/x-shared-library-la a subclass of text/plain
- Add TNEF to the mime-types
- Add PAK archive to the mime-types
- Add PSF, miniPSF, PSFlib, and gzipped PSF fonts to the mime-types
- Add *.iso9660 as a pattern for ISO files
- Add PKCS#10 certification requests to the mime-types
- Add and correct loads of raw camera image types
- Add magic for OpenOffice.org file types
- Add KSysV init files to the mime-types
- Add DirectDraw surface files to the mime-types
- Add X11 cursor type to the mime-types
- Fix magic for RTSPtext metalinks
* Other:
- Remove mention of ROX in the See Also section of the man page
- Respin shared-mime-info-ufraw.patch
-------------------------------------------------------------------
Fri Apr 6 14:24:52 CEST 2007 - sbrabec@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package shared-mime-info (Version 0.20)
# spec file for package shared-mime-info (Version 0.22)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,11 +12,11 @@
Name: shared-mime-info
BuildRequires: glib2-devel intltool libxml2-devel perl-XML-Parser
Version: 0.20
Release: 7
Version: 0.22
Release: 1
URL: http://freedesktop.org/wiki/Software/shared-mime-info
Group: System/X11/Utilities
License: GNU General Public License (GPL)
License: GPL v2 or later
Summary: Shared MIME Database
Source: %{name}-%{version}.tar.bz2
Source1: mime-info-to-mime
@ -68,11 +68,64 @@ usr/bin/update-mime-database usr/share/mime >/dev/null
%doc COPYING ChangeLog NEWS README
%{_bindir}/*
%{_datadir}/mime/packages/*.xml
%dir %{_datadir}/mime/x-epoc
%{_datadir}/mime/x-epoc/*.xml
%{_datadir}/pkgconfig/*.pc
%ghost %{_datadir}/mime/[a-ms-vX]*
%{_mandir}/man?/*.*
%changelog
* Fri Aug 03 2007 - maw@suse.de
- Update to version 0.22:
* Mime-type Changes:
- Clean up the Netscape/Mozilla bookmarks mime-types
- Fix Powerpoint magic detection
- Add another magic matchlet to HTML
- Add magic detection for OpenOffice.org files
- Add MP2 audio, EMF mime-types
- Add more aliases for 3GPP videos
- Add magic detection to WMF
- Add more suffixes for WordPerfect documents
- Add mime-types for SIS/SISX archives
- Add x-epoc media type
- Add *.hxx as a suffix for C++ headers
- Add Erlang mime-type
- Add another Fortran magic detection
- Add Plucker mime-type
- Add winmail.dat files as TNEF files
- Add WMLScript mime-type
- Add JAD mime-type
- Add iRiver PLA playlist mime-type
- Add Nintendo DS ROM mime-type
- Add video/avi as an alias for AVI files
- Update Ogg mime-types to match Xiph's latest documents
* Other:
- Improve Window compatibility
- Update the glib requirements
shared-mime-info 0.21 (2007-04-18)
* Mime-type Changes:
- Add *.m2t as a pattern for MPEG-2 files
- Add comments for the XMCD database and ARC mime-types
- Fix comments for Adobe FrameMaker documents
- Make application/m3u an alias for audio/x-mpegurl
- Make audio/x-mpeg an alias for audio/mpeg
- Add XPS to the mime-types
- Fix RealVideo documents mime-types
- Make application/x-shared-library-la a subclass of text/plain
- Add TNEF to the mime-types
- Add PAK archive to the mime-types
- Add PSF, miniPSF, PSFlib, and gzipped PSF fonts to the mime-types
- Add *.iso9660 as a pattern for ISO files
- Add PKCS#10 certification requests to the mime-types
- Add and correct loads of raw camera image types
- Add magic for OpenOffice.org file types
- Add KSysV init files to the mime-types
- Add DirectDraw surface files to the mime-types
- Add X11 cursor type to the mime-types
- Fix magic for RTSPtext metalinks
* Other:
- Remove mention of ROX in the See Also section of the man page
- Respin shared-mime-info-ufraw.patch
* Fri Apr 06 2007 - sbrabec@suse.cz
- Disabled system-wide running of mime-info-to-mime (#150398).
* Mon Feb 19 2007 - sbrabec@suse.cz