[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-1-6-gdcf81c8

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=dcf81c8

The following commit has been merged in the master branch:
commit dcf81c891e0a3e05e88b0e46dc8d3cee8f0e38eb
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 17 08:18:41 2016 +0200

    add_keywords_to_desktop_files.patch: refresh
---
 debian/changelog                                   |  2 ++
 debian/patches/add_keywords_to_desktop_files.patch | 33 ++++++++--------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47a8bbd..2b51982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ calligra (1:2.9.11+dfsg-2) UNRELEASED; urgency=medium
   * Backport upstream commit 956bb80db4f300e4f8edeaf19d24fd61eb1932b2 to fix
     build on platforms where char is unsigned; patch
     upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch.
+  * Update the patches:
+    - add_keywords_to_desktop_files.patch: refresh
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2016 07:48:13 +0200
 
diff --git a/debian/patches/add_keywords_to_desktop_files.patch b/debian/patches/add_keywords_to_desktop_files.patch
index 9f40523..f5400f4 100644
--- a/debian/patches/add_keywords_to_desktop_files.patch
+++ b/debian/patches/add_keywords_to_desktop_files.patch
@@ -1,87 +1,76 @@
 --- a/kexi/kexi.desktop
 +++ b/kexi/kexi.desktop
-@@ -176,4 +176,5 @@
- X-DocPath=kexi/index.html
+@@ -173,3 +173,4 @@ X-DocPath=kexi/index.html
  X-KDE-NativeMimeType=application/x-kexiproject-sqlite
  X-KDE-NOTKoDocumentEmbeddable=true
  Categories=Qt;KDE;Office;
 +Keywords=Database;SQL;Access
 --- a/stage/app/stage.desktop
 +++ b/stage/app/stage.desktop
-@@ -135,4 +135,5 @@
- X-DBUS-ServiceName=org.calligra.stage
+@@ -136,3 +136,4 @@ X-DBUS-ServiceName=org.calligra.stage
  X-DocPath=stage/index.html
  X-KDE-StartupNotify=true
  Categories=Qt;KDE;Office;
 +Keywords=Slideshow;Slides;Presentation;PowerPoint;odp;ppt;pptx
 --- a/active/calligraactive.desktop
 +++ b/active/calligraactive.desktop
-@@ -44,4 +44,5 @@
- #This is to make Active be picked over desktop apps if you've installed Calligra Active
+@@ -43,3 +43,4 @@ MimeType=application/vnd.oasis.opendocum
  #The right solution would be to make it possible to build libs without building the apps
  InitialPreference=4
  Categories=Qt;KDE;Office;
 +Keywords=tablet;mobile;Plasma Active;touch
 --- a/words/part/author/author.desktop
 +++ b/words/part/author/author.desktop
-@@ -106,4 +106,5 @@
- X-DBUS-StartupType=Multi
+@@ -107,3 +107,4 @@ X-DBUS-StartupType=Multi
  X-DBUS-ServiceName=org.calligra.author
  Categories=Qt;KDE;Office;
  InitialPreference=3
 +Keywords=Word;book;ebook;epub
 --- a/flow/part/flow.desktop
 +++ b/flow/part/flow.desktop
-@@ -104,4 +104,5 @@
- X-KDE-StartupNotify=true
+@@ -105,3 +105,4 @@ X-KDE-StartupNotify=true
  X-DBUS-StartupType=Multi
  X-DBUS-ServiceName=org.calligra.flow
  Categories=Qt;KDE;Office;
 +Keywords=Diagram;flowchart;chart
 --- a/braindump/data/braindump.desktop
 +++ b/braindump/data/braindump.desktop
-@@ -85,4 +85,5 @@
- X-DocPath=http://userbase.kde.org/Special:MyLanguage/Braindump
+@@ -86,3 +86,4 @@ X-DocPath=http://userbase.kde.org/Specia
  X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
  X-KDE-SubstituteUID=false
  X-KDE-Username=
 +Keywords=Organize;whiteboard;brainstorming
 --- a/sheets/sheets.desktop
 +++ b/sheets/sheets.desktop
-@@ -129,4 +129,5 @@
- X-DBUS-ServiceName=org.calligra.sheets
+@@ -130,3 +130,4 @@ X-DBUS-ServiceName=org.calligra.sheets
  X-DocPath=sheets/index.html
  X-KDE-StartupNotify=true
  Categories=Qt;KDE;Office;
 +Keywords=Spreadsheet;Excel;Calc;xls;xlsx;ods
 --- a/karbon/data/karbon.desktop
 +++ b/karbon/data/karbon.desktop
-@@ -151,4 +151,5 @@
- Comment[x-test]=xxCreate scalable vector drawingsxx
+@@ -152,3 +152,4 @@ Comment[x-test]=xxCreate scalable vector
  Comment[zh_CN]=创建可缩放矢量绘图
  Comment[zh_TW]=建立可調整向量圖
  X-DocPath=http://userbase.kde.org/Special:MyLanguage/Karbon
 +Keywords=Vector;Illustration;graphics
 --- a/words/app/words.desktop
 +++ b/words/app/words.desktop
-@@ -138,4 +138,5 @@
- X-DBUS-StartupType=Multi
+@@ -139,3 +139,4 @@ X-DBUS-StartupType=Multi
  X-DBUS-ServiceName=org.calligra.words
  Categories=Qt;KDE;Office;
  InitialPreference=4
 +Keywords=Text;Word;odt;doc;docx
 --- a/plan/plan.desktop
 +++ b/plan/plan.desktop
-@@ -106,4 +106,5 @@
- X-KDE-NativeMimeType=application/x-vnd.kde.plan
+@@ -107,3 +107,4 @@ X-KDE-NativeMimeType=application/x-vnd.k
  X-DocPath=http://userbase.kde.org/Plan/Manual
  Categories=Qt;KDE;Office;
  X-KDE-StartupNotify=true
 +Keywords=Organization;Project;Gantt;Management;
 --- a/plan/workpackage/planwork.desktop
 +++ b/plan/workpackage/planwork.desktop
-@@ -99,4 +99,5 @@
- X-KDE-ServiceTypes=Calligra/Application
+@@ -100,3 +100,4 @@ X-KDE-ServiceTypes=Calligra/Application
  Categories=Qt;KDE;Office;
  X-KDE-StartupNotify=true
  X-DocPath=http://userbase.kde.org/PlanWork/Manual

-- 
Calligra suite packaging