[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-4-12-gc90c7d2

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 1a12a03b81e659341bb0c38e5fe8b3cb92908545
Author: Pino Toscano <pino at debian.org>
Date:   Sat Aug 19 11:50:43 2017 +0200

    drop patch add_keywords_to_desktop_files.patch
---
 debian/changelog                                   |  4 ++
 debian/patches/add_keywords_to_desktop_files.patch | 70 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 4 insertions(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a192e15..561c6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,10 @@ calligra (1:2.9.11+dfsg1-1) UNRELEASED; urgency=medium
     remove it from debian/tmp.
   * Remove old items from TODO.Debian.
   * Drop the transitional krita-gemini, already in Stretch.
+  * Drop patch add_keywords_to_desktop_files.patch: it was never upstreamed,
+    and some of the changes do not look correct to me.  If needed, the changes
+    ought to be done upstream, so they can be properly reviewed, and
+    translated too.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jun 2017 20:54:16 +0200
 
diff --git a/debian/patches/add_keywords_to_desktop_files.patch b/debian/patches/add_keywords_to_desktop_files.patch
deleted file mode 100644
index 7e9a35a..0000000
--- a/debian/patches/add_keywords_to_desktop_files.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/stage/app/stage.desktop
-+++ b/stage/app/stage.desktop
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-+Keywords=Management;Projects;Package
diff --git a/debian/patches/series b/debian/patches/series
index 7e381df..cd4130b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 upstream_fix-arm-FTBFS.patch
 upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
-add_keywords_to_desktop_files.patch
 libwps-0.4.patch
 no-planconvert-jar.patch

-- 
Calligra suite packaging