? tests/test.aiff
? tests/test.ilbm
Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.406
diff -u -r1.406 freedesktop.org.xml.in
--- freedesktop.org.xml.in	21 Feb 2009 14:09:22 -0000	1.406
+++ freedesktop.org.xml.in	22 Feb 2009 23:38:45 -0000
@@ -1681,6 +1681,14 @@
     <generic-icon name="x-office-document"/>
     <glob pattern="*.hdf"/>
   </mime-type>
+  <mime-type type="application/x-iff">
+    <_comment>IFF file</_comment>
+    <acronym>IFF</acronym>
+    <expanded-acronym>Interchange File Format</expanded-acronym>
+    <magic priority="40">
+      <match type="string" value="FORM" offset="0"/>
+    </magic>
+  </mime-type>
   <mime-type type="application/x-ipod-firmware">
     <_comment>iPod firmware</_comment>
     <magic priority="50">
@@ -2894,23 +2902,27 @@
   </mime-type>
   <mime-type type="audio/x-aifc">
     <_comment>AIFC audio</_comment>
+    <acronym>AIFC</acronym>
+    <expanded-acronym>Audio Interchange File format Compressed</expanded-acronym>
+    <sub-class-of type="application/x-iff">
     <magic priority="50">
       <match type="string" value="AIFC" offset="8"/>
     </magic>
+    <glob pattern="*.aifc"/>
+    <glob pattern="*.aiffc"/>
+    <alias type="audio/x-aiffc"/>
   </mime-type>
   <mime-type type="audio/x-aiff">
     <_comment>AIFF/Amiga/Mac audio</_comment>
+    <acronym>AIFF</acronym>
+    <expanded-acronym>Audio Interchange File Format</expanded-acronym>
+    <sub-class-of type="application/x-iff">
     <magic priority="50">
       <match type="string" value="AIFF" offset="8"/>
-      <match type="string" value="AIFC" offset="8"/>
       <match type="string" value="8SVX" offset="8"/>
     </magic>
     <glob pattern="*.aiff"/>
     <glob pattern="*.aif"/>
-    <glob pattern="*.aifc"/>
-  </mime-type>
-  <mime-type type="audio/x-aiffc">
-    <_comment>AIFF audio</_comment>
   </mime-type>
   <mime-type type="audio/x-ape">
     <_comment>Monkey's audio</_comment>
@@ -3676,15 +3688,19 @@
       <match type="string" value="icns" offset="0"/>
     </magic>
   </mime-type>
-  <mime-type type="image/x-iff">
-    <_comment>IFF image</_comment>
-    <glob pattern="*.iff"/>
-  </mime-type>
   <mime-type type="image/x-ilbm">
     <_comment>ILBM image</_comment>
-    <acronym>ILBM image</acronym>
+    <acronym>ILBM</acronym>
     <expanded-acronym>InterLeaved BitMap</expanded-acronym>
+    <sub-class-of type="application/x-iff"/>
+    <magic priority="50">
+      <match value="ILBM" type="string" offset="8"/>
+      <match value="PBM " type="string" offset="8"/>
+    </magic>
+    <glob pattern="*.iff"/>
     <glob pattern="*.ilbm"/>
+    <glob pattern="*.lbm"/>
+    <alias type="image/x-iff"/>
   </mime-type>
   <mime-type type="image/x-jng">
     <_comment>JNG image</_comment>
Index: tests/list
===================================================================
RCS file: /cvs/mime/shared-mime-info/tests/list,v
retrieving revision 1.76
diff -u -r1.76 list
--- tests/list	21 Feb 2009 14:09:22 -0000	1.76
+++ tests/list	22 Feb 2009 23:38:45 -0000
@@ -18,6 +18,7 @@
 test.fli video/x-flic ox
 test.gif image/gif
 test.ico image/vnd.microsoft.icon
+test.ilbm image/x-ilbm
 test.im1 image/x-sun-raster x
 test.jp2 image/jp2
 test.jpg image/jpeg
@@ -180,6 +181,7 @@
 test.ogg audio/x-vorbis+ogg x
 # Copied from http://bugzilla.gnome.org/show_bug.cgi?id=566661#c1
 msg0001.gsm audio/x-gsm oxo
+test.aiff audio/x-aiff
 
 # other
 text.pdf application/pdf