[shared-mime-info] Update 0001-Remove-sub-classing-from-OO.o-mime-types.patch
Bastien Nocera
hadess at fedoraproject.org
Mon May 5 11:15:21 UTC 2014
commit 3dec0fb3a4dd248877fd8376ccfacd400034231b
Author: Bastien Nocera <hadess at hadess.net>
Date: Mon May 5 12:27:05 2014 +0200
Update 0001-Remove-sub-classing-from-OO.o-mime-types.patch
...-Remove-sub-classing-from-OO.o-mime-types.patch | 74 ++++++++++----------
1 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/0001-Remove-sub-classing-from-OO.o-mime-types.patch b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
index d73e07b..8df4b44 100644
--- a/0001-Remove-sub-classing-from-OO.o-mime-types.patch
+++ b/0001-Remove-sub-classing-from-OO.o-mime-types.patch
@@ -1,18 +1,18 @@
-From b78ba0148a6d53248d72778b088ba8c8780ff79e Mon Sep 17 00:00:00 2001
+From 4b67339a19d907dbd44dd7fef1ea50761a5ce943 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 25 Aug 2011 10:54:47 +0100
Subject: [PATCH] Remove sub-classing from OO.o mime-types
https://bugs.freedesktop.org/show_bug.cgi?id=40354
---
- freedesktop.org.xml.in | 31 -------------------------------
- 1 files changed, 0 insertions(+), 31 deletions(-)
+ freedesktop.org.xml.in | 31 -------------------------------
+ 1 file changed, 31 deletions(-)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index e08ce53..5794e99 100644
+index 46dbfbd..bd3945d 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
-@@ -714,7 +714,6 @@ command to generate the output files.
+@@ -774,7 +774,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc">
<_comment>OpenOffice Calc spreadsheet</_comment>
@@ -20,7 +20,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -727,7 +726,6 @@ command to generate the output files.
+@@ -787,7 +786,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc.template">
<_comment>OpenOffice Calc template</_comment>
@@ -28,7 +28,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -740,7 +738,6 @@ command to generate the output files.
+@@ -800,7 +798,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw">
<_comment>OpenOffice Draw drawing</_comment>
@@ -36,7 +36,7 @@ index e08ce53..5794e99 100644
<generic-icon name="image-x-generic"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -753,7 +750,6 @@ command to generate the output files.
+@@ -813,7 +810,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw.template">
<_comment>OpenOffice Draw template</_comment>
@@ -44,7 +44,7 @@ index e08ce53..5794e99 100644
<generic-icon name="image-x-generic"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -766,7 +762,6 @@ command to generate the output files.
+@@ -826,7 +822,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress">
<_comment>OpenOffice Impress presentation</_comment>
@@ -52,7 +52,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-presentation"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -779,7 +774,6 @@ command to generate the output files.
+@@ -839,7 +834,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress.template">
<_comment>OpenOffice Impress template</_comment>
@@ -60,7 +60,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-presentation"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -792,7 +786,6 @@ command to generate the output files.
+@@ -852,7 +846,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.math">
<_comment>OpenOffice Math formula</_comment>
@@ -68,7 +68,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -805,7 +798,6 @@ command to generate the output files.
+@@ -865,7 +858,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer">
<_comment>OpenOffice Writer document</_comment>
@@ -76,7 +76,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -818,7 +810,6 @@ command to generate the output files.
+@@ -878,7 +870,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.global">
<_comment>OpenOffice Writer global document</_comment>
@@ -84,7 +84,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -831,7 +822,6 @@ command to generate the output files.
+@@ -891,7 +882,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.template">
<_comment>OpenOffice Writer template</_comment>
@@ -92,7 +92,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
-@@ -846,7 +836,6 @@ command to generate the output files.
+@@ -906,7 +896,6 @@ command to generate the output files.
<_comment>ODT document</_comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@@ -100,7 +100,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -861,7 +850,6 @@ command to generate the output files.
+@@ -921,7 +910,6 @@ command to generate the output files.
<_comment>ODT document (Flat XML)</_comment>
<acronym>FODT</acronym>
<expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
@@ -108,7 +108,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<glob pattern="*.fodt"/>
</mime-type>
-@@ -869,7 +857,6 @@ command to generate the output files.
+@@ -929,7 +917,6 @@ command to generate the output files.
<_comment>ODT template</_comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@@ -116,7 +116,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -884,7 +871,6 @@ command to generate the output files.
+@@ -944,7 +931,6 @@ command to generate the output files.
<_comment>OTH template</_comment>
<acronym>OTH</acronym>
<expanded-acronym>OpenDocument HTML</expanded-acronym>
@@ -124,7 +124,7 @@ index e08ce53..5794e99 100644
<generic-icon name="text-html"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -899,7 +885,6 @@ command to generate the output files.
+@@ -959,7 +945,6 @@ command to generate the output files.
<_comment>ODM document</_comment>
<acronym>ODM</acronym>
<expanded-acronym>OpenDocument Master</expanded-acronym>
@@ -132,7 +132,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -914,7 +899,6 @@ command to generate the output files.
+@@ -974,7 +959,6 @@ command to generate the output files.
<_comment>ODG drawing</_comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@@ -140,7 +140,7 @@ index e08ce53..5794e99 100644
<generic-icon name="image-x-generic"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -929,7 +913,6 @@ command to generate the output files.
+@@ -989,7 +973,6 @@ command to generate the output files.
<_comment>ODG drawing (Flat XML)</_comment>
<acronym>FODG</acronym>
<expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
@@ -148,7 +148,7 @@ index e08ce53..5794e99 100644
<generic-icon name="image-x-generic"/>
<glob pattern="*.fodg"/>
</mime-type>
-@@ -937,7 +920,6 @@ command to generate the output files.
+@@ -997,7 +980,6 @@ command to generate the output files.
<_comment>ODG template</_comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@@ -156,7 +156,7 @@ index e08ce53..5794e99 100644
<generic-icon name="image-x-generic"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -952,7 +934,6 @@ command to generate the output files.
+@@ -1012,7 +994,6 @@ command to generate the output files.
<_comment>ODP presentation</_comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@@ -164,7 +164,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-presentation"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -967,7 +948,6 @@ command to generate the output files.
+@@ -1027,7 +1008,6 @@ command to generate the output files.
<_comment>ODP presentation (Flat XML)</_comment>
<acronym>FODP</acronym>
<expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
@@ -172,7 +172,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-presentation"/>
<glob pattern="*.fodp"/>
</mime-type>
-@@ -975,7 +955,6 @@ command to generate the output files.
+@@ -1035,7 +1015,6 @@ command to generate the output files.
<_comment>ODP template</_comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@@ -180,7 +180,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-presentation"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -990,7 +969,6 @@ command to generate the output files.
+@@ -1050,7 +1029,6 @@ command to generate the output files.
<_comment>ODS spreadsheet</_comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@@ -188,7 +188,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1005,7 +983,6 @@ command to generate the output files.
+@@ -1065,7 +1043,6 @@ command to generate the output files.
<_comment>ODS spreadsheet (Flat XML)</_comment>
<acronym>FODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
@@ -196,7 +196,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.fods"/>
</mime-type>
-@@ -1013,7 +990,6 @@ command to generate the output files.
+@@ -1073,7 +1050,6 @@ command to generate the output files.
<_comment>ODS template</_comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@@ -204,7 +204,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1028,7 +1004,6 @@ command to generate the output files.
+@@ -1088,7 +1064,6 @@ command to generate the output files.
<_comment>ODC chart</_comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@@ -212,7 +212,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1043,7 +1018,6 @@ command to generate the output files.
+@@ -1103,7 +1078,6 @@ command to generate the output files.
<_comment>ODC template</_comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@@ -220,7 +220,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1058,7 +1032,6 @@ command to generate the output files.
+@@ -1118,7 +1092,6 @@ command to generate the output files.
<_comment>ODF formula</_comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@@ -228,7 +228,7 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1073,7 +1046,6 @@ command to generate the output files.
+@@ -1133,7 +1106,6 @@ command to generate the output files.
<_comment>ODF template</_comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@@ -236,15 +236,15 @@ index e08ce53..5794e99 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1088,7 +1060,6 @@ command to generate the output files.
+@@ -1148,7 +1120,6 @@ command to generate the output files.
<_comment>ODB database</_comment>
<acronym>ODB</acronym>
<expanded-acronym>OpenDocument Database</expanded-acronym>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<glob pattern="*.odb"/>
- </mime-type>
-@@ -1096,7 +1067,6 @@ command to generate the output files.
+ <alias type="application/vnd.sun.xml.base"/>
+@@ -1157,7 +1128,6 @@ command to generate the output files.
<_comment>ODI image</_comment>
<acronym>ODI</acronym>
<expanded-acronym>OpenDocument Image</expanded-acronym>
@@ -252,7 +252,7 @@ index e08ce53..5794e99 100644
<generic-icon name="image-x-generic"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
-@@ -1109,7 +1079,6 @@ command to generate the output files.
+@@ -1170,7 +1140,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.openofficeorg.extension">
<_comment>OpenOffice.org extension</_comment>
@@ -261,5 +261,5 @@ index e08ce53..5794e99 100644
<glob pattern="*.oxt" />
</mime-type>
--
-1.7.6
+1.9.0
More information about the scm-commits
mailing list