summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--freedesktop.org.xml.in4
-rw-r--r--tests/list1
-rw-r--r--tests/office.docbin0 -> 19968 bytes
4 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6abbbc2..195ce0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-10 Bastien Nocera <hadess@hadess.net>
+
+ * freedesktop.org.xml.in:
+ * tests/list:
+ * tests/office.doc:
+ Remove the magic from the Powerpoint files,
+ it's actually magic for "Microsoft Office document"
+ and add it to x-ole-storage, add a test file to the
+ testsuite
+ From https://bugzilla.redhat.com/show_bug.cgi?id=398031
+
2007-11-29 Bastien Nocera <hadess@hadess.net>
* freedesktop.org.xml.in:
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 52ff6af..d92b48d 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -381,9 +381,6 @@ command to generate the output files.
<glob pattern="*.ppt"/>
<glob pattern="*.pps"/>
<glob pattern="*.pot"/>
- <magic priority="50">
- <match type="little32" value="0xe011cfd0" offset="0"/>
- </magic>
<alias type="application/powerpoint"/>
<alias type="application/mspowerpoint"/>
<alias type="application/x-mspowerpoint"/>
@@ -1848,6 +1845,7 @@ command to generate the output files.
<_comment>OLE2 compound document storage</_comment>
<magic priority="50">
<match type="string" value="\320\317\021\340\241\261\032\341" offset="0"/>
+ <match type="little32" value="0xe011cfd0" offset="0"/>
</magic>
</mime-type>
<mime-type type="application/x-oleo">
diff --git a/tests/list b/tests/list
index 10f486a..52d8605 100644
--- a/tests/list
+++ b/tests/list
@@ -38,6 +38,7 @@ ooo.stw application/vnd.sun.xml.writer.template ox
ooo.sxw application/vnd.sun.xml.writer
ooo.vor application/vnd.stardivision.writer
ooo-xp.doc application/msword
+office.doc application/msword ox
# Playlist formats supported by Totem
stream.nsc application/x-netshow-channel
diff --git a/tests/office.doc b/tests/office.doc
new file mode 100644
index 0000000..c9e2e3f
--- /dev/null
+++ b/tests/office.doc
Binary files differ