Package: shared-mime-info
Version: 0.71-3
Severity: wishlist
Tags: patch
Hello,
I just made package of version 0.80. The patches possibly can help you.
Regards,
Timur
From f48e2f268f9275b5731dfe0297dbcbcced86a0a5 Mon Sep 17 00:00:00 2001
From: Timur Birsh <t...@linukz.org>
Date: Wed, 27 Oct 2010 15:10:12 +0600
Subject: [PATCH 1/4] Remove - merged upstream
---
debian/patches/152_qt-designer.patch | 24 ---------------
debian/patches/153_mpegts.patch | 45 -----------------------------
debian/patches/156_mkv-webm-magic.patch | 48 -------------------------------
debian/patches/series | 4 +--
4 files changed, 1 insertions(+), 120 deletions(-)
delete mode 100644 debian/patches/152_qt-designer.patch
delete mode 100644 debian/patches/153_mpegts.patch
delete mode 100644 debian/patches/156_mkv-webm-magic.patch
diff --git a/debian/patches/152_qt-designer.patch b/debian/patches/152_qt-designer.patch
deleted file mode 100644
index eecbd65..0000000
--- a/debian/patches/152_qt-designer.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 808a87349950ef906296584545413f200daa6db6 Mon Sep 17 00:00:00 2001
-From: Ville Skyttä <ville.sky...@iki.fi>
-Date: Fri, 02 Apr 2010 14:34:44 +0000
-Subject: Mark Qt Designer files as XML, add magic.
-
----
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index 090ee88..9fd9e69 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -1403,6 +1403,11 @@ command to generate the output files.
- <mime-type type="application/x-designer">
- <_comment>Qt Designer file</_comment>
- <generic-icon name="x-office-document"/>
-+ <sub-class-of type="application/xml"/>
-+ <magic>
-+ <match type="string" value="<ui" offset="0:256"/>
-+ <match type="string" value="<UI" offset="0:256"/>
-+ </magic>
- <glob pattern="*.ui"/>
- </mime-type>
- <mime-type type="application/x-desktop">
---
-cgit v0.8.3-6-g21f6
diff --git a/debian/patches/153_mpegts.patch b/debian/patches/153_mpegts.patch
deleted file mode 100644
index 66a9da4..0000000
--- a/debian/patches/153_mpegts.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e88b56dd9836c36124baf69d88ae22be8ef776b1 Mon Sep 17 00:00:00 2001
-From: Oliver Joos <oliver.j...@mymail.ch>
-Date: Fri, 21 May 2010 17:06:31 +0000
-Subject: Add video/mp2t.
-
-http://bugs.freedesktop.org/show_bug.cgi?id=14276
----
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index 853f0ee..da3722c 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -5035,6 +5035,24 @@ command to generate the output files.
- <mime-type type="video/isivideo">
- <_comment>ISI video</_comment>
- </mime-type>
-+ <mime-type type="video/mp2t">
-+ <_comment>MPEG-2 transport stream</_comment>
-+ <acronym>MPEG-2 TS</acronym>
-+ <expanded-acronym>Moving Picture Experts Group 2 Transport Stream</expanded-acronym>
-+ <magic priority="50">
-+ <match type="big32" value="0x47400010" mask="0xff4000df" offset="0"/>
-+ </magic>
-+ <glob pattern="*.m2t"/>
-+ <glob pattern="*.m2ts"/>
-+ <glob pattern="*.ts"/>
-+ <glob pattern="*.mts"/>
-+ <glob pattern="*.cpi"/>
-+ <glob pattern="*.clpi"/>
-+ <glob pattern="*.mpl"/>
-+ <glob pattern="*.mpls"/>
-+ <glob pattern="*.bdm"/>
-+ <glob pattern="*.bdmv"/>
-+ </mime-type>
- <mime-type type="video/mpeg">
- <_comment>MPEG video</_comment>
- <acronym>MPEG</acronym>
-@@ -5049,7 +5067,6 @@ command to generate the output files.
- <glob pattern="*.mp2"/>
- <glob pattern="*.mpe"/>
- <glob pattern="*.vob"/>
-- <glob pattern="*.m2t"/>
- </mime-type>
- <mime-type type="video/quicktime">
- <_comment>QuickTime video</_comment>
-
diff --git a/debian/patches/156_mkv-webm-magic.patch b/debian/patches/156_mkv-webm-magic.patch
deleted file mode 100644
index 1f7ae07..0000000
--- a/debian/patches/156_mkv-webm-magic.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5e331ed2c9ce91e5560f01465822c599d11cb9e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.dro...@collabora.co.uk>
-Date: Sat, 29 May 2010 15:10:28 +0200
-Subject: [PATCH 3/3] Improve WebM/Matroska magic
-
----
- freedesktop.org.xml.in | 18 ++++++++++++++++--
- 1 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index 0d4a3f3..c175874 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -2195,7 +2195,14 @@ command to generate the output files.
- <_comment>Matroska stream</_comment>
- <generic-icon name="video-x-generic"/>
- <magic priority="50">
-- <match type="string" value="matroska" offset="8"/>
-+ <!-- EBML ID -->
-+ <match type="big32" value="0x1a45dfa3" offset="0">
-+ <!-- DocumentType ID -->
-+ <match type="big16" value="0x4282" offset="5:65">
-+ <!-- DocumentType -->
-+ <match type="string" value="matroska" offset="8:75"/>
-+ </match>
-+ </match>
- </magic>
- </mime-type>
- <mime-type type="video/x-matroska">
-@@ -2215,7 +2222,14 @@ command to generate the output files.
- <generic-icon name="video-x-generic"/>
- <glob pattern="*.webm"/>
- <magic priority="50">
-- <match type="string" value="webm" offset="8"/>
-+ <!-- EBML ID -->
-+ <match type="big32" value="0x1a45dfa3" offset="0">
-+ <!-- DocumentType ID -->
-+ <match type="big16" value="0x4282" offset="5:65">
-+ <!-- DocumentType -->
-+ <match type="string" value="webm" offset="8:75"/>
-+ </match>
-+ </match>
- </magic>
- </mime-type>
- <mime-type type="audio/webm">
---
-1.7.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 93605c2..a704e97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,9 +3,7 @@
061_tex-matlab.patch
150_mps-mime.patch
151_webm.patch
-152_qt-designer.patch
-153_mpegts.patch
154_ogg-mkv-webm-media-icons.patch
155_audio-webm.patch
-156_mkv-webm-magic.patch
158_no_directory_alias.patch
+debian-changes-0.80-1.1
--
1.7.2.3
From 31b25705d2ab51e52f8504e5d11436cd557e5a68 Mon Sep 17 00:00:00 2001
From: Timur Birsh <t...@linukz.org>
Date: Wed, 27 Oct 2010 15:12:03 +0600
Subject: [PATCH 2/4] Update according to the changes in a new release
---
debian/patches/060_pdf_priority.patch | 24 +++++++++++++----
debian/patches/151_webm.patch | 27 +++++++++++--------
debian/patches/154_ogg-mkv-webm-media-icons.patch | 29 ++++++++-------------
3 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/debian/patches/060_pdf_priority.patch b/debian/patches/060_pdf_priority.patch
index c76324f..974bb20 100644
--- a/debian/patches/060_pdf_priority.patch
+++ b/debian/patches/060_pdf_priority.patch
@@ -1,13 +1,25 @@
-Index: b/freedesktop.org.xml.in
-===================================================================
---- a/freedesktop.org.xml.in 2010-05-29 10:52:37.685783877 +0200
-+++ b/freedesktop.org.xml.in 2010-05-29 10:53:12.645781090 +0200
-@@ -169,7 +169,7 @@
+From a1083857b7a60dc3d5f32ea33700d873d171bbb1 Mon Sep 17 00:00:00 2001
+From: Timur Birsh <t...@linukz.org>
+Date: Wed, 27 Oct 2010 11:23:27 +0600
+Subject: PDF priority
+
+---
+ freedesktop.org.xml.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 3e0e7c9..d65e31a 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -169,7 +169,7 @@ command to generate the output files.
<acronym>PDF</acronym>
<expanded-acronym>Portable Document Format</expanded-acronym>
<generic-icon name="x-office-document"/>
- <magic priority="50">
+ <magic priority="60">
- <match type="string" value="%PDF-" offset="0"/>
+ <match type="string" value="%PDF-" offset="0:1024"/>
</magic>
<glob pattern="*.pdf"/>
+--
+1.7.2.3
+
diff --git a/debian/patches/151_webm.patch b/debian/patches/151_webm.patch
index b01be1c..2b56b33 100644
--- a/debian/patches/151_webm.patch
+++ b/debian/patches/151_webm.patch
@@ -1,17 +1,19 @@
-From 354a3110ae8c3eba7494cd6ba468ffeb41211c83 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <had...@hadess.net>
-Date: Thu, 20 May 2010 16:22:06 +0000
+From 778143948a5d3852d7bb86cc07eff21e6dbc4a80 Mon Sep 17 00:00:00 2001
+From: Timur Birsh <t...@linukz.org>
+Date: Wed, 27 Oct 2010 12:07:35 +0600
Subject: Add WebM mime-type
-with magic and test file.
---
-Index: b/freedesktop.org.xml.in
-===================================================================
---- a/freedesktop.org.xml.in 2010-05-29 10:53:13.101783952 +0200
-+++ b/freedesktop.org.xml.in 2010-05-29 10:53:13.341789467 +0200
-@@ -2152,6 +2152,13 @@
- <glob pattern="*.mka"/>
- <sub-class-of type="application/x-matroska"/>
+ freedesktop.org.xml.in | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 5ad1600..6f20f9b 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -2263,6 +2263,13 @@ command to generate the output files.
+ <_comment>WebM audio</_comment>
+ <sub-class-of type="video/webm"/>
</mime-type>
+ <mime-type type="video/webm">
+ <_comment>WebM video</_comment>
@@ -23,3 +25,6 @@ Index: b/freedesktop.org.xml.in
<mime-type type="application/mxf">
<_comment>MXF video</_comment>
<acronym>MXF</acronym>
+--
+1.7.2.3
+
diff --git a/debian/patches/154_ogg-mkv-webm-media-icons.patch b/debian/patches/154_ogg-mkv-webm-media-icons.patch
index f4a8c7f..a646834 100644
--- a/debian/patches/154_ogg-mkv-webm-media-icons.patch
+++ b/debian/patches/154_ogg-mkv-webm-media-icons.patch
@@ -1,24 +1,17 @@
-From c95f5fc7fbc8219360c34eb5d2b8b3c4ae989dd8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.dro...@collabora.co.uk>
-Date: Sat, 29 May 2010 14:42:43 +0200
-Subject: [PATCH 1/3] Add icons to several Ogg/Matroska/WebM types
+From 1d7469bb3874e86c3b2888fd296a55be0fae4068 Mon Sep 17 00:00:00 2001
+From: Timur Birsh <t...@linukz.org>
+Date: Wed, 27 Oct 2010 12:18:40 +0600
+Subject: Add icons to several Ogg/Matroska/WebM types
---
- freedesktop.org.xml.in | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ freedesktop.org.xml.in | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index da3722c..b2244a7 100644
+index 6f20f9b..d670735 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
-@@ -2193,22 +2193,26 @@ command to generate the output files.
- </mime-type>
- <mime-type type="application/x-matroska">
- <_comment>Matroska stream</_comment>
-+ <generic-icon name="video-x-generic"/>
- <magic priority="50">
- <match type="string" value="matroska" offset="8"/>
- </magic>
+@@ -2237,16 +2237,19 @@ command to generate the output files.
</mime-type>
<mime-type type="video/x-matroska">
<_comment>Matroska video</_comment>
@@ -37,8 +30,8 @@ index da3722c..b2244a7 100644
+ <generic-icon name="video-x-generic"/>
<glob pattern="*.webm"/>
<magic priority="50">
- <match type="string" value="webm" offset="8"/>
-@@ -2371,6 +2375,7 @@ command to generate the output files.
+ <!-- EBML ID -->
+@@ -2427,6 +2430,7 @@ command to generate the output files.
</mime-type>
<mime-type type="audio/ogg">
<_comment>Ogg Audio</_comment>
@@ -47,5 +40,5 @@ index da3722c..b2244a7 100644
<magic priority="50">
<match type="string" value="OggS" offset="0"/>
--
-1.7.1
+1.7.2.3
--
1.7.2.3
From 872aa756bd95d613401a9ba56ef83750e495df2d Mon Sep 17 00:00:00 2001
From: Timur Birsh <t...@linukz.org>
Date: Wed, 27 Oct 2010 15:13:44 +0600
Subject: [PATCH 3/4] Release 0.80-1.1
---
debian/changelog | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3097d33..f551824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+shared-mime-info (0.80-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release.
+ * debian/patches/152_qt-designer.patch,
+ debian/patches/153_mpegts.patch,
+ debian/patches/156_mkv-webm-magic.patch: merged upstream - remove.
+ * debian/patches/060_pdf_priority.patch,
+ debian/patches/151_webm.patch,
+ debian/patches/153_mpegts.patch,
+ debian/patches/154_ogg-mkv-webm-media-icons.patch: update
+ according to the changes in a new release.
+
+ -- Timur Birsh <t...@linukz.org> Wed, 27 Oct 2010 11:09:08 +0600
+
shared-mime-info (0.71-3) unstable; urgency=low
* debian/patches/154_ogg-mkv-webm-media-icons.patch,
--
1.7.2.3
From a4270be5bb95856db67296a274ab8fbbf9c8ea61 Mon Sep 17 00:00:00 2001
From: Timur Birsh <t...@linukz.org>
Date: Wed, 27 Oct 2010 15:17:41 +0600
Subject: [PATCH 4/4] It is left accidentally
---
debian/patches/series | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index a704e97..f6e9939 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
154_ogg-mkv-webm-media-icons.patch
155_audio-webm.patch
158_no_directory_alias.patch
-debian-changes-0.80-1.1
--
1.7.2.3
