update shared-mime-info-1.4

7db9b214 · Daniel Mendler · 8c3953c4 · 7db9b214 · 7db9b214
Commit 7db9b214 authored Mar 25, 2015 by Daniel Mendler
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 29 deletions

lib/mimemagic/tables.rb
+50 -29

script/freedesktop.org.xml
+0 -0

No files found.
--- a/lib/mimemagic/tables.rb
+++ b/lib/mimemagic/tables.rb
@@ -97,6 +97,7 @@ class MimeMagic
    'cpio.gz' => 'application/x-cpio-compressed',
    'cpp' => 'text/x-c++src',
    'cr2' => 'image/x-canon-cr2',
+    'crdownload' => 'application/x-partial-download',
    'crl' => 'application/pkix-crl',
    'crt' => 'application/x-x509-ca-cert',
    'crw' => 'image/x-canon-crw',
@@ -110,12 +111,13 @@ class MimeMagic
    'd' => 'text/x-dsrc',
    'dar' => 'application/x-dar',
    'dbf' => 'application/x-dbf',
+    'dbk' => 'application/x-docbook+xml',
    'dc' => 'application/x-dc-rom',
    'dcl' => 'text/x-dcl',
    'dcm' => 'application/dicom',
    'dcr' => 'image/x-kodak-dcr',
    'dds' => 'image/x-dds',
-    'deb' => 'application/x-deb',
+    'deb' => 'application/vnd.debian.binary-package',
    'der' => 'application/x-x509-ca-cert',
    'desktop' => 'application/x-desktop',
    'di' => 'text/x-dsrc',
@@ -217,6 +219,7 @@ class MimeMagic
    'gpg' => 'application/pgp-encrypted',
    'gplt' => 'application/x-gnuplot',
    'gra' => 'application/x-graphite',
+    'gs' => 'text/x-genie',
    'gsf' => 'application/x-font-type1',
    'gsm' => 'audio/x-gsm',
    'gtar' => 'application/x-tar',
@@ -290,7 +293,7 @@ class MimeMagic
    'key' => 'application/x-iwork-keynote-sffkey',
    'kfo' => 'application/x-kformula',
    'kil' => 'application/x-killustrator',
-    'kino' => 'application/smil',
+    'kino' => 'application/smil+xml',
    'kml' => 'application/vnd.google-earth.kml+xml',
    'kmz' => 'application/vnd.google-earth.kmz',
    'kon' => 'application/x-kontour',
@@ -311,6 +314,7 @@ class MimeMagic
    'lhs' => 'text/x-literate-haskell',
    'lhz' => 'application/x-lhz',
    'log' => 'text/x-log',
+    'lrv' => 'video/mp4',
    'lrz' => 'application/x-lrzip',
    'ltx' => 'text/x-tex',
    'lua' => 'text/x-lua',
@@ -341,9 +345,9 @@ class MimeMagic
    'mak' => 'text/x-makefile',
    'man' => 'application/x-troff-man',
    'manifest' => 'text/cache-manifest',
-    'markdown' => 'text/x-markdown',
+    'markdown' => 'text/markdown',
    'mbox' => 'application/mbox',
-    'md' => 'text/x-markdown',
+    'md' => 'text/markdown',
    'mdb' => 'application/vnd.ms-access',
    'mdi' => 'image/vnd.ms-modi',
    'me' => 'text/x-troff-me',
@@ -360,7 +364,7 @@ class MimeMagic
    'mk' => 'text/x-makefile',
    'mk3d' => 'video/x-matroska-3d',
    'mka' => 'audio/x-matroska',
-    'mkd' => 'text/x-markdown',
+    'mkd' => 'text/markdown',
    'mkv' => 'video/x-matroska',
    'ml' => 'text/x-ocaml',
    'mli' => 'text/x-ocaml',
@@ -451,6 +455,7 @@ class MimeMagic
    'p' => 'text/x-pascal',
    'p10' => 'application/pkcs10',
    'p12' => 'application/x-pkcs12',
+    'p65' => 'application/x-pagemaker',
    'p7b' => 'application/x-pkcs7-certificates',
    'p7c' => 'application/pkcs7-mime',
    'p7m' => 'application/pkcs7-mime',
@@ -459,6 +464,7 @@ class MimeMagic
    'pack' => 'application/x-java-pack200',
    'pak' => 'application/x-pak',
    'par2' => 'application/x-par2',
+    'part' => 'application/x-partial-download',
    'pas' => 'text/x-pascal',
    'patch' => 'text/x-patch',
    'pbm' => 'image/x-portable-bitmap',
@@ -502,6 +508,8 @@ class MimeMagic
    'pln' => 'application/x-planperfect',
    'pls' => 'audio/x-scpls',
    'pm' => 'application/x-perl',
+    'pm6' => 'application/x-pagemaker',
+    'pmd' => 'application/x-pagemaker',
    'png' => 'image/png',
    'pnm' => 'image/x-portable-anymap',
    'pntg' => 'image/x-macpaint',
@@ -539,6 +547,9 @@ class MimeMagic
    'pyx' => 'text/x-python',
    'qif' => 'application/x-qw',
    'qml' => 'text/x-qml',
+    'qmlproject' => 'text/x-qml',
+    'qmltypes' => 'text/x-qml',
+    'qp' => 'application/x-qpress',
    'qt' => 'video/quicktime',
    'qti' => 'application/x-qtiplot',
    'qti.gz' => 'application/x-qtiplot',
@@ -619,9 +630,9 @@ class MimeMagic
    'smc' => 'application/vnd.nintendo.snes.rom',
    'smd' => 'application/vnd.stardivision.mail',
    'smf' => 'application/vnd.stardivision.math',
-    'smi' => 'application/smil',
+    'smi' => 'application/smil+xml',
-    'smil' => 'application/smil',
+    'smil' => 'application/smil+xml',
-    'sml' => 'application/smil',
+    'sml' => 'application/smil+xml',
    'sms' => 'application/x-sms-rom',
    'snd' => 'audio/basic',
    'so' => 'application/x-sharedlib',
@@ -706,6 +717,7 @@ class MimeMagic
    'txt' => 'text/plain',
    'txz' => 'application/x-xz-compressed-tar',
    'tzo' => 'application/x-tzo',
+    'udeb' => 'application/vnd.debian.binary-package',
    'ufraw' => 'application/x-ufraw',
    'ui' => 'application/x-designer',
    'uil' => 'text/x-uil',
@@ -715,6 +727,7 @@ class MimeMagic
    'ustar' => 'application/x-ustar',
    'uue' => 'text/x-uuencode',
    'v' => 'text/x-verilog',
+    'v64' => 'application/x-n64-rom',
    'vala' => 'text/x-vala',
    'vapi' => 'text/x-vala',
    'vcard' => 'text/vcard',
@@ -724,8 +737,8 @@ class MimeMagic
    'vda' => 'image/x-tga',
    'vhd' => 'text/x-vhdl',
    'vhdl' => 'text/x-vhdl',
-    'viv' => 'video/vivo',
+    'viv' => 'video/vnd.vivo',
-    'vivo' => 'video/vivo',
+    'vivo' => 'video/vnd.vivo',
    'vlc' => 'audio/x-mpegurl',
    'vob' => 'video/mpeg',
    'voc' => 'audio/x-voc',
@@ -751,6 +764,7 @@ class MimeMagic
    'wk1' => 'application/vnd.lotus-1-2-3',
    'wk3' => 'application/vnd.lotus-1-2-3',
    'wk4' => 'application/vnd.lotus-1-2-3',
+    'wkdownload' => 'application/x-partial-download',
    'wks' => 'application/vnd.lotus-1-2-3',
    'wma' => 'audio/x-ms-wma',
    'wmf' => 'image/x-wmf',
@@ -821,10 +835,12 @@ class MimeMagic
    'yaml' => 'application/x-yaml',
    'yml' => 'application/x-yaml',
    'z' => 'application/x-compress',
+    'z64' => 'application/x-n64-rom',
    'zabw' => 'application/x-abiword',
    'zip' => 'application/zip',
    'zoo' => 'application/x-zoo',
    'zsav' => 'application/x-spss-sav',
+    'zz' => 'application/zlib',
  }
  # @private
  # :nodoc:
@@ -855,7 +871,7 @@ class MimeMagic
    'application/ogg' => [%w(ogx), %w(), 'Ogg multimedia file'],
    'application/oxps' => [%w(oxps xps), %w(application/zip), 'XPS document'],
    'application/pdf' => [%w(pdf), %w(), 'PDF document'],
-    'application/pgp-encrypted' => [%w(asc gpg pgp), %w(), 'PGP/MIME-encrypted message header'],
+    'application/pgp-encrypted' => [%w(asc gpg pgp), %w(text/plain), 'PGP/MIME-encrypted message header'],
    'application/pgp-keys' => [%w(asc gpg pgp pkr skr), %w(text/plain), 'PGP keys'],
    'application/pgp-signature' => [%w(asc gpg pgp sig), %w(text/plain), 'detached OpenPGP signature'],
    'application/pkcs10' => [%w(p10), %w(), 'PKCS#10 certification request'],
@@ -873,12 +889,13 @@ class MimeMagic
    'application/rtf' => [%w(rtf), %w(text/plain), 'RTF document'],
    'application/sdp' => [%w(sdp), %w(), 'SDP multicast stream file'],
    'application/sieve' => [%w(siv), %w(application/xml), 'Sieve mail filter script'],
-    'application/smil' => [%w(kino smi smil sml), %w(application/xml), 'SMIL document'],
+    'application/smil+xml' => [%w(kino smi smil sml), %w(application/xml), 'SMIL document'],
    'application/sql' => [%w(sql), %w(text/plain), 'SQL code'],
    'application/vnd.adobe.flash.movie' => [%w(spl swf), %w(), 'Shockwave Flash file'],
    'application/vnd.android.package-archive' => [%w(apk), %w(application/x-java-archive), 'Android package'],
    'application/vnd.apple.mpegurl' => [%w(m3u m3u8), %w(), 'HTTP Live Streaming playlist'],
    'application/vnd.corel-draw' => [%w(cdr), %w(), 'Corel Draw drawing'],
+    'application/vnd.debian.binary-package' => [%w(deb udeb), %w(), 'Debian package'],
    'application/vnd.emusic-emusic_package' => [%w(emp), %w(), 'eMusic download package'],
    'application/vnd.google-earth.kml+xml' => [%w(kml), %w(application/xml), 'KML geographic data'],
    'application/vnd.google-earth.kmz' => [%w(kmz), %w(application/zip), 'KML geographic compressed data'],
@@ -1002,12 +1019,11 @@ class MimeMagic
    'application/x-dar' => [%w(dar), %w(), 'DAR archive'],
    'application/x-dbf' => [%w(dbf), %w(), 'Xbase document'],
    'application/x-dc-rom' => [%w(dc), %w(), 'Dreamcast ROM'],
-    'application/x-deb' => [%w(deb), %w(), 'Debian package'],
    'application/x-designer' => [%w(ui), %w(application/xml), 'Qt Designer file'],
    'application/x-desktop' => [%w(desktop kdelnk), %w(text/plain), 'desktop configuration file'],
    'application/x-dia-diagram' => [%w(dia), %w(application/xml), 'Dia diagram'],
    'application/x-dia-shape' => [%w(shape), %w(application/xml), 'Dia shape'],
-    'application/x-docbook+xml' => [%w(docbook), %w(application/xml), 'DocBook document'],
+    'application/x-docbook+xml' => [%w(dbk docbook), %w(application/xml), 'DocBook document'],
    'application/x-dvi' => [%w(dvi), %w(), 'TeX DVI document'],
    'application/x-e-theme' => [%w(etheme), %w(), 'Enlightenment theme'],
    'application/x-egon' => [%w(egon), %w(), 'Egon Animator animation'],
@@ -1016,7 +1032,7 @@ class MimeMagic
    'application/x-font-afm' => [%w(afm), %w(), 'Adobe font metrics'],
    'application/x-font-bdf' => [%w(bdf), %w(), 'BDF font'],
    'application/x-font-linux-psf' => [%w(psf), %w(), 'Linux PSF console font'],
-    'application/x-font-otf' => [%w(otf), %w(), 'OpenType font'],
+    'application/x-font-otf' => [%w(otf), %w(application/x-font-ttf), 'OpenType font'],
    'application/x-font-pcf' => [%w(pcf pcf.gz pcf.z), %w(), 'PCF font'],
    'application/x-font-speedo' => [%w(spd), %w(), 'Speedo font'],
    'application/x-font-ttf' => [%w(ttc ttf), %w(), 'TrueType font'],
@@ -1090,7 +1106,7 @@ class MimeMagic
    'application/x-mswinurl' => [%w(url), %w(), 'Internet shortcut'],
    'application/x-mswrite' => [%w(wri), %w(), 'WRI document'],
    'application/x-msx-rom' => [%w(msx), %w(), 'MSX ROM'],
-    'application/x-n64-rom' => [%w(n64), %w(), 'Nintendo64 ROM'],
+    'application/x-n64-rom' => [%w(n64 v64 z64), %w(), 'Nintendo64 ROM'],
    'application/x-navi-animation' => [%w(ani), %w(), 'Windows animated cursor'],
    'application/x-nes-rom' => [%w(nes), %w(), 'NES ROM'],
    'application/x-netcdf' => [%w(cdf nc), %w(), 'Unidata NetCDF document'],
@@ -1099,8 +1115,10 @@ class MimeMagic
    'application/x-nzb' => [%w(nzb), %w(application/xml), 'NewzBin usenet index'],
    'application/x-object' => [%w(o), %w(), 'object code'],
    'application/x-oleo' => [%w(oleo), %w(), 'GNU Oleo spreadsheet'],
+    'application/x-pagemaker' => [%w(p65 pm pm6 pmd), %w(application/x-ole-storage), 'Adobe PageMaker'],
    'application/x-pak' => [%w(pak), %w(), 'PAK archive'],
    'application/x-par2' => [%w(par2 par2), %w(), 'Parchive archive'],
+    'application/x-partial-download' => [%w(crdownload part wkdownload), %w(), 'Partially downloaded file'],
    'application/x-pc-engine-rom' => [%w(pce), %w(), 'PC Engine ROM'],
    'application/x-perl' => [%w(al perl pl pl pm pod t), %w(application/x-executable text/plain), 'Perl script'],
    'application/x-php' => [%w(php php3 php4 php5 phps), %w(text/plain), 'PHP script'],
@@ -1110,6 +1128,7 @@ class MimeMagic
    'application/x-pocket-word' => [%w(psw), %w(), 'Pocket Word document'],
    'application/x-pw' => [%w(pw), %w(), 'Pathetic Writer document'],
    'application/x-python-bytecode' => [%w(pyc pyo), %w(), 'Python bytecode'],
+    'application/x-qpress' => [%w(qp), %w(), 'Qpress archive'],
    'application/x-qtiplot' => [%w(qti qti.gz), %w(text/plain), 'QtiPlot document'],
    'application/x-quattropro' => [%w(wb1 wb2 wb3), %w(), 'Quattro Pro spreadsheet'],
    'application/x-quicktime-media-link' => [%w(qtl), %w(video/quicktime), 'QuickTime metalink playlist'],
@@ -1148,7 +1167,7 @@ class MimeMagic
    'application/x-tzo' => [%w(tar.lzo tzo), %w(application/x-lzop), 'Tar archive (LZO-compressed)'],
    'application/x-ufraw' => [%w(ufraw), %w(text/xml), 'UFRaw ID image'],
    'application/x-ustar' => [%w(ustar), %w(), 'Ustar archive'],
-    'application/x-wais-source' => [%w(src), %w(), 'WAIS source code'],
+    'application/x-wais-source' => [%w(src), %w(text/plain), 'WAIS source code'],
    'application/x-wii-rom' => [%w(iso), %w(), 'Wii disc image'],
    'application/x-windows-themepack' => [%w(themepack), %w(application/vnd.ms-cab-compressed), 'Microsoft Windows theme pack'],
    'application/x-wpg' => [%w(wpg), %w(), 'WordPerfect/Drawperfect image'],
@@ -1170,6 +1189,7 @@ class MimeMagic
    'application/xslt+xml' => [%w(xsl xslt), %w(application/xml), 'XSLT stylesheet'],
    'application/xspf+xml' => [%w(xspf), %w(application/xml), 'XSPF playlist'],
    'application/zip' => [%w(zip), %w(), 'Zip archive'],
+    'application/zlib' => [%w(zz), %w(), 'Zlib archive'],
    'audio/AMR' => [%w(amr), %w(), 'AMR audio'],
    'audio/AMR-WB' => [%w(awb), %w(), 'AMR-WB audio'],
    'audio/aac' => [%w(aac), %w(), 'AAC audio'],
@@ -1238,14 +1258,13 @@ class MimeMagic
    'image/vnd.djvu' => [%w(djv djvu), %w(), 'DjVu image'],
    'image/vnd.dwg' => [%w(dwg), %w(), 'AutoCAD image'],
    'image/vnd.dxf' => [%w(dxf), %w(), 'DXF vector image'],
-    'image/vnd.microsoft.icon' => [%w(ico), %w(), 'Microsoft icon'],
+    'image/vnd.microsoft.icon' => [%w(ico), %w(), 'Windows icon'],
    'image/vnd.ms-modi' => [%w(mdi), %w(), 'Microsoft Document Imaging format'],
    'image/vnd.rn-realpix' => [%w(rp), %w(), 'RealPix document'],
    'image/vnd.wap.wbmp' => [%w(wbmp), %w(), 'WBMP image'],
    'image/webp' => [%w(webp), %w(), 'WebP image'],
    'image/x-3ds' => [%w(3ds), %w(), '3D Studio image'],
    'image/x-adobe-dng' => [%w(dng), %w(image/tiff image/x-dcraw), 'Adobe DNG negative'],
-    'image/x-apple-ios-png' => [%w(png), %w(), 'Apple optimised PNG image'],
    'image/x-applix-graphics' => [%w(ag), %w(), 'Applix Graphics image'],
    'image/x-bzeps' => [%w(eps.bz2 epsf.bz2 epsi.bz2), %w(application/x-bzip), 'EPS image (bzip-compressed)'],
    'image/x-canon-cr2' => [%w(cr2), %w(image/tiff image/x-dcraw), 'Canon CR2 raw image'],
@@ -1305,6 +1324,7 @@ class MimeMagic
    'text/css' => [%w(css), %w(text/plain), 'CSS stylesheet'],
    'text/csv' => [%w(csv), %w(text/plain), 'CSV document'],
    'text/html' => [%w(htm html), %w(text/plain), 'HTML document'],
+    'text/markdown' => [%w(markdown md mkd), %w(text/plain), 'Markdown document'],
    'text/plain' => [%w(asc txt), %w(), 'plain text document'],
    'text/richtext' => [%w(rtx), %w(text/plain), 'rich text document'],
    'text/sgml' => [%w(sgm sgml), %w(text/plain), 'SGML document'],
@@ -1335,6 +1355,7 @@ class MimeMagic
    'text/x-emacs-lisp' => [%w(el), %w(text/plain), 'Emacs Lisp source code'],
    'text/x-erlang' => [%w(erl), %w(text/plain), 'Erlang source code'],
    'text/x-fortran' => [%w(f f90 f95 for), %w(text/plain), 'Fortran source code'],
+    'text/x-genie' => [%w(gs), %w(text/plain), 'Genie source code'],
    'text/x-gettext-translation' => [%w(po), %w(text/plain), 'translation file'],
    'text/x-gettext-translation-template' => [%w(pot), %w(text/plain), 'translation template'],
    'text/x-go' => [%w(go), %w(text/plain), 'Go source code'],
@@ -1350,7 +1371,6 @@ class MimeMagic
    'text/x-log' => [%w(log), %w(text/plain), 'application log'],
    'text/x-lua' => [%w(lua), %w(application/x-executable text/plain), 'Lua script'],
    'text/x-makefile' => [%w(mak mk), %w(text/plain), 'Makefile'],
-    'text/x-markdown' => [%w(markdown md mkd), %w(text/plain), 'Markdown document'],
    'text/x-matlab' => [%w(m), %w(text/plain), 'MATLAB script/function'],
    'text/x-microdvd' => [%w(sub), %w(text/plain), 'MicroDVD subtitles'],
    'text/x-moc' => [%w(moc), %w(text/plain), 'Qt MOC file'],
@@ -1369,7 +1389,7 @@ class MimeMagic
    'text/x-pascal' => [%w(p pas), %w(text/plain), 'Pascal source code'],
    'text/x-patch' => [%w(diff patch), %w(text/plain), 'differences between files'],
    'text/x-python' => [%w(py pyx wsgi), %w(application/x-executable text/plain), 'Python script'],
-    'text/x-qml' => [%w(qml), %w(), 'Qt Markup Language file'],
+    'text/x-qml' => [%w(qml qmlproject qmltypes), %w(), 'Qt Markup Language file'],
    'text/x-reject' => [%w(rej), %w(text/plain), 'rejected patch'],
    'text/x-rpm-spec' => [%w(spec), %w(text/plain), 'RPM spec file'],
    'text/x-scala' => [%w(scala), %w(text/plain), 'Scala source code'],
@@ -1398,13 +1418,13 @@ class MimeMagic
    'video/annodex' => [%w(axv), %w(application/annodex), 'Annodex Video'],
    'video/dv' => [%w(dv), %w(), 'DV video'],
    'video/mp2t' => [%w(bdm bdmv clpi cpi m2t m2ts mpl mpls mts ts), %w(), 'MPEG-2 transport stream'],
-    'video/mp4' => [%w(f4v m4v mp4), %w(), 'MPEG-4 video'],
+    'video/mp4' => [%w(f4v lrv m4v mp4), %w(), 'MPEG-4 video'],
    'video/mpeg' => [%w(mp2 mpe mpeg mpg vob), %w(), 'MPEG video'],
    'video/ogg' => [%w(ogg ogv), %w(application/ogg), 'Ogg Video'],
    'video/quicktime' => [%w(moov mov qt qtvr), %w(), 'QuickTime video'],
-    'video/vivo' => [%w(viv vivo), %w(), 'Vivo video'],
    'video/vnd.mpegurl' => [%w(m1u m4u mxu), %w(text/plain), 'MPEG video (streamed)'],
    'video/vnd.rn-realvideo' => [%w(rv rvx), %w(), 'RealVideo document'],
+    'video/vnd.vivo' => [%w(viv vivo), %w(), 'Vivo video'],
    'video/webm' => [%w(webm), %w(), 'WebM video'],
    'video/x-flic' => [%w(flc fli), %w(), 'FLIC animation'],
    'video/x-flv' => [%w(flv), %w(), 'Flash video'],
@@ -1441,7 +1461,6 @@ class MimeMagic
    ['audio/x-speex+ogg', [[0, 'OggS', [[28, 'Speex  ']]]]],
    ['audio/x-vorbis+ogg', [[0, 'OggS', [[28, "\001vorbis"]]]]],
    ['image/svg+xml', [[0..256, '<!DOCTYPE svg'], [0..256, '<svg']]],
-    ['image/x-apple-ios-png', [[0, "\211PNG", [[12, 'CgBI']]]]],
    ['image/x-kodak-kdc', [[242, 'EASTMAN KODAK COMPANY']]],
    ['image/x-niff', [[0, 'IIN1']]],
    ['text/x-qml', [[0..256, 'import Qt ']]],
@@ -1467,7 +1486,7 @@ class MimeMagic
    ['application/x-quicktime-media-link', [[0, '<?xml', [[0..64, '<?quicktime']]], [0, 'RTSPtext'], [0, 'rtsptext'], [0, 'SMILtext']]],
    ['audio/vnd.dts.hd', [[0..18725, 'dX %']]],
    ['text/x-txt2tags', [[0, '%!postproc'], [0, '%!encoding']]],
-    ['application/smil', [[0..256, '<smil']]],
+    ['application/smil+xml', [[0..256, '<smil']]],
    ['audio/x-ms-asx', [[0, 'ASF '], [0..64, '<ASX'], [0..64, '<asx'], [0..64, '<Asx']]],
    ['application/annodex', [[0, 'OggS', [[28, "fishead\000", [[56..512, "CMML\000\000\000\000"]]]]]]],
    ['application/dicom', [[128, 'DICM']]],
@@ -1489,6 +1508,7 @@ class MimeMagic
    ['application/rtf', [[0, "{\\rtf"]]],
    ['application/sdp', [[0, 'v=', [[0..256, 's=']]]]],
    ['application/vnd.adobe.flash.movie', [[0, 'FWS'], [0, 'CWS']]],
+    ['application/vnd.debian.binary-package', [[0, '!<arch>', [[8, 'debian']]]]],
    ['application/vnd.emusic-emusic_package', [[0, 'nF7YLao']]],
    ['application/vnd.iccprofile', [[36, 'acsp']]],
    ['application/vnd.lotus-1-2-3', [[0, "\000\000\002\000\006\004\006\000\b\000\000\000\000\000"]]],
@@ -1500,6 +1520,7 @@ class MimeMagic
    ['application/vnd.ms-tnef', [[0, "x\237>\""]]],
    ['application/vnd.oasis.opendocument.chart', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.chart']]]]]]],
    ['application/vnd.oasis.opendocument.chart-template', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.chart-template']]]]]]],
+    ['application/vnd.oasis.opendocument.database', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.base']]]]]]],
    ['application/vnd.oasis.opendocument.formula', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.formula']]]]]]],
    ['application/vnd.oasis.opendocument.formula-template', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.formula-template']]]]]]],
    ['application/vnd.oasis.opendocument.graphics', [[0, "PK\003\004", [[30, 'mimetype', [[38, 'application/vnd.oasis.opendocument.graphics']]]]]]],
@@ -1538,7 +1559,6 @@ class MimeMagic
    ['application/x-compress', [[0, "\037\235"]]],
    ['application/x-core', [[0, "\177ELF", [[5, "\001", [[16, "\004\000"]]]]], [0, "\177ELF", [[5, "\002", [[16, "\000\004"]]]]], [0, "Core\001"], [0, "Core\002"]]],
    ['application/x-cpio', [[0, "\307q"], [0, '070701'], [0, '070702'], [0, "q\307"]]],
-    ['application/x-deb', [[0, '!<arch>', [[8, 'debian']]]]],
    ['application/x-desktop', [[0..32, '[Desktop Entry]'], [0, '[Desktop Action'], [0, '[KDE Desktop Entry]'], [0, '# Config File'], [0, '# KDE Config File']]],
    ['application/x-dia-diagram', [[5..100, '<dia:']]],
    ['application/x-dia-shape', [[5..100, '<shape']]],
@@ -1565,7 +1585,6 @@ class MimeMagic
    ['application/x-genesis-rom', [[256, 'SEGA'], [640, 'EAGN'], [640, 'EAMG']]],
    ['application/x-gettext-translation', [[0, "\336\022\004\225"], [0, "\225\004\022\336"]]],
    ['application/x-glade', [[0..256, '<glade-interface']]],
-    ['application/x-gmc-link', [[0..32, 'URL:']]],
    ['application/x-gnumeric', [[0..64, 'gmr:Workbook'], [0..64, 'gnm:Workbook']]],
    ['application/x-go-sgf', [[0, '(;FF[3]'], [0, '(;FF[4]']]],
    ['application/x-gtk-builder', [[0..256, '<interface']]],
@@ -1604,6 +1623,7 @@ class MimeMagic
    ['application/x-perl', [[0, "eval \"exec /usr/local/bin/perl"], [2..16, '/bin/perl'], [2..16, '/bin/env perl'], [0..256, 'use strict'], [0..256, 'use warnings'], [0..256, 'use diagnostics'], [0..256, 'use Test::'], [0..256, 'BEGIN {']]],
    ['application/x-pocket-word', [[0, "{\\pwi"]]],
    ['application/x-python-bytecode', [[0, "\231N\r\n"]]],
+    ['application/x-qpress', [[0, 'qpress10']]],
    ['application/x-qtiplot', [[0, 'QtiPlot']]],
    ['application/x-rar', [[0, 'Rar!']]],
    ['application/x-rpm', [[0, "\355\253\356\333"]]],
@@ -1726,10 +1746,10 @@ class MimeMagic
    ['text/x-makefile', [[0, '#!/usr/bin/make'], [0, '#! /usr/bin/make']]],
    ['text/x-matlab', [[0, 'function']]],
    ['text/x-microdvd', [[0, '{1}'], [0, '{0}'], [0..6, '}{']]],
-    ['text/x-modelica', [[0, 'model']]],
    ['text/x-modelica', [[0, 'class']]],
-    ['text/x-modelica', [[0, 'record']]],
+    ['text/x-modelica', [[0, 'model']]],
    ['text/x-modelica', [[0, 'function']]],
+    ['text/x-modelica', [[0, 'record']]],
    ['text/x-mpsub', [[0..256, 'FORMAT=']]],
    ['text/x-mrml', [[0, '<mrml ']]],
    ['text/x-ms-regedit', [[0, 'REGEDIT'], [0, 'Windows Registry Editor Version 5.00'], [0, "\377\376W\000i\000n\000d\000o\000w\000s\000 \000R\000e\000g\000i\000s\000t\000r\000y\000 \000E\000d\000i\000t\000o\000r\000"]]],
@@ -1792,6 +1812,7 @@ class MimeMagic
    ['application/x-dar', [[0, "\000\000\000{"]]],
    ['application/x-designer', [[0..256, '<ui '], [0..256, '<UI ']]],
    ['application/x-ms-wim', [[0, "MSWIM\000\000\000"]]],
+    ['application/x-n64-rom', [[0, "\2007\022@"], [0, "7\200@\022"], [0, "@\0227\200"]]],
    ['application/x-ruby', [[2..16, '/bin/env ruby'], [2..16, '/bin/ruby']]],
    ['application/x-sqlite2', [[0, '** This file contains an SQLite']]],
    ['application/x-sqlite3', [[0, 'SQLite format 3']]],

--- a/script/freedesktop.org.xml
+++ b/script/freedesktop.org.xml