Hello community, here is the log from the commit of package shared-mime-info for openSUSE:Factory checked in at 2014-04-15 07:35:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shared-mime-info (Old) and /work/SRC/openSUSE:Factory/.shared-mime-info.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shared-mime-info" Changes: -------- --- /work/SRC/openSUSE:Factory/shared-mime-info/shared-mime-info.changes 2014-02-13 06:51:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shared-mime-info.new/shared-mime-info.changes 2014-04-15 07:35:22.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Apr 8 23:10:43 UTC 2014 - [email protected] + +- Update to version 1.3: + + Mime-type changes: + - Add Aliases for OpenOffice Base and StarWriter. + - Add Apple Keynote 5 mime-type. + - Add mimetype for compressed FictionBook2. + - Don't recognize all .asc files as application/pgp-encrypted. + - Add tree magic for the Kindle e-book reader. + - Add LZ4 archive type. + - Add PC Engine, GameCube and Wii "ROM" types. + - Add audio/x-opus+ogg mime-type. + - Add image/webp mime-type. + - Prefer application/vnd.ms-asf to video/x-ms-asf. + - Add application/x-riff mime-type. + - Add JSON mime-type. + - Add *.jsm glob for Javascript. + - Add magic and glob patterns for compressed x-spss-sav files. + - JavaScript and CSS are not subclasses of text/x-csrc. + - Remove *.CSSL glob for CSS files. + + Call g_type_init() only with older glib. + + Fix failures on NetBSD. + + Store MEDIA/SUBTYPE.xml files in lowercase. + +------------------------------------------------------------------- Old: ---- shared-mime-info-1.2.tar.xz New: ---- shared-mime-info-1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-mime-info.spec ++++++ --- /var/tmp/diff_new_pack.7Sm8aC/_old 2014-04-15 07:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.7Sm8aC/_new 2014-04-15 07:35:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: shared-mime-info -Version: 1.2 +Version: 1.3 Release: 0 # FIXME: Remove workaround for fdo#70366 once fixed Url: http://freedesktop.org/wiki/Software/shared-mime-info ++++++ shared-mime-info-1.2.tar.xz -> shared-mime-info-1.3.tar.xz ++++++ ++++ 5466 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/ChangeLog new/shared-mime-info-1.3/ChangeLog --- old/shared-mime-info-1.2/ChangeLog 2013-09-30 12:17:17.000000000 +0200 +++ new/shared-mime-info-1.3/ChangeLog 2014-04-08 14:51:00.000000000 +0200 @@ -1,3 +1,328 @@ +commit 9e46e73c60d129a2367eb715ae55d9f503c26074 +Author: Bastien Nocera <[email protected]> +Date: Tue Apr 8 14:50:50 2014 +0200 + + 1.3 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit bbc47d00112526c2c409e72e9f4d38cc3a311bf8 +Author: Bastien Nocera <[email protected]> +Date: Wed Apr 2 11:41:42 2014 +0200 + + Add missing *.jsm test case file + + Was missing from the earlier commit. + + tests/Utils.jsm | 498 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 498 insertions(+) + +commit 8ecd4d643abc915d70db6fab46b17d32dfe64360 +Author: Bastien Nocera <[email protected]> +Date: Wed Apr 2 11:38:01 2014 +0200 + + Remove *.CSSL glob for CSS files + + It was probably meant to be *.CSS1 (one, not "L") which got badly + transposed when the KDE and GNOME databases were merged more than + 10 years ago. + + As nobody seems to have missed *.CSS1 and *.CSSL is wrong, remove it. + + https://bugs.freedesktop.org/show_bug.cgi?id=76940 + + freedesktop.org.xml.in | 1 - + 1 file changed, 1 deletion(-) + +commit 1c302e1cf2db02c4262bcb6501b337a2c9ea09fd +Author: Gordon P. Hemsley <[email protected]> +Date: Wed Jan 15 00:56:55 2014 -0500 + + JavaScript and CSS are not subclasses of text/x-csrc + + and add test files for CSS. + + https://bugs.freedesktop.org/show_bug.cgi?id=73648 + + freedesktop.org.xml.in | 4 +- + tests/html4.css | 78 ++++++++ + tests/html5.css | 507 +++++++++++++++++++++++++++++++++++++++++++++++++ + tests/list | 4 + + 4 files changed, 591 insertions(+), 2 deletions(-) + +commit 7f0731f461cbdd980c6b9312d60a515f29ae23d2 +Author: Ben Pfaff <[email protected]> +Date: Fri Nov 15 07:13:00 2013 +0000 + + Add magic and glob patterns for compressed x-spss-sav files + + https://bugs.freedesktop.org/show_bug.cgi?id=71632 + + freedesktop.org.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit a6d00cedc6eafe9af825f3f4267f27abfff65baa +Author: Bastien Nocera <[email protected]> +Date: Tue Apr 1 10:11:32 2014 +0200 + + Add *.jsm glob for Javascript + + As used in Gecko/Firefox related projects. + + https://bugs.freedesktop.org/show_bug.cgi?id=75031 + + freedesktop.org.xml.in | 1 + + tests/list | 2 ++ + 2 files changed, 3 insertions(+) + +commit 3805d0bcf22b6344fb4a4a36ad4e15e30d17b624 +Author: Bastien Nocera <[email protected]> +Date: Mon Mar 31 16:22:33 2014 +0200 + + Store MEDIA/SUBTYPE.xml files in lowercase + + RFC 2045 says that MIME type names (e.g. text/plain) are + case-insensitive. Most are written by convention in lowercase, although + there are a few exceptions currently in the freedesktop.org.xml + database. + + Store the separate mime files as lower-case to make them easily findable + (eg. the synonymous application/vnd.*macroEnabled* and *macroenabled* + mime-type should have the same filename). + + https://bugs.freedesktop.org/show_bug.cgi?id=62473 + + update-mime-database.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit acb7222ada2ad165a84d0bd33f2af1a93b43d3a8 +Author: Gordon P. Hemsley <[email protected]> +Date: Tue Jan 14 23:18:50 2014 -0500 + + Add JSON mime-type + + As application/json. + + https://bugs.freedesktop.org/show_bug.cgi?id=73646 + + freedesktop.org.xml.in | 8 ++++++++ + tests/json_array.json | 22 ++++++++++++++++++++++ + tests/json_object.json | 13 +++++++++++++ + tests/list | 3 +++ + 4 files changed, 46 insertions(+) + +commit ffbe705bb4035c8511df341005125933cb91b9ee +Author: Bastien Nocera <[email protected]> +Date: Mon Mar 31 15:54:19 2014 +0200 + + Add application/x-riff mime-type + + And make it steal audio/x-riff magic. RIFF is a container format, + not an audio format, so any type of data could be contained in RIFF. + + See also http://en.wikipedia.org/wiki/Resource_Interchange_File_Format + + freedesktop.org.xml.in | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2143958c0ddcbaf0e4c68c2c49106399cdd60625 +Author: Bastien Nocera <[email protected]> +Date: Mon Mar 31 15:38:10 2014 +0200 + + Remove image/x-webp alias + + It was only defined for a couple of weeks, and only within + shared-mime-info, no need to keep it. + + freedesktop.org.xml.in | 1 - + 1 file changed, 1 deletion(-) + +commit 721c7e33cfdfe35d85de44bc68e1f1c8629fec4f +Author: Bastien Nocera <[email protected]> +Date: Mon Mar 31 15:36:40 2014 +0200 + + Switch WebP mime-type and alias around + + The request for a WebP mime-type was made with the IANA, but still + not processed to this day. It's unlikely that the mime-type ever + be rejected, so add image/webp as the main mime-type. + + freedesktop.org.xml.in | 4 ++-- + tests/list | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit e89ec55272a45500ce99361d1aeda83de1ba4c79 +Author: Alex Henrie <[email protected]> +Date: Tue Jan 14 01:48:20 2014 -0700 + + Prefer application/vnd.ms-asf to video/x-ms-asf + + https://bugs.freedesktop.org/show_bug.cgi?id=73597 + + freedesktop.org.xml.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7612a110f9a42db4730a8c6d1fff6d78c899d53d +Author: Igor Murzov <[email protected]> +Date: Sun Mar 31 02:54:27 2013 +0400 + + Add image/x-webp mime-type + + Magic information from: + https://developers.google.com/speed/webp/docs/riff_container#webp-file-header + + https://bugs.freedesktop.org/show_bug.cgi?id=41155 + + freedesktop.org.xml.in | 10 ++++++++++ + tests/list | 1 + + tests/test.webp | Bin 0 -> 244 bytes + 3 files changed, 11 insertions(+) + +commit b067788e51cd5498944e85f707300fee9f2d1b32 +Author: Igor Murzov <[email protected]> +Date: Sun Mar 31 11:30:11 2013 +0400 + + Add audio/x-opus+ogg mime-type + + https://bugs.freedesktop.org/show_bug.cgi?id=63106 + + freedesktop.org.xml.in | 11 +++++++++++ + tests/list | 1 + + tests/test.opus | Bin 0 -> 7174 bytes + 3 files changed, 12 insertions(+) + +commit 4b0bc62b3e50f25d0ef42950e0b715274637c548 +Author: Bastien Nocera <[email protected]> +Date: Sun Jan 19 15:48:58 2014 +0100 + + Add PC Engine, GameCube and Wii "ROM" types + + The different types of Wii disc images are merged into one, as + there's likely no difference between support one and all for the + majority of applications. + + Magic for Wii and GameCube images from: + http://wit.wiimm.de/download/magic.txt + + freedesktop.org.xml.in | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit 0412d9ceda5ff94a7eb2159b6d5eaa31a1c81426 +Author: Bastien Nocera <[email protected]> +Date: Sun Jan 19 15:47:54 2014 +0100 + + tests: Make iso-file.iso a real ISO file + + Instead of an empty one. That's the first 1k of a Fedora 20 + nightly image. + + tests/iso-file.iso | Bin 0 -> 1024 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 62345c56c9e2e582dbe00cc1b19e86930fe00863 +Author: Ville Skyttä <[email protected]> +Date: Sun Jan 5 15:18:34 2014 +0200 + + Add LZ4 archive type + + http://fastcompression.blogspot.com/2013/04/lz4-streaming-format-final.html + + freedesktop.org.xml.in | 9 +++++++++ + tests/list | 2 ++ + tests/test.lz4 | Bin 0 -> 25 bytes + 3 files changed, 11 insertions(+) + +commit e4d7715f3c3b77b4eec4e89299f0235202ecd0d4 +Author: Bastien Nocera <[email protected]> +Date: Sun Dec 22 17:19:40 2013 +0100 + + Add magic for the Kindle e-book reader + + freedesktop.org.xml.in | 1 + + 1 file changed, 1 insertion(+) + +commit 4f33cfd52a4a794f9dfeb2e53b788780d5d3f1c5 +Author: Jérémy Bobbio <[email protected]> +Date: Wed Oct 16 11:12:28 2013 +0200 + + Do not recognize all .asc files as application/pgp-encrypted + + The change introduced in 2c3438c had the unfortunate effect of having all .asc + be identified as application/pgp-encrypted. As this should only happen when + we can identify armor headers, we now give a lower weight than text/plain to + the *.asc glob for OpenPGP MIME types. + + https://bugs.freedesktop.org/show_bug.cgi?id=70539 + + freedesktop.org.xml.in | 6 +++--- + tests/list | 3 ++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit fe0ce0f210bdd39bcba1d6301e535ab29fc94b91 +Author: David Tardon <[email protected]> +Date: Wed Dec 11 14:07:39 2013 +0100 + + add mimetype for compressed FictionBook2 + + https://bugs.freedesktop.org/show_bug.cgi?id=45795 + + freedesktop.org.xml.in | 11 +++++++++++ + tests/Stallman_Richard_-_The_GNU_Manifesto.fb2.zip | Bin 0 -> 38810 bytes + tests/list | 1 + + 3 files changed, 12 insertions(+) + +commit e8d528ac1c500c3a47fdad308952c377c7439f6a +Author: David Tardon <[email protected]> +Date: Wed Nov 20 11:23:40 2013 +0100 + + add Apple Keynote 5 mime-type + + https://bugs.freedesktop.org/show_bug.cgi?id=71827 + + freedesktop.org.xml.in | 13 +++++++++++++ + tests/list | 1 + + tests/test.key | Bin 0 -> 2210138 bytes + 3 files changed, 14 insertions(+) + +commit 41f1d5ff2672c30d7f86759e2398b75c88673516 +Author: Thomas Klausner <[email protected]> +Date: Thu Oct 17 04:35:00 2013 +0000 + + Open the fdatasync() fd read/write + + Otherwise it will fail for stricter OSes like NetBSD. + + https://bugs.freedesktop.org/show_bug.cgi?id=70559 + + update-mime-database.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2397314542265405498ea8c82121c174ed9011a5 +Author: Bastien Nocera <[email protected]> +Date: Wed Oct 9 22:09:56 2013 +0200 + + test: Call g_type_init() with older glib + + Only call g_type_init() when compiling against an older glib. + + https://bugs.freedesktop.org/show_bug.cgi?id=70255 + + test-tree-magic.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 01e9a5a924a9f382f5e75acd5980a2e058c6ce08 +Author: Samuel Mehrbrodt <[email protected]> +Date: Sun Oct 6 22:43:08 2013 +0200 + + Add Aliases for OpenOffice Base and StarWriter + + https://bugs.freedesktop.org/show_bug.cgi?id=70016 + + freedesktop.org.xml.in | 2 ++ + 1 file changed, 2 insertions(+) + commit 8176c639e18ab5a66a691a3f78a4b9e1077b2c9d Author: Bastien Nocera <[email protected]> Date: Mon Sep 30 12:17:09 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/NEWS new/shared-mime-info-1.3/NEWS --- old/shared-mime-info-1.2/NEWS 2013-09-30 12:17:02.000000000 +0200 +++ new/shared-mime-info-1.3/NEWS 2014-04-08 14:50:39.000000000 +0200 @@ -1,3 +1,26 @@ +shared-mime-info 1.3 (2014-04-08) +* Mime-type changes: +- Add Aliases for OpenOffice Base and StarWriter +- Add Apple Keynote 5 mime-type +- Add mimetype for compressed FictionBook2 +- Don't recognize all .asc files as application/pgp-encrypted +- Add tree magic for the Kindle e-book reader +- Add LZ4 archive type +- Add PC Engine, GameCube and Wii "ROM" types +- Add audio/x-opus+ogg mime-type +- Add image/webp mime-type +- Prefer application/vnd.ms-asf to video/x-ms-asf +- Add application/x-riff mime-type +- Add JSON mime-type +- Add *.jsm glob for Javascript +- Add magic and glob patterns for compressed x-spss-sav files +- JavaScript and CSS are not subclasses of text/x-csrc +- Remove *.CSSL glob for CSS files + +* Call g_type_init() only with older glib +* Fix failures on NetBSD +* Store MEDIA/SUBTYPE.xml files in lowercase + shared-mime-info 1.2 (2013-09-30) * Mime-type changes: - Use IANA registered application/sql type for SQL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/configure.ac new/shared-mime-info-1.3/configure.ac --- old/shared-mime-info-1.2/configure.ac 2013-09-30 12:09:12.000000000 +0200 +++ new/shared-mime-info-1.3/configure.ac 2014-04-08 14:50:47.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([shared-mime-info],[1.2],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info]) +AC_INIT([shared-mime-info],[1.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info]) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/freedesktop.org.xml new/shared-mime-info-1.3/freedesktop.org.xml --- old/shared-mime-info-1.2/freedesktop.org.xml 2013-09-30 12:01:36.000000000 +0200 +++ new/shared-mime-info-1.3/freedesktop.org.xml 2014-04-08 14:51:03.000000000 +0200 @@ -967,7 +967,7 @@ </magic> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> - <glob pattern="*.asc"/> + <glob weight="10" pattern="*.asc"/> <alias type="application/pgp"/> </mime-type> <mime-type type="application/pgp-keys"> @@ -1033,7 +1033,7 @@ </magic> <glob pattern="*.skr"/> <glob pattern="*.pkr"/> - <glob pattern="*.asc"/> + <glob weight="10" pattern="*.asc"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> </mime-type> @@ -1089,7 +1089,7 @@ <magic priority="50"> <match value="-----BEGIN PGP SIGNATURE-----" type="string" offset="0"/> </magic> - <glob pattern="*.asc"/> + <glob weight="10" pattern="*.asc"/> <glob pattern="*.sig"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> @@ -3681,6 +3681,7 @@ <magic priority="90"> <match value="StarWriter" type="string" offset="2089"/> </magic> + <alias type="application/vnd.stardivision.writer-global"/> </mime-type> <mime-type type="application/vnd.sun.xml.calc"> <comment>OpenOffice Calc spreadsheet</comment> @@ -5260,6 +5261,7 @@ <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> <glob pattern="*.odb"/> + <alias type="application/vnd.sun.xml.base"/> </mime-type> <mime-type type="application/vnd.oasis.opendocument.image"> <comment>ODI image</comment> @@ -5693,8 +5695,10 @@ <alias type="application/x-spss-savefile"/> <magic priority="50"> <match value="$FL2" type="string" offset="0"/> + <match value="$FL3" type="string" offset="0"/> </magic> <glob pattern="*.sav"/> + <glob pattern="*.zsav"/> </mime-type> <mime-type type="application/x-xbel"> <comment>XBEL bookmarks</comment> @@ -7939,6 +7943,33 @@ <generic-icon name="application-x-executable"/> <glob pattern="*.nds"/> </mime-type> + <mime-type type="application/x-pc-engine-rom"> + <comment>PC Engine ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.pce"/> + </mime-type> + <mime-type type="application/x-wii-rom"> + <comment>Wii disc image</comment> + <alias type="application/x-wii-iso-image"/> + <alias type="application/x-wbfs"/> + <alias type="application/x-wia"/> + <generic-icon name="application-x-executable"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match value="0x5d1c9ea3" type="big32" offset="24"/> + <match value="WBFS" type="string" offset="0"/> + <match value="WII\001DISC" type="string" offset="0"/> + </magic> + </mime-type> + <mime-type type="application/x-gamecube-rom"> + <comment>GameCube disc image</comment> + <generic-icon name="application-x-executable"/> + <alias type="application/x-gamecube-iso-image"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match value="0xc2339f3d" type="big32" offset="28"/> + </magic> + </mime-type> <mime-type type="application/x-deb"> <comment>Debian package</comment> <comment xml:lang="ar">حزمة ديبيان</comment> @@ -8196,6 +8227,17 @@ <alias type="application/x-fictionbook"/> <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0"; localName="FictionBook"/> </mime-type> + <mime-type type="application/x-zip-compressed-fb2"> + <comment>Compressed FictionBook document</comment> + <sub-class-of type="application/zip"/> + <glob pattern="*.fb2.zip"/> + <magic priority="80"> + <match value="PK\003\004" type="string" offset="0"> + + <match value=".fb2" type="string" offset="30:256"/> + </match> + </magic> + </mime-type> <mime-type type="application/x-dia-diagram"> <comment>Dia diagram</comment> <comment xml:lang="ar">خطاطة Dia</comment> @@ -10874,9 +10916,18 @@ <comment xml:lang="zh_TW">JavaScript 程式</comment> <alias type="application/x-javascript"/> <alias type="text/javascript"/> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="application/ecmascript"/> <generic-icon name="text-x-script"/> <glob pattern="*.js"/> + <glob pattern="*.jsm"/> + </mime-type> + <mime-type type="application/json"> + <comment>JSON document</comment> + <acronym>JSON</acronym> + <expanded-acronym>JavaScript Object Notation</expanded-acronym> + <sub-class-of type="application/javascript"/> + <generic-icon name="text-x-script"/> + <glob pattern="*.json"/> </mime-type> <mime-type type="application/x-jbuilder-project"> <comment>JBuilder project</comment> @@ -12192,6 +12243,15 @@ <glob pattern="*.lyx"/> <alias type="text/x-lyx"/> </mime-type> + <mime-type type="application/x-lz4"> + <comment>LZ4 archive</comment> + <generic-icon name="package-x-generic"/> + <magic priority="50"> + <match value="0x184d2204" type="little32" offset="0"/> + <match value="0x184c2102" type="little32" offset="0"/> + </magic> + <glob pattern="*.lz4"/> + </mime-type> <mime-type type="application/x-lzip"> <comment>Lzip archive</comment> <comment xml:lang="ar">أرشيف Lzip</comment> @@ -13849,6 +13909,7 @@ </magic> <glob pattern="*.oga"/> <glob pattern="*.ogg"/> + <glob pattern="*.opus"/> <alias type="audio/x-ogg"/> </mime-type> <mime-type type="video/ogg"> @@ -14018,6 +14079,16 @@ <glob pattern="*.oga"/> <glob pattern="*.ogg"/> </mime-type> + <mime-type type="audio/x-opus+ogg"> + <comment>Opus audio</comment> + <sub-class-of type="audio/ogg"/> + <magic priority="80"> + <match value="OggS" type="string" offset="0"> + <match value="OpusHead" type="string" offset="28"/> + </match> + </magic> + <glob pattern="*.opus"/> + </mime-type> <mime-type type="audio/x-speex+ogg"> <comment>Ogg Speex audio</comment> <comment xml:lang="ar">Ogg Speex سمعي</comment> @@ -19822,7 +19893,7 @@ <comment xml:lang="vi">Âm thanh Windows Media</comment> <comment xml:lang="zh_CN">Windows Media 音频</comment> <comment xml:lang="zh_TW">Windows Media 音訊</comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wma"/> <alias type="audio/wma"/> </mime-type> @@ -20213,6 +20284,9 @@ <comment xml:lang="vi">Âm thanh RIFF</comment> <comment xml:lang="zh_CN">RIFF 音频</comment> <comment xml:lang="zh_TW">RIFF 音訊</comment> + </mime-type> + <mime-type type="application/x-riff"> + <comment>RIFF container</comment> <magic priority="45"> <match value="RIFF" type="string" offset="0"/> @@ -22743,6 +22817,15 @@ <match value="\x45\x50\x2A\x00" type="string" offset="0"/> </magic> </mime-type> + <mime-type type="image/webp"> + <comment>WebP image</comment> + <magic priority="50"> + <match value="RIFF" type="string" offset="0"> + <match value="WEBP" type="string" offset="8"/> + </match> + </magic> + <glob pattern="*.webp"/> + </mime-type> <mime-type type="image/x-3ds"> <comment>3D Studio image</comment> <comment xml:lang="ar">صورة استديو ثلاثية الأبعاد</comment> @@ -26386,9 +26469,8 @@ <comment xml:lang="zh_TW">CSS 樣式表</comment> <acronym>CSS</acronym> <expanded-acronym>Cascading Style Sheets</expanded-acronym> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="text/plain"/> <glob pattern="*.css"/> - <glob pattern="*.CSSL"/> </mime-type> <mime-type type="text/vcard"> <comment>electronic business card</comment> @@ -31967,7 +32049,7 @@ </magic> <glob pattern="*.mng"/> </mime-type> - <mime-type type="video/x-ms-asf"> + <mime-type type="application/vnd.ms-asf"> <comment>ASF video</comment> <comment xml:lang="ar">ASF مرئي</comment> <comment xml:lang="be@latin">Videa ASF</comment> @@ -32015,7 +32097,7 @@ <acronym>ASF</acronym> <expanded-acronym>Advanced Streaming Format</expanded-acronym> <alias type="video/x-ms-wm"/> - <alias type="application/vnd.ms-asf"/> + <alias type="video/x-ms-asf"/> <glob pattern="*.asf"/> <magic priority="50"> <match value="0x3026b275" type="big32" offset="0"/> @@ -32065,7 +32147,7 @@ <comment xml:lang="vi">Tập tin Windows Media Station</comment> <comment xml:lang="zh_CN">Windows 媒体工作站文件</comment> <comment xml:lang="zh_TW">Windows Media Station 檔</comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <generic-icon name="video-x-generic"/> <glob pattern="*.nsc"/> <magic priority="50"> @@ -32115,7 +32197,7 @@ <comment xml:lang="vi">Ảnh động Windows Media</comment> <comment xml:lang="zh_CN">Windows Media 视频</comment> <comment xml:lang="zh_TW">Windows Media 視訊</comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wmv"/> </mime-type> <mime-type type="video/x-msvideo"> @@ -33751,6 +33833,7 @@ <comment xml:lang="zh_TW">e-book 閱讀器</comment> <treemagic> <treematch type="directory" path=".kobo" non-empty="true"/> + <treematch path="system/com.amazon.ebook.booklet.reader" non-empty="false"/> </treemagic> </mime-type> @@ -33996,4 +34079,17 @@ <glob pattern="*.trig"/> </mime-type> + <mime-type type="application/x-iwork-keynote-sffkey"> + <comment>Apple Keynote 5 presentation</comment> + <sub-class-of type="application/zip"/> + <generic-icon name="x-office-presentation"/> + <magic priority="50"> + <match value="PK\003\004" type="string" offset="0"> + <match value="index.apxl" type="string" offset="30"/> + </match> + </magic> + <glob pattern="*.key"/> + <alias type="application/vnd.apple.keynote"/> + </mime-type> + </mime-info> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/freedesktop.org.xml.in new/shared-mime-info-1.3/freedesktop.org.xml.in --- old/shared-mime-info-1.2/freedesktop.org.xml.in 2013-09-30 12:01:23.000000000 +0200 +++ new/shared-mime-info-1.3/freedesktop.org.xml.in 2014-04-08 14:46:11.000000000 +0200 @@ -238,7 +238,7 @@ </magic> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> - <glob pattern="*.asc"/> + <glob pattern="*.asc" weight="10"/> <alias type="application/pgp"/> </mime-type> <mime-type type="application/pgp-keys"> @@ -257,7 +257,7 @@ </magic> <glob pattern="*.skr"/> <glob pattern="*.pkr"/> - <glob pattern="*.asc"/> + <glob pattern="*.asc" weight="10"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> </mime-type> @@ -268,7 +268,7 @@ <magic priority="50"> <match type="string" value="-----BEGIN PGP SIGNATURE-----" offset="0"/> </magic> - <glob pattern="*.asc"/> + <glob pattern="*.asc" weight="10"/> <glob pattern="*.sig"/> <glob pattern="*.pgp"/> <glob pattern="*.gpg"/> @@ -770,6 +770,7 @@ <magic priority="90"> <match type="string" value="StarWriter" offset="2089" /> </magic> + <alias type="application/vnd.stardivision.writer-global"/> </mime-type> <mime-type type="application/vnd.sun.xml.calc"> <_comment>OpenOffice Calc spreadsheet</_comment> @@ -1150,6 +1151,7 @@ <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> <glob pattern="*.odb"/> + <alias type="application/vnd.sun.xml.base"/> </mime-type> <mime-type type="application/vnd.oasis.opendocument.image"> <_comment>ODI image</_comment> @@ -1237,8 +1239,10 @@ <alias type="application/x-spss-savefile"/> <magic priority="50"> <match type="string" offset="0" value="$FL2"/> + <match type="string" offset="0" value="$FL3"/> </magic> <glob pattern="*.sav"/> + <glob pattern="*.zsav"/> </mime-type> <mime-type type="application/x-xbel"> <_comment>XBEL bookmarks</_comment> @@ -1622,6 +1626,33 @@ <generic-icon name="application-x-executable"/> <glob pattern="*.nds"/> </mime-type> + <mime-type type="application/x-pc-engine-rom"> + <_comment>PC Engine ROM</_comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.pce"/> + </mime-type> + <mime-type type="application/x-wii-rom"> + <_comment>Wii disc image</_comment> + <alias type="application/x-wii-iso-image"/> + <alias type="application/x-wbfs"/> + <alias type="application/x-wia"/> + <generic-icon name="application-x-executable"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match offset="24" type="big32" value="0x5d1c9ea3"/> + <match offset="0" type="string" value="WBFS"/> + <match offset="0" type="string" value="WII\001DISC"/> + </magic> + </mime-type> + <mime-type type="application/x-gamecube-rom"> + <_comment>GameCube disc image</_comment> + <generic-icon name="application-x-executable"/> + <alias type="application/x-gamecube-iso-image"/> + <glob pattern="*.iso"/> + <magic priority="50"> + <match offset="28" type="big32" value="0xc2339f3d"/> + </magic> + </mime-type> <mime-type type="application/x-deb"> <_comment>Debian package</_comment> <alias type="application/x-debian-package"/> @@ -1675,6 +1706,17 @@ <alias type="application/x-fictionbook"/> <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0"; localName="FictionBook"/> </mime-type> + <mime-type type="application/x-zip-compressed-fb2"> + <_comment>Compressed FictionBook document</_comment> + <sub-class-of type="application/zip"/> + <glob pattern="*.fb2.zip"/> + <magic priority="80"> + <match type="string" value="PK\003\004" offset="0"> + <!-- Okay, this is not ideal, but it should be good enough for normal cases --> + <match type="string" value=".fb2" offset="30:256"/> + </match> + </magic> + </mime-type> <mime-type type="application/x-dia-diagram"> <_comment>Dia diagram</_comment> <generic-icon name="image-x-generic"/> @@ -2133,9 +2175,18 @@ <_comment>JavaScript program</_comment> <alias type="application/x-javascript"/> <alias type="text/javascript"/> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="application/ecmascript"/> <generic-icon name="text-x-script"/> <glob pattern="*.js"/> + <glob pattern="*.jsm"/> + </mime-type> + <mime-type type="application/json"> + <_comment>JSON document</_comment> + <acronym>JSON</acronym> + <expanded-acronym>JavaScript Object Notation</expanded-acronym> + <sub-class-of type="application/javascript"/> + <generic-icon name="text-x-script"/> + <glob pattern="*.json"/> </mime-type> <mime-type type="application/x-jbuilder-project"> <_comment>JBuilder project</_comment> @@ -2408,6 +2459,15 @@ <glob pattern="*.lyx"/> <alias type="text/x-lyx"/> </mime-type> + <mime-type type="application/x-lz4"> + <_comment>LZ4 archive</_comment> + <generic-icon name="package-x-generic"/> + <magic priority="50"> + <match type="little32" value="0x184d2204" offset="0"/> + <match type="little32" value="0x184c2102" offset="0"/> + </magic> + <glob pattern="*.lz4"/> + </mime-type> <mime-type type="application/x-lzip"> <_comment>Lzip archive</_comment> <generic-icon name="package-x-generic"/> @@ -2702,6 +2762,7 @@ </magic> <glob pattern="*.oga"/> <glob pattern="*.ogg"/> + <glob pattern="*.opus"/> <alias type="audio/x-ogg"/> </mime-type> <mime-type type="video/ogg"> @@ -2742,6 +2803,16 @@ <glob pattern="*.oga"/> <glob pattern="*.ogg"/> </mime-type> + <mime-type type="audio/x-opus+ogg"> + <_comment>Opus audio</_comment> + <sub-class-of type="audio/ogg"/> + <magic priority="80"> + <match type="string" value="OggS" offset="0"> + <match type="string" value="OpusHead" offset="28"/> + </match> + </magic> + <glob pattern="*.opus"/> + </mime-type> <mime-type type="audio/x-speex+ogg"> <_comment>Ogg Speex audio</_comment> <sub-class-of type="audio/ogg"/> @@ -3792,7 +3863,7 @@ </mime-type> <mime-type type="audio/x-ms-wma"> <_comment>Windows Media audio</_comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wma"/> <alias type="audio/wma"/> </mime-type> @@ -3845,6 +3916,9 @@ </mime-type> <mime-type type="audio/x-riff"> <_comment>RIFF audio</_comment> + </mime-type> + <mime-type type="application/x-riff"> + <_comment>RIFF container</_comment> <!-- need to be lower prio than avi --> <magic priority="45"> <match type="string" value="RIFF" offset="0"/> @@ -4282,6 +4356,15 @@ <match type="string" value="\x45\x50\x2A\x00" offset="0"/> </magic> </mime-type> + <mime-type type="image/webp"> + <_comment>WebP image</_comment> + <magic priority="50"> + <match type="string" value="RIFF" offset="0"> + <match type="string" value="WEBP" offset="8"/> + </match> + </magic> + <glob pattern="*.webp"/> + </mime-type> <mime-type type="image/x-3ds"> <_comment>3D Studio image</_comment> <glob pattern="*.3ds"/> @@ -4844,9 +4927,8 @@ <_comment>CSS stylesheet</_comment> <acronym>CSS</acronym> <expanded-acronym>Cascading Style Sheets</expanded-acronym> - <sub-class-of type="text/x-csrc"/> + <sub-class-of type="text/plain"/> <glob pattern="*.css"/> - <glob pattern="*.CSSL"/> </mime-type> <mime-type type="text/vcard"> <_comment>electronic business card</_comment> @@ -5786,12 +5868,12 @@ </magic> <glob pattern="*.mng"/> </mime-type> - <mime-type type="video/x-ms-asf"> + <mime-type type="application/vnd.ms-asf"> <_comment>ASF video</_comment> <acronym>ASF</acronym> <expanded-acronym>Advanced Streaming Format</expanded-acronym> <alias type="video/x-ms-wm"/> - <alias type="application/vnd.ms-asf"/> + <alias type="video/x-ms-asf"/> <glob pattern="*.asf"/> <magic priority="50"> <match type="big32" value="0x3026b275" offset="0"/> @@ -5800,7 +5882,7 @@ </mime-type> <mime-type type="application/x-netshow-channel"> <_comment>Windows Media Station file</_comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <generic-icon name="video-x-generic"/> <glob pattern="*.nsc"/> <magic priority="50"> @@ -5809,7 +5891,7 @@ </mime-type> <mime-type type="video/x-ms-wmv"> <_comment>Windows Media video</_comment> - <sub-class-of type="video/x-ms-asf"/> + <sub-class-of type="application/vnd.ms-asf"/> <glob pattern="*.wmv"/> </mime-type> <mime-type type="video/x-msvideo"> @@ -6109,6 +6191,7 @@ <_comment>e-book reader</_comment> <treemagic> <treematch path=".kobo" type="directory" non-empty="true"/> + <treematch path="system/com.amazon.ebook.booklet.reader" non-empty="false"/> </treemagic> </mime-type> @@ -6165,4 +6248,17 @@ <glob pattern="*.trig" /> </mime-type> + <mime-type type="application/x-iwork-keynote-sffkey"> + <_comment>Apple Keynote 5 presentation</_comment> + <sub-class-of type="application/zip"/> + <generic-icon name="x-office-presentation"/> + <magic priority="50"> + <match type="string" value="PK\003\004" offset="0"> + <match type="string" value="index.apxl" offset="30"/> + </match> + </magic> + <glob pattern="*.key"/> + <alias type="application/vnd.apple.keynote"/> + </mime-type> + </mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/test-tree-magic.c new/shared-mime-info-1.3/test-tree-magic.c --- old/shared-mime-info-1.2/test-tree-magic.c 2012-02-20 00:40:03.000000000 +0100 +++ new/shared-mime-info-1.3/test-tree-magic.c 2013-10-09 22:09:17.000000000 +0200 @@ -637,7 +637,10 @@ char *content, **lines; guint i; +#if GLIB_CHECK_VERSION(2,36,0) +#else g_type_init (); +#endif if (argc != 2) { g_print ("Usage: %s [file]\n", argv[0]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/shared-mime-info-1.2/update-mime-database.c new/shared-mime-info-1.3/update-mime-database.c --- old/shared-mime-info-1.2/update-mime-database.c 2013-07-10 00:10:53.000000000 +0200 +++ new/shared-mime-info-1.3/update-mime-database.c 2014-03-31 16:24:23.000000000 +0200 @@ -951,7 +951,7 @@ new_name = g_strndup(pathname, len - 4); #ifdef HAVE_FDATASYNC - fd = open(pathname, O_RDONLY); + fd = open(pathname, O_RDWR); if (fd == -1) { set_error_from_errno(error); @@ -995,15 +995,20 @@ const char *mime_dir = (char *) data; char *media, *filename; GError *local_error = NULL; + char *lower; - media = g_strconcat(mime_dir, "/", type->media, NULL); + lower = g_ascii_strdown(type->media, -1); + media = g_strconcat(mime_dir, "/", lower, NULL); + g_free(lower); #ifdef _WIN32 mkdir(media); #else mkdir(media, 0755); #endif - filename = g_strconcat(media, "/", type->subtype, ".xml.new", NULL); + lower = g_ascii_strdown(type->subtype, -1); + filename = g_strconcat(media, "/", lower, ".xml.new", NULL); + g_free(lower); g_free(media); media = NULL; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
