Hello community,
here is the log from the commit of package shared-mime-info for openSUSE:Factory checked in at 2016-03-29 14:27:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-10-06 16:13:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.shared-mime-info.new/shared-mime-info.changes 2016-03-29 14:27:49.000000000 +0200
@@ -1,0 +2,22 @@
+Tue Mar 1 23:19:28 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 1.6:
+ + Add XAR archive mime-type.
+ + Add GeoJSON mime-type.
+ + Add GPX mime-type.
+ + Add xdg-app mime-type.
+ + Add *.xht glob and magic for XHTML files.
+ + Bump priority of archive mime-types with long magics, to avoid
+ false positives when detecting files inside the archive itself.
+- Drop xz BuildRequires: this is already part of default build
+ setups for a long time.
+- Drop workaround for fdo#70366 (that is, no longer
+ export ac_cv_func_fdatasync=no).
+- Add PKGSYSTEM_ENABLE_FSYNC=0 to mime_database_post and
+ mime_database_postun macros, which is the upstream provided way
+ to opt-out of the fdatasync call. That variable is checked for
+ since version 1.4.
+- Add PKGSYSTEM_ENABLE_FSYNC=0 to post script (as we do can't use
+ the macros we install with the package there).
+
+-------------------------------------------------------------------
Old:
----
shared-mime-info-1.5.tar.xz
New:
----
shared-mime-info-1.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shared-mime-info.spec ++++++
--- /var/tmp/diff_new_pack.WwyPIL/_old 2016-03-29 14:27:50.000000000 +0200
+++ /var/tmp/diff_new_pack.WwyPIL/_new 2016-03-29 14:27:50.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package shared-mime-info
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,8 @@
Name: shared-mime-info
-Version: 1.5
+Version: 1.6
Release: 0
-# FIXME: Remove workaround for fdo#70366 once fixed
Url: http://freedesktop.org/wiki/Software/shared-mime-info
Summary: Shared MIME Database
License: GPL-2.0+
@@ -33,8 +32,6 @@
# needed for xmllint
BuildRequires: libxml2-tools
BuildRequires: translation-update-upstream
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires: xz
# needed by mime-info-to-mime:
Requires: /bin/mkdir
Requires: /bin/rm
@@ -62,8 +59,6 @@
translation-update-upstream
%build
-# Workaround for fdo#70366
-export ac_cv_func_fdatasync=no
%configure \
--disable-default-make-check
make
@@ -82,6 +77,7 @@
rm -rf $RPM_BUILD_ROOT
%post
+export PKGSYSTEM_ENABLE_FSYNC=0
%{_bindir}/update-mime-database %{_datadir}/mime || true
%files
++++++ macros.shared-mime-info ++++++
--- /var/tmp/diff_new_pack.WwyPIL/_old 2016-03-29 14:27:50.000000000 +0200
+++ /var/tmp/diff_new_pack.WwyPIL/_new 2016-03-29 14:27:50.000000000 +0200
@@ -17,6 +17,7 @@
# On install, update the mime database
%mime_database_post() \
+export PKGSYSTEM_ENABLE_FSYNC=0 \
if test -x %{_bindir}/update-mime-database; then \
%if "x%1" != "x%%1" \
%{_bindir}/update-mime-database "%1" || true \
@@ -28,6 +29,7 @@
# On uninstall, update the mime database. Note: we ignore upgrades (already
# handled in %post of the new package).
%mime_database_postun() \
+export PKGSYSTEM_ENABLE_FSYNC=0 \
if [ $1 -eq 0 ]; then \
if test -x %{_bindir}/update-mime-database; then \
%if "x%1" != "x%%1" \
++++++ shared-mime-info-1.5.tar.xz -> shared-mime-info-1.6.tar.xz ++++++
++++ 3108 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.5/ChangeLog new/shared-mime-info-1.6/ChangeLog
--- old/shared-mime-info-1.5/ChangeLog 2015-09-16 13:51:30.000000000 +0200
+++ new/shared-mime-info-1.6/ChangeLog 2016-02-23 15:24:16.000000000 +0100
@@ -1,4 +1,123 @@
-commit 393414c9dbf101fd76fcba48d72df2b6cd25bb29
+commit f4e094740c36c629b5284ac270a0b08d8c75cb85 (HEAD -> master)
+Author: Bastien Nocera
+Date: Tue Feb 23 15:24:01 2016 +0100
+
+ 1.6
+
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+commit ad6c09059ee31bf1c306755c5f0156f9088f37b9 (origin/master, origin/HEAD)
+Author: Bastien Nocera
+Date: Tue Feb 23 14:45:52 2016 +0100
+
+ Fix GPX test case
+
+ The test case in commit 03ffba0ab5d1bd3897bd26621a20f05f69e707fb was
+ broken, missing the mime-type from the test definition line.
+
+ tests/list | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 02501a18ef73eb97da51051a941627ec484d5e5c
+Author: Alexander Larsson
+Date: Tue Feb 23 14:23:28 2016 +0100
+
+ Add application/vnd.xdgapp
+
+ freedesktop.org.xml.in | 8 ++++++++
+ tests/hello.xdgapp | Bin 0 -> 1220 bytes
+ tests/list | 1 +
+ 3 files changed, 9 insertions(+)
+
+commit 03ffba0ab5d1bd3897bd26621a20f05f69e707fb
+Author: Hashem Nasarat
+Date: Mon Feb 15 04:58:42 2016 -0500
+
+ Add GPX mime-type
+
+ Add application/gpx+xml as specified at:
+ http://www.topografix.com/gpx.asp
+ https://en.wikipedia.org/wiki/GPS_Exchange_Format
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=94154
+
+ freedesktop.org.xml.in | 7 +++++++
+ tests/list | 2 ++
+ tests/test.gpx | 27 +++++++++++++++++++++++++++
+ 3 files changed, 36 insertions(+)
+
+commit 4961dc3e48d13c0c675ad7c135419b864813ca55
+Author: Bastien Nocera
+Date: Thu Jan 7 15:49:16 2016 +0100
+
+ Add magic for XHTML files
+
+ freedesktop.org.xml.in | 6 ++++++
+ tests/list | 3 ++-
+ tests/test.xht | 14 ++++++++++++++
+ 3 files changed, 22 insertions(+), 1 deletion(-)
+
+commit 6e5818deb54fdfa70f5798fc1df1d5c3eaba42df
+Author: Bastien Nocera
+Date: Thu Jan 7 15:48:47 2016 +0100
+
+ Add *.xht as a glob for XHTML files
+
+ freedesktop.org.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 10fc17ec61c5b5c6c0e6ea2c8d7a2123271d07e3
+Author: Bastien Nocera
+Date: Mon Jan 4 17:07:09 2016 +0100
+
+ Bump priority for archives mime-types magic
+
+ When a long enough magic is available (4 characters in this case),
+ prefer the magic of the archive type to the one of the
+ maybe-not-compressed header of the first file in the archive.
+
+ For example, in https://bugs.freedesktop.org/show_bug.cgi?id=93549
+ a PDF inside the RAR archive made the archive be detected as a PDF.
+
+ freedesktop.org.xml.in | 38 +++++++++++++++++++-------------------
+ tests/list | 2 ++
+ tests/serafettin.rar | Bin 0 -> 524288 bytes
+ 3 files changed, 21 insertions(+), 19 deletions(-)
+
+commit 4ed3648868a2c2dddfa8c31aaf660e9d5131fefd
+Author: Jonas Danielsson
+Date: Fri Oct 23 22:22:52 2015 +0200
+
+ Add GeoJSON mime-type
+
+ Add application/vnd.geo+json as specified by IANA at:
+ http://www.iana.org/assignments/media-types/application/vnd.geo+json
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=92654
+
+ freedesktop.org.xml.in | 6 ++++++
+ tests/list | 3 +++
+ tests/test.geo.json | 1 +
+ tests/test.geojson | 1 +
+ 4 files changed, 11 insertions(+)
+
+commit 85bced9a503d0dcec06f24aa97e4ef587439e688
+Author: Ville Skyttä
+Date: Fri Sep 25 12:53:37 2015 +0300
+
+ application/x-xar: Add XAR archive
+
+ https://code.google.com/p/xar/wiki/xarformat
+ https://en.wikipedia.org/wiki/Installer_(OS_X)#Installer_package
+
+ freedesktop.org.xml.in | 12 ++++++++++++
+ tests/list | 2 ++
+ tests/test.xar | Bin 0 -> 310 bytes
+ 3 files changed, 14 insertions(+)
+
+commit 393414c9dbf101fd76fcba48d72df2b6cd25bb29 (tag: Release-1-5)
Author: Bastien Nocera
Date: Wed Sep 16 13:46:12 2015 +0200
@@ -714,7 +833,7 @@
po/zh_TW.po | 1024 +++++++++----------
69 files changed, 37758 insertions(+), 34404 deletions(-)
-commit c136fc2578aa8f7c0e098008da18d324033eb991
+commit c136fc2578aa8f7c0e098008da18d324033eb991 (tag: Release-1-4)
Author: Bastien Nocera
Date: Thu Feb 5 15:28:41 2015 +0100
@@ -1323,7 +1442,7 @@
freedesktop.org.xml.in | 1 +
1 file changed, 1 insertion(+)
-commit 9e46e73c60d129a2367eb715ae55d9f503c26074
+commit 9e46e73c60d129a2367eb715ae55d9f503c26074 (tag: Release-1-3)
Author: Bastien Nocera
Date: Tue Apr 8 14:50:50 2014 +0200
@@ -1648,7 +1767,7 @@
freedesktop.org.xml.in | 2 ++
1 file changed, 2 insertions(+)
-commit 8176c639e18ab5a66a691a3f78a4b9e1077b2c9d
+commit 8176c639e18ab5a66a691a3f78a4b9e1077b2c9d (tag: Release-1-2)
Author: Bastien Nocera
Date: Mon Sep 30 12:17:09 2013 +0200
@@ -2034,7 +2153,7 @@
update-mime-database.c | 225 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 158 insertions(+), 67 deletions(-)
-commit f9d4f260d78b263c9730786df5db20df998b734d
+commit f9d4f260d78b263c9730786df5db20df998b734d (tag: Release-1-1)
Author: Bastien Nocera
Date: Wed Feb 13 14:32:20 2013 +0100
@@ -3048,7 +3167,7 @@
tests/test.ccmx | 18 ++++++++++++++++++
3 files changed, 29 insertions(+)
-commit cdf866acbee836578128bf652bd775f8f8225be9
+commit cdf866acbee836578128bf652bd775f8f8225be9 (tag: Release-1-0)
Author: Bastien Nocera
Date: Tue Jan 17 16:22:01 2012 +0000
@@ -3396,7 +3515,7 @@
freedesktop.org.xml.in | 7 +++++++
1 file changed, 7 insertions(+)
-commit 5ee6883cb0dda03e82c7555a032d88504d67de89
+commit 5ee6883cb0dda03e82c7555a032d88504d67de89 (tag: Release-0-91)
Author: Bastien Nocera
Date: Sun Sep 18 03:59:37 2011 +0100
@@ -4223,7 +4342,7 @@
tests/test.cbl | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
-commit 1b716d7f4d6548effb8473301acd72ed59cb358b
+commit 1b716d7f4d6548effb8473301acd72ed59cb358b (tag: Release-0-90)
Author: Bastien Nocera
Date: Wed Dec 1 17:34:00 2010 +0000
@@ -4741,7 +4860,7 @@
po/pl.po | 388 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 198 insertions(+), 190 deletions(-)
-commit beca76ed2a757bbf74118e522d5a6e05f71fcbf4
+commit beca76ed2a757bbf74118e522d5a6e05f71fcbf4 (tag: Release-0-80)
Author: Bastien Nocera
Date: Thu Sep 30 18:12:51 2010 +0100
@@ -6963,7 +7082,7 @@
po/it.po | 1164 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 609 insertions(+), 555 deletions(-)
-commit 009fd196ca1f13f3d8a4b9c24208244fa40b0af3
+commit 009fd196ca1f13f3d8a4b9c24208244fa40b0af3 (tag: Release-0-71)
Author: Bastien Nocera
Date: Mon Feb 1 17:40:40 2010 +0000
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.5/NEWS new/shared-mime-info-1.6/NEWS
--- old/shared-mime-info-1.5/NEWS 2015-09-16 13:51:12.000000000 +0200
+++ new/shared-mime-info-1.6/NEWS 2016-02-23 15:23:54.000000000 +0100
@@ -1,3 +1,13 @@
+shared-mime-info 1.6 (2016-02-23)
+* Add XAR archive mime-type
+* Add GeoJSON mime-type
+* Add GPX mime-type
+* Add xdg-app mime-type
+* Add *.xht glob and magic for XHTML files
+* Bump priority of archive mime-types with long magics,
+ to avoid false positives when detecting files inside
+ the archive itself
+
shared-mime-info 1.5 (2015-09-15)
* Fix compilation with glib < 2.26
* Update DTD
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.5/configure.ac new/shared-mime-info-1.6/configure.ac
--- old/shared-mime-info-1.5/configure.ac 2015-09-16 13:51:12.000000000 +0200
+++ new/shared-mime-info-1.6/configure.ac 2016-02-23 15:21:08.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([shared-mime-info],[1.5],[https://bugs.freedesktop.org/enter_bug.cgi?product=shared-mime-info])
+AC_INIT([shared-mime-info],[1.6],[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.5/freedesktop.org.xml new/shared-mime-info-1.6/freedesktop.org.xml
--- old/shared-mime-info-1.5/freedesktop.org.xml 2015-09-16 13:39:12.000000000 +0200
+++ new/shared-mime-info-1.6/freedesktop.org.xml 2016-02-23 14:42:21.000000000 +0100
@@ -2711,7 +2711,7 @@
<comment xml:lang="zh_CN">Microsoft CAB 归档文件</comment>
<comment xml:lang="zh_TW">微軟 Cabinet 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="MSCF\0\0\0\0" type="string" offset="0"/>
</magic>
<glob pattern="*.cab"/>
@@ -6267,7 +6267,7 @@
<comment xml:lang="zh_CN">7-zip 归档文件</comment>
<comment xml:lang="zh_TW">7-zip 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="7z\274\257\047\034" type="string" offset="0"/>
</magic>
<glob pattern="*.7z"/>
@@ -6657,7 +6657,7 @@
<comment xml:lang="zh_CN">ARC 归档文件</comment>
<comment xml:lang="zh_TW">ARC 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="0x0000081a" type="little32" offset="0" mask="0x8080ffff"/>
<match value="0x0000091a" type="little32" offset="0" mask="0x8080ffff"/>
<match value="0x0000021a" type="little32" offset="0" mask="0x8080ffff"/>
@@ -7574,7 +7574,7 @@
<comment xml:lang="zh_CN">Lrzip 归档文件</comment>
<comment xml:lang="zh_TW">Lrzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="LRZI" type="string" offset="0"/>
</magic>
<glob pattern="*.lrz"/>
@@ -8226,7 +8226,7 @@
<comment xml:lang="zh_CN">CPIO 归档文件</comment>
<comment xml:lang="zh_TW">CPIO 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="070707" type="host16" offset="0"/>
<match value="070701" type="string" offset="0"/>
<match value="070702" type="string" offset="0"/>
@@ -11724,7 +11724,7 @@
<comment xml:lang="zh_CN">Pack200 Java 归档文件</comment>
<comment xml:lang="zh_TW">Pack200 Java 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="0xcafed00d" type="big32" offset="0"/>
</magic>
<glob pattern="*.pack"/>
@@ -13031,7 +13031,7 @@
<comment xml:lang="zh_CN">LHA 归档文件</comment>
<comment xml:lang="zh_TW">LHA 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="-lh -" type="string" offset="2"/>
<match value="-lh0-" type="string" offset="2"/>
<match value="-lh1-" type="string" offset="2"/>
@@ -13245,7 +13245,7 @@
<comment xml:lang="zh_CN">LZ4 归档文件</comment>
<comment xml:lang="zh_TW">LZ4 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="0x184d2204" type="little32" offset="0"/>
<match value="0x184c2102" type="little32" offset="0"/>
</magic>
@@ -13294,7 +13294,7 @@
<comment xml:lang="zh_CN">Lzip 归档文件</comment>
<comment xml:lang="zh_TW">Lzip 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="LZIP" type="string" offset="0"/>
</magic>
<glob pattern="*.lz"/>
@@ -13454,7 +13454,7 @@
<acronym>LZO</acronym>
<expanded-acronym>Lempel-Ziv-Oberhumer</expanded-acronym>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a" type="string" offset="0"/>
</magic>
<glob pattern="*.lzo"/>
@@ -13490,11 +13490,23 @@
<comment xml:lang="zh_CN">Qpress 归档文件</comment>
<comment xml:lang="zh_TW">Qpress 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="qpress10" type="string" offset="0"/>
</magic>
<glob pattern="*.qp"/>
</mime-type>
+ <mime-type type="application/x-xar">
+ <comment>XAR archive</comment>
+ <acronym>XAR</acronym>
+ <expanded-acronym>eXtensible ARchive</expanded-acronym>
+ <generic-icon name="package-x-generic"/>
+ <magic priority="60">
+ <match value="0x78617221" type="big32" offset="0"/>
+ </magic>
+ <glob pattern="*.xar"/>
+
+ <glob pattern="*.pkg"/>
+ </mime-type>
<mime-type type="application/zlib">
<comment>Zlib archive</comment>
<comment xml:lang="ca">arxiu Zlib</comment>
@@ -15919,7 +15931,7 @@
<acronym>Parchive</acronym>
<expanded-acronym>Parity Volume Set Archive</expanded-acronym>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="PAR2" type="string" offset="0"/>
</magic>
<glob pattern="*.PAR2"/>
@@ -16730,7 +16742,7 @@
<expanded-acronym>Roshal ARchive</expanded-acronym>
<alias type="application/x-rar-compressed"/>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="Rar!" type="string" offset="0"/>
</magic>
<glob pattern="*.rar"/>
@@ -17825,7 +17837,7 @@
<generic-icon name="package-x-generic"/>
<alias type="application/stuffit"/>
<alias type="application/x-sit"/>
- <magic priority="50">
+ <magic priority="60">
<match value="StuffIt " type="string" offset="0"/>
<match value="SIT!" type="string" offset="0"/>
</magic>
@@ -18593,7 +18605,7 @@
<comment xml:lang="zh_TW">Tar 封存檔</comment>
<generic-icon name="package-x-generic"/>
<alias type="application/x-gtar"/>
- <magic priority="50">
+ <magic priority="60">
<match value="ustar\0" type="string" offset="257"/>
<match value="ustar\040\040\0" type="string" offset="257"/>
</magic>
@@ -19190,7 +19202,7 @@
<comment xml:lang="zh_CN">XZ 归档文件</comment>
<comment xml:lang="zh_TW">XZ 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="\xfd\x37\x7a\x58\x5a\x00" type="string" offset="0"/>
</magic>
<glob pattern="*.xz"/>
@@ -19594,7 +19606,7 @@
<comment xml:lang="zh_CN">Zoo 归档文件</comment>
<comment xml:lang="zh_TW">Zoo 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="0xfdc4a7dc" type="little32" offset="20"/>
</magic>
<glob pattern="*.zoo"/>
@@ -19653,6 +19665,13 @@
<sub-class-of type="application/xml"/>
<generic-icon name="text-html"/>
<glob pattern="*.xhtml"/>
+ <glob pattern="*.xht"/>
+ <magic priority="60">
+ <match value="//W3C//DTD XHTML " type="string" offset="0:256"/>
+ <match value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" type="string" offset="0:256"/>
+ <match value="<html xmlns="http://www.w3.org/1999/xhtml" type="string" offset="0:256"/>
+ <match value="<HTML xmlns="http://www.w3.org/1999/xhtml" type="string" offset="0:256"/>
+ </magic>
<root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
</mime-type>
<mime-type type="application/zip">
@@ -29666,7 +29685,7 @@
<comment xml:lang="zh_CN">ACE 归档文件</comment>
<comment xml:lang="zh_TW">ACE 封存檔</comment>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match value="**ACE**" type="string" offset="7"/>
</magic>
<glob pattern="*.ace"/>
@@ -34995,6 +35014,19 @@
<sub-class-of type="application/zip"/>
<glob pattern="*.kmz"/>
</mime-type>
+ <mime-type type="application/vnd.geo+json">
+ <comment>GeoJSON geospatial data</comment>
+ <sub-class-of type="application/json"/>
+ <glob pattern="*.geojson"/>
+ <glob pattern="*.geo.json"/>
+ </mime-type>
+ <mime-type type="application/gpx+xml">
+ <comment>GPX geographic data</comment>
+ <acronym>GPX</acronym>
+ <expanded-acronym>GPS Exchange Format</expanded-acronym>
+ <sub-class-of type="application/xml"/>
+ <glob pattern="*.gpx"/>
+ </mime-type>
<mime-type type="application/x-ica">
<comment>Citrix ICA settings file</comment>
<comment xml:lang="ar">ملف إعدادات Citrix ICA</comment>
@@ -36808,4 +36840,12 @@
<glob pattern="*.adf"/>
</mime-type>
+ <mime-type type="application/vnd.xdgapp">
+ <comment>XDG application bundle</comment>
+ <magic priority="50">
+ <match value="xdg-app\x00\x01\x00\x89\xe5" type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.xdgapp"/>
+ </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.5/freedesktop.org.xml.in new/shared-mime-info-1.6/freedesktop.org.xml.in
--- old/shared-mime-info-1.5/freedesktop.org.xml.in 2015-09-14 18:40:35.000000000 +0200
+++ new/shared-mime-info-1.6/freedesktop.org.xml.in 2016-02-23 14:42:13.000000000 +0100
@@ -560,7 +560,7 @@
<mime-type type="application/vnd.ms-cab-compressed">
<_comment>Microsoft Cabinet archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match offset="0" type="string" value="MSCF\0\0\0\0" />
</magic>
<glob pattern="*.cab"/>
@@ -1312,7 +1312,7 @@
<mime-type type="application/x-7z-compressed">
<_comment>7-zip archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="7z\274\257\047\034" offset="0"/>
</magic>
<glob pattern="*.7z"/>
@@ -1377,7 +1377,7 @@
<mime-type type="application/x-arc">
<_comment>ARC archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="little32" mask="0x8080ffff" value="0x0000081a" offset="0"/>
<match type="little32" mask="0x8080ffff" value="0x0000091a" offset="0"/>
<match type="little32" mask="0x8080ffff" value="0x0000021a" offset="0"/>
@@ -1522,7 +1522,7 @@
<mime-type type="application/x-lrzip">
<_comment>Lrzip archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="LRZI" offset="0"/>
</magic>
<glob pattern="*.lrz"/>
@@ -1629,7 +1629,7 @@
<mime-type type="application/x-cpio">
<_comment>CPIO archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="host16" value="070707" offset="0"/>
<match type="string" value="070701" offset="0"/>
<match type="string" value="070702" offset="0"/>
@@ -2249,7 +2249,7 @@
<mime-type type="application/x-java-pack200">
<_comment>Pack200 Java archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="big32" value="0xcafed00d" offset="0"/>
</magic>
<glob pattern="*.pack"/>
@@ -2530,7 +2530,7 @@
<mime-type type="application/x-lha">
<_comment>LHA archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="-lh -" offset="2"/>
<match type="string" value="-lh0-" offset="2"/>
<match type="string" value="-lh1-" offset="2"/>
@@ -2575,7 +2575,7 @@
<mime-type type="application/x-lz4">
<_comment>LZ4 archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="little32" value="0x184d2204" offset="0"/>
<match type="little32" value="0x184c2102" offset="0"/>
</magic>
@@ -2584,7 +2584,7 @@
<mime-type type="application/x-lzip">
<_comment>Lzip archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="LZIP" offset="0"/>
</magic>
<glob pattern="*.lz"/>
@@ -2608,7 +2608,7 @@
<acronym>LZO</acronym>
<expanded-acronym>Lempel-Ziv-Oberhumer</expanded-acronym>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a" offset="0"/>
</magic>
<glob pattern="*.lzo"/>
@@ -2616,11 +2616,23 @@
<mime-type type="application/x-qpress">
<_comment>Qpress archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="qpress10" offset="0"/>
</magic>
<glob pattern="*.qp"/>
</mime-type>
+ <mime-type type="application/x-xar">
+ <_comment>XAR archive
+ <acronym>XAR</acronym>
+ <expanded-acronym>eXtensible ARchive</expanded-acronym>
+ <generic-icon name="package-x-generic"/>
+ <magic priority="60">
+ <match type="big32" value="0x78617221" offset="0"/>
+ </magic>
+ <glob pattern="*.xar"/>
+ <!-- OS X 10.5+ installer package -->
+ <glob pattern="*.pkg"/>
+ </mime-type>
<mime-type type="application/zlib">
<_comment>Zlib archive
<generic-icon name="package-x-generic"/>
@@ -3041,7 +3053,7 @@
<acronym>Parchive</acronym>
<expanded-acronym>Parity Volume Set Archive</expanded-acronym>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match offset="0" type="string" value="PAR2" />
</magic>
<glob pattern="*.PAR2" />
@@ -3185,7 +3197,7 @@
<expanded-acronym>Roshal ARchive</expanded-acronym>
<alias type="application/x-rar-compressed"/>
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="Rar!" offset="0"/>
</magic>
<glob pattern="*.rar"/>
@@ -3372,7 +3384,7 @@
<generic-icon name="package-x-generic"/>
<alias type="application/stuffit"/>
<alias type="application/x-sit"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="StuffIt " offset="0"/>
<match type="string" value="SIT!" offset="0"/>
</magic>
@@ -3511,7 +3523,7 @@
<_comment>Tar archive
<generic-icon name="package-x-generic"/>
<alias type="application/x-gtar"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="ustar\0" offset="257"/>
<match type="string" value="ustar\040\040\0" offset="257"/>
</magic>
@@ -3597,7 +3609,7 @@
<mime-type type="application/x-xz">
<_comment>XZ archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="\xfd\x37\x7a\x58\x5a\x00" offset="0"/>
</magic>
<glob pattern="*.xz"/>
@@ -3645,7 +3657,7 @@
<mime-type type="application/x-zoo">
<_comment>Zoo archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="little32" value="0xfdc4a7dc" offset="20"/>
</magic>
<glob pattern="*.zoo"/>
@@ -3657,6 +3669,13 @@
<sub-class-of type="application/xml"/>
<generic-icon name="text-html"/>
<glob pattern="*.xhtml"/>
+ <glob pattern="*.xht"/>
+ <magic priority="60">
+ <match type="string" value="//W3C//DTD XHTML " offset="0:256"/>
+ <match type="string" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" offset="0:256"/>
+ <match type="string" value="<html xmlns="http://www.w3.org/1999/xhtml" offset="0:256"/>
+ <match type="string" value="<HTML xmlns="http://www.w3.org/1999/xhtml" offset="0:256"/>
+ </magic>
<root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
</mime-type>
<mime-type type="application/zip">
@@ -5295,7 +5314,7 @@
<mime-type type="application/x-ace">
<_comment>ACE archive
<generic-icon name="package-x-generic"/>
- <magic priority="50">
+ <magic priority="60">
<match type="string" value="**ACE**" offset="7"/>
</magic>
<glob pattern="*.ace"/>
@@ -6183,6 +6202,19 @@
<sub-class-of type="application/zip"/>
<glob pattern="*.kmz"/>
</mime-type>
+ <mime-type type="application/vnd.geo+json">
+ <_comment>GeoJSON geospatial data
+ <sub-class-of type="application/json"/>
+ <glob pattern="*.geojson"/>
+ <glob pattern="*.geo.json"/>
+ </mime-type>
+ <mime-type type="application/gpx+xml">
+ <_comment>GPX geographic data
+ <acronym>GPX</acronym>
+ <expanded-acronym>GPS Exchange Format</expanded-acronym>
+ <sub-class-of type="application/xml"/>
+ <glob pattern="*.gpx"/>
+ </mime-type>
<mime-type type="application/x-ica">
<_comment>Citrix ICA settings file
<acronym>ICA</acronym>
@@ -6508,4 +6540,12 @@
<glob pattern="*.adf"/>
</mime-type>
+ <mime-type type="application/vnd.xdgapp">
+ <_comment>XDG application bundle
+ <magic priority="50">
+ <match type="string" value="xdg-app\x00\x01\x00\x89\xe5" offset="0"/>
+ </magic>
+ <glob pattern="*.xdgapp"/>
+ </mime-type>
+
</mime-info>