[SCM] akonadi-calendar-tools packaging branch, master, updated. debian/16.04.3-1-88-g267a560

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-calendar-tools.git;a=commitdiff;h=2c4bc41

The following commit has been merged in the master branch:
commit 2c4bc418bae461a5796a9059a94db76ae01cb682
Author: Raymond Wooninck <tittiatcoke at gmail.com>
Date:   Mon Sep 12 14:31:16 2016 +0200

    Remove patches
---
 debian/patches/debianize_akregator_default.diff    | 34 -----------------
 .../kubuntu_debianize_akregator_default.diff       | 43 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 79 deletions(-)

diff --git a/debian/patches/debianize_akregator_default.diff b/debian/patches/debianize_akregator_default.diff
deleted file mode 100644
index 04e543b..0000000
--- a/debian/patches/debianize_akregator_default.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 12:09:08 +0200
-Subject: debianize_akregator_default
-
----
- akregator/src/akregator_part.cpp | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
-index ef09ad6..6d65ece 100644
---- a/akregator/src/akregator_part.cpp
-+++ b/akregator/src/akregator_part.cpp
-@@ -187,6 +187,21 @@ static QDomDocument createDefaultFeedList()
-     frenchKde.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://fr.planetkde.org/rss20.xml"));
-     frenchFolder.appendChild(frenchKde);
- 
-+    // Debian feed(s)
-+    QDomElement debianFolder = doc.createElement(QStringLiteral("outline"));
-+    debianFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Debian"));
-+    body.appendChild(debianFolder);
-+
-+    QDomElement pland = doc.createElement(QStringLiteral("outline"));
-+    pland.setAttribute(QStringLiteral("text"), i18n("Planet Debian"));
-+    pland.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://planet.debian.org/rss20.xml"));
-+    debianFolder.appendChild(pland);
-+
-+    QDomElement dtimes = doc.createElement(QStringLiteral("outline"));
-+    dtimes.setAttribute(QStringLiteral("text"), i18n("Debian News"));
-+    dtimes.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.debian.org/News/news"));
-+    debianFolder.appendChild(dtimes);
-+
-     return doc;
- }
- }
diff --git a/debian/patches/kubuntu_debianize_akregator_default.diff b/debian/patches/kubuntu_debianize_akregator_default.diff
deleted file mode 100644
index e6e9a41..0000000
--- a/debian/patches/kubuntu_debianize_akregator_default.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 12:09:09 +0200
-Subject: kubuntu_debianize_akregator_default
-
----
- akregator/src/akregator_part.cpp | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
-index 6d65ece..2fef5d2 100644
---- a/akregator/src/akregator_part.cpp
-+++ b/akregator/src/akregator_part.cpp
-@@ -202,6 +202,30 @@ static QDomDocument createDefaultFeedList()
-     dtimes.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.debian.org/News/news"));
-     debianFolder.appendChild(dtimes);
- 
-+    QDomElement kubuntuFolder = doc.createElement(QStringLiteral("outline"));
-+    kubuntuFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Kubuntu"));
-+    body.appendChild(kubuntuFolder);
-+
-+    QDomElement planet = doc.createElement(QStringLiteral("outline"));
-+    planet.setAttribute(QStringLiteral("text"), i18n("Planet Ubuntu"));
-+    planet.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://planet.ubuntu.com/rss20.xml"));
-+    kubuntuFolder.appendChild(planet);
-+
-+    QDomElement fridge = doc.createElement(QStringLiteral("outline"));
-+    fridge.setAttribute(QStringLiteral("text"), i18n("Ubuntu Fridge"));
-+    fridge.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://feeds.feedburner.com/ubuntu-fridge"));
-+    kubuntuFolder.appendChild(fridge);
-+
-+    QDomElement ktimes = doc.createElement(QStringLiteral("outline"));
-+    ktimes.setAttribute(QStringLiteral("text"), i18n("Kubuntu.org News"));
-+    ktimes.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.kubuntu.org/news/feed"));
-+    kubuntuFolder.appendChild(ktimes);
-+
-+    QDomElement wire = doc.createElement(QStringLiteral("outline"));
-+    wire.setAttribute(QStringLiteral("text"), i18n("Kubuntu Wire"));
-+    wire.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://wire.kubuntu.org/?feed=rss2"));
-+    kubuntuFolder.appendChild(wire);
-+
-     return doc;
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cd7537b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-debianize_akregator_default.diff
-kubuntu_debianize_akregator_default.diff

-- 
akonadi-calendar-tools packaging