From 5d02bbf19ce6318a27aca7281882b9ae2aaebf3c Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Wed, 8 Feb 2023 21:58:58 -0700
Subject: Prefer application/java-archive to application/x-java-archive

Section 13.3.3 of the HTML 4.0 specification uses
application/java-archive and I haven't been able to find any standard
that uses application/x-java-archive.
https://www.w3.org/TR/1998/REC-html40-19980424/struct/objects.html#h-13.3.3
---
 data/freedesktop.org.xml.in | 6 +++---
 tests/mime-detection/list   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index 857dc679..4857ae73 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -1335,7 +1335,7 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.android.package-archive">
     <comment>Android package</comment>
-    <sub-class-of type="application/x-java-archive"/>
+    <sub-class-of type="application/java-archive"/>
     <glob pattern="*.apk"/>
   </mime-type>
   <mime-type type="application/vnd.symbian.install">
@@ -2527,12 +2527,12 @@ command to generate the output files.
       <match type="string" value="S T O P" offset="0"/>
     </magic>
   </mime-type>
-  <mime-type type="application/x-java-archive">
+  <mime-type type="application/java-archive">
     <comment>Java archive</comment>
     <sub-class-of type="application/zip"/>
     <generic-icon name="package-x-generic"/>
     <alias type="application/x-jar"/>
-    <alias type="application/java-archive"/>
+    <alias type="application/x-java-archive"/>
     <glob pattern="*.jar"/>
   </mime-type>
   <mime-type type="application/x-java">
diff --git a/tests/mime-detection/list b/tests/mime-detection/list
index 60227049..cb9e1ddc 100644
--- a/tests/mime-detection/list
+++ b/tests/mime-detection/list
@@ -472,7 +472,7 @@ test.alz application/x-alz
 # Copied from /usr/share/gettext/javaversion.class
 test.class application/x-java
 # Created with jar from OpenJDK 1.6.0_18-b18
-test.jar application/x-java-archive ox
+test.jar application/java-archive ox
 # Copied from http://bugs.freedesktop.org/show_bug.cgi?id=12620
 hello.pack application/x-java-pack200
 # Copied from http://www.apache.org/dist/httpd/binaries/win32/apache_2.2.9-win32-x86-no_ssl-r2.msi
-- 
cgit v1.2.1