[SCM] KDE Development Platform Libraries module packaging branch, wheezy, updated. debian/4.8.4-4-4-gdd1721b

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=dd1721b

The following commit has been merged in the wheezy branch:
commit dd1721bc3af33d6ef12dc42660f08cbf878fe649
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 4 14:47:39 2012 +0100

    fix reading of "Keywords" key in .desktop files of apps
    
    backport upstream commit fea636ce886844992ac8b05a9c22cd822c45e832
---
 debian/changelog                                   |    5 +++
 debian/patches/series                              |    1 +
 ...-of-the-Keywords-key-in-.desktop-files-no.patch |   31 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74b6461..35157bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ kde4libs (4:4.8.4-5) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Fix typo in previous changelog entry (Closes: #692398).
 
+  [ Pino Toscano ]
+  * Backport upstream commit fea636ce886844992ac8b05a9c22cd822c45e832 to fix
+    the reading of the "Keywords" key in .desktop files of applications;
+    patch upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Oct 2012 17:04:46 -0300
 
 kde4libs (4:4.8.4-4) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 4ee21d2..8137698 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 python3-support-bytecode.patch
 fix-copying-of-files-with-extended-ACLs.patch
+upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch
diff --git a/debian/patches/upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch b/debian/patches/upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch
new file mode 100644
index 0000000..90f40f4
--- /dev/null
+++ b/debian/patches/upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch
@@ -0,0 +1,31 @@
+From fea636ce886844992ac8b05a9c22cd822c45e832 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Tue, 4 Dec 2012 14:27:25 +0100
+Subject: [PATCH] Fix parsing of the Keywords key in .desktop files, now part
+ of the XDG spec
+
+This won't create a regression, our desktop files use X-KDE-Keywords currently,
+except kcmaudiocd which I'll fix right away. On the other hand, vlc.desktop
+already uses Keywords with semicolons, as per the XDG spec.
+
+CCMAIL: pino at kde.org
+---
+ kdecore/services/kservice.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdecore/services/kservice.cpp b/kdecore/services/kservice.cpp
+index 88878df..e2cc86f 100644
+--- a/kdecore/services/kservice.cpp
++++ b/kdecore/services/kservice.cpp
+@@ -183,7 +183,7 @@ void KServicePrivate::init( const KDesktopFile *config, KService* q )
+     if (!_untranslatedGenericName.isEmpty())
+         entryMap.insert(QLatin1String("UntranslatedGenericName"), _untranslatedGenericName);
+ 
+-    m_lstKeywords = desktopGroup.readEntry("Keywords", QStringList());
++    m_lstKeywords = desktopGroup.readXdgListEntry("Keywords", QStringList());
+     entryMap.remove(QLatin1String("Keywords"));
+     m_lstKeywords += desktopGroup.readEntry("X-KDE-Keywords", QStringList());
+     entryMap.remove(QLatin1String("X-KDE-Keywords"));
+-- 
+1.7.10.4
+

-- 
KDE Development Platform Libraries module packaging