[SCM] akregator packaging branch, master, updated. debian/4%17.08.3-1-5-gc7dbce1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akregator.git;a=commitdiff;h=22e331c

The following commit has been merged in the master branch:
commit 22e331ccfc5dddd0818496d96742a6918afd7df0
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 26 09:30:48 2017 +0100

    update the patches
    
    - debianize_akregator_default.diff: refresh, restore DEP3 headers, and
      apply again
    - kubuntu_debianize_akregator_default.diff: remove, as it is not for
      Debian
---
 debian/changelog                                   |  4 ++
 debian/patches/debianize_akregator_default.diff    | 22 +++++------
 .../kubuntu_debianize_akregator_default.diff       | 43 ----------------------
 debian/patches/series                              |  1 +
 4 files changed, 15 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e497dd..2955aa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ akregator (4:17.08.3-2) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Do not ship development symlinks of private libraries.
+  * Update the patches:
+    - debianize_akregator_default.diff: refresh, restore DEP3 headers, and
+      apply again
+    - kubuntu_debianize_akregator_default.diff: remove, as it is not for Debian
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Dec 2017 09:23:30 +0100
 
diff --git a/debian/patches/debianize_akregator_default.diff b/debian/patches/debianize_akregator_default.diff
index 05f8d53..c357d79 100644
--- a/debian/patches/debianize_akregator_default.diff
+++ b/debian/patches/debianize_akregator_default.diff
@@ -1,18 +1,16 @@
-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
+Author: Ana Beatriz Guerrero Lopez <ana at debian.org>
+Author: Pino Toscano <pino at debian.org>
+Description: add a few Debian feeds to akregator
+ Include Planet Debian and Debian News as default in akregator
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2017-12-26
 
----
- akregator/src/akregator_part.cpp | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
-index ef09ad6..6d65ece 100644
 --- a/src/akregator_part.cpp
 +++ b/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);
+@@ -151,6 +151,21 @@ static QDomDocument createDefaultFeedLis
+     spanishKde.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://planet.kde-espana.org/atom.xml"));
+     spanishFolder.appendChild(spanishKde);
  
 +    // Debian feed(s)
 +    QDomElement debianFolder = doc.createElement(QStringLiteral("outline"));
diff --git a/debian/patches/kubuntu_debianize_akregator_default.diff b/debian/patches/kubuntu_debianize_akregator_default.diff
deleted file mode 100644
index bf35da8..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/src/akregator_part.cpp b/src/akregator_part.cpp
-index 6d65ece..2fef5d2 100644
---- a/src/akregator_part.cpp
-+++ b/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
index e69de29..4235252 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debianize_akregator_default.diff

-- 
akregator packaging