[SCM] basket packaging branch, master, updated. debian/2.10-beta+git6fed731-1-4-ga6a07d7

[Luigi Toscano]

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

The following commit has been merged in the master branch:
commit e21d4151519bd154cc7000e88d5e36af7392f261
Author: Luigi Toscano <luigi.toscano at tiscali.it>
Date:   Fri Sep 4 01:42:31 2015 +0200

    New git snapshot; drop patch merged upstream
    
    20-Remove-root-XML-tag-from-application-x-basket-item.patch was accepted
    upstream.
---
 debian/changelog                                   |  8 +++----
 ...ot-XML-tag-from-application-x-basket-item.patch | 25 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb850a4..f7df048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-basket (2.10~beta+gite93519c-1) UNRELEASED; urgency=medium
+basket (2.10~beta+gitfaa6dce-1) UNRELEASED; urgency=medium
 
   * New git snapshot.
   * Add explicit dependency on shared-mime-info, which was most likely
     implicitly dragged in by some other dependency in the past, and
     also on libsoprano-dev, which was installed by kdelibs5-dev
     (Closes: #796415).
-  * Update patch 20-Remove-root-XML-tag-from-application-x-basket-item.patch:
-    added Forwarded status.
+  * Drop patch 20-Remove-root-XML-tag-from-application-x-basket-item.patch,
+    included upstream.
 
- -- Luigi Toscano <luigi.toscano at tiscali.it>  Wed, 02 Sep 2015 01:24:33 +0200
+ -- Luigi Toscano <luigi.toscano at tiscali.it>  Fri, 04 Sep 2015 01:39:12 +0200
 
 basket (2.10~beta+git6fed731-1) unstable; urgency=medium
 
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
deleted file mode 100644
index 7361c4f..0000000
--- a/debian/patches/20-Remove-root-XML-tag-from-application-x-basket-item.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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(-)
-
-Forwarded: https://github.com/basket-notepads/basket/pull/19
-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 650d796..467c19c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 14_update_es_po.diff
-20-Remove-root-XML-tag-from-application-x-basket-item.patch

-- 
basket packaging