[SCM] Calligra suite packaging branch, experimental, updated. debian/2.7.5-1-16-g0d05992

Adrien Grellier adrien-guest at moszumanska.debian.org
Sat Dec 28 17:40:11 UTC 2013 

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

The following commit has been merged in the experimental branch:
commit f07d8c3afedc4ba0701bf651ddfeb8f7bc6fc4c1
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Dec 3 09:35:05 2013 +0100

    Refresh patches.
---
 debian/changelog                                   |  1 +
 debian/patches/add_keywords_to_desktop_files.patch | 94 ++++++++++++++--------
 2 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af92dca..fb7646e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ calligra (1:2.7.5-1) UNRELEASED; urgency=low
   [ Maximiliano Curia ]
   * Migrate from eigen2 to eigen3, thanks to Anton Gladky. (Closes: #726643)
   * Add pqxx 4 support. (Closes: #730632)
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Nov 2013 10:20:58 +0100
 
diff --git a/debian/patches/add_keywords_to_desktop_files.patch b/debian/patches/add_keywords_to_desktop_files.patch
index 7b2c816..05a3dc2 100644
--- a/debian/patches/add_keywords_to_desktop_files.patch
+++ b/debian/patches/add_keywords_to_desktop_files.patch
@@ -1,82 +1,106 @@
---- a/kexi/kexi.desktop
-+++ b/kexi/kexi.desktop
-@@ -171,3 +171,4 @@
+Index: calligra/kexi/kexi.desktop
+===================================================================
+--- calligra.orig/kexi/kexi.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/kexi/kexi.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -168,3 +168,4 @@
  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
-@@ -126,3 +126,4 @@
+Index: calligra/stage/app/stage.desktop
+===================================================================
+--- calligra.orig/stage/app/stage.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/stage/app/stage.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -127,3 +127,4 @@
  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
-@@ -39,3 +39,4 @@
+Index: calligra/active/calligraactive.desktop
+===================================================================
+--- calligra.orig/active/calligraactive.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/active/calligraactive.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -40,3 +40,4 @@
  #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
-@@ -86,3 +86,4 @@
+Index: calligra/words/part/author/author.desktop
+===================================================================
+--- calligra.orig/words/part/author/author.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/words/part/author/author.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -94,3 +94,4 @@
  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
-@@ -100,3 +100,4 @@
+Index: calligra/flow/part/flow.desktop
+===================================================================
+--- calligra.orig/flow/part/flow.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/flow/part/flow.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -101,3 +101,4 @@
  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
-@@ -75,3 +75,4 @@
+Index: calligra/braindump/data/braindump.desktop
+===================================================================
+--- calligra.orig/braindump/data/braindump.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/braindump/data/braindump.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -78,3 +78,4 @@
  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
-@@ -119,3 +119,4 @@
+Index: calligra/sheets/sheets.desktop
+===================================================================
+--- calligra.orig/sheets/sheets.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/sheets/sheets.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -121,3 +121,4 @@
  X-DocPath=sheets/index.html
  X-KDE-StartupNotify=true
  Categories=Qt;KDE;Office;
 +Keywords=Spreadsheet;Excel;Calc;xls;xlsx;ods
---- a/krita/krita.desktop
-+++ b/krita/krita.desktop
-@@ -126,3 +126,4 @@
+Index: calligra/krita/krita.desktop
+===================================================================
+--- calligra.orig/krita/krita.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/krita/krita.desktop	2013-12-03 09:29:38.541653856 +0100
+@@ -127,3 +127,4 @@
  X-DBUS-StartupType=Multi
  X-DBUS-ServiceName=org.krita.krita
  X-Krita-Version=27
 +Keywords=Photo;Photoshop;Paint;art;sketch
---- a/karbon/data/karbon.desktop
-+++ b/karbon/data/karbon.desktop
-@@ -140,3 +140,4 @@
+Index: calligra/karbon/data/karbon.desktop
+===================================================================
+--- calligra.orig/karbon/data/karbon.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/karbon/data/karbon.desktop	2013-12-03 09:29:38.545653699 +0100
+@@ -141,3 +141,4 @@
  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
-@@ -128,3 +128,4 @@
+Index: calligra/words/app/words.desktop
+===================================================================
+--- calligra.orig/words/app/words.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/words/app/words.desktop	2013-12-03 09:29:38.545653699 +0100
+@@ -131,3 +131,4 @@
  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
-@@ -101,3 +101,4 @@
+Index: calligra/plan/plan.desktop
+===================================================================
+--- calligra.orig/plan/plan.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/plan/plan.desktop	2013-12-03 09:29:38.545653699 +0100
+@@ -100,3 +100,4 @@
  Categories=Qt;KDE;Office;
  X-KDE-StartupNotify=true
  X-KDE-NOTKoDocumentEmbeddable=true
 +Keywords=Organization;Project;Gantt;Management;
---- a/plan/workpackage/planwork.desktop
-+++ b/plan/workpackage/planwork.desktop
+Index: calligra/plan/workpackage/planwork.desktop
+===================================================================
+--- calligra.orig/plan/workpackage/planwork.desktop	2013-12-03 09:29:38.565652912 +0100
++++ calligra/plan/workpackage/planwork.desktop	2013-12-03 09:29:38.545653699 +0100
 @@ -93,3 +93,4 @@
  Categories=Qt;KDE;Office;
  X-KDE-StartupNotify=true

-- 
Calligra suite packaging

More information about the pkg-kde-commits mailing list