[SCM] basket packaging branch, master, updated. basket-2.10-beta-1-6-g74ed6f1

[Luigi Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/basket.git;a=commitdiff;h=6a11427

The following commit has been merged in the master branch:
commit 6a11427df67ba2a596245694469164157a3eceb9
Author: Luigi Toscano <luigi.toscano at tiscali.it>
Date:   Sun Oct 19 16:59:19 2014 +0200

    Add patch to fix MIME XML
---
 debian/changelog                                   |  2 ++
 ...ot-XML-tag-from-application-x-basket-item.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d43163..850361a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ basket (2.10~beta+git6fed731-1) UNRELEASED; urgency=medium
     - 19a-cmake-fix-installation-of-XDG-mimetypes-XML.patch
     - 19b-cmake-remove-installation-of-basket.desktop-using-xd.patch
   * Refresh patch: 14_update_es_po.
+  * Add patch to fix MIME XML:
+    - 20-Remove-root-XML-tag-from-application-x-basket-item.patch
   * The debian repository is on git, Vcs-Svn has been replaced by Vcs-Git
     and Vcs-Browser has been updated.
   * Update standard version to 3.9.6. No changes required.
diff --git a/debian/patches/20-Remove-root-XML-tag-from-application-x-basket-item.patch b/debian/patches/20-Remove-root-XML-tag-from-application-x-basket-item.patch
new file mode 100644
index 0000000..35f7626
--- /dev/null
+++ b/debian/patches/20-Remove-root-XML-tag-from-application-x-basket-item.patch
@@ -0,0 +1,24 @@
+From b2a070f102e4b5af0157eda556f5dd144cee1160 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano at tiscali.it>
+Date: Sun, 19 Oct 2014 16:52:06 +0200
+Subject: [PATCH] Remove root-XML tag from application/x-basket-item
+
+The tag needs a namespaceURI which does not make sense for its usage.
+---
+ file-integration/basket.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/file-integration/basket.xml b/file-integration/basket.xml
+index 5714972..aaa9309 100644
+--- a/file-integration/basket.xml
++++ b/file-integration/basket.xml
+@@ -50,6 +50,5 @@
+         <match type="string" offset="39" value="!DOCTYPE basket>"/>
+       </match>
+     </magic>
+-    <root-XML localName="basket" />
+   </mime-type>
+ </mime-info>
+-- 
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 467c19c..650d796 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 14_update_es_po.diff
+20-Remove-root-XML-tag-from-application-x-basket-item.patch

-- 
basket packaging