[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:15 UTC 2013 

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

The following commit has been merged in the experimental branch:
commit 9dff5cd4209b84740491cf907fa3dd49d37417ed
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Sat Dec 28 18:37:04 2013 +0100

    refresh add_keywords_to_desktop_files.patch to work with 2.8
---
 debian/changelog                                   |  3 +-
 debian/patches/add_keywords_to_desktop_files.patch | 64 +++++++++++-----------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d5c070..64995c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ calligra (1:2.7.90-0r1) UNRELEASED; urgency=low
 
   [ Adrien Grellier ]
   * new dependency for krita: libxi-dev
+  * refresh add_keywords_to_desktop_files.patch to work with 2.8
 
   [ Pino Toscano ]
   * Add the pkg-config build dependency.
@@ -18,7 +19,7 @@ calligra (1:2.7.90-0r1) UNRELEASED; urgency=low
   * Remove the uninstalled man page of visualimagecompare, since that tool
     is not installed either.
 
- -- Adrien Grellier <perso at adrieng.fr>  Sun, 15 Dec 2013 20:15:30 +0100
+ -- Adrien Grellier <perso at adrieng.fr>  Sun, 15 Dec 2013 20:15:29 +0100
 
 calligra (1:2.7.5-1) unstable; urgency=low
 
diff --git a/debian/patches/add_keywords_to_desktop_files.patch b/debian/patches/add_keywords_to_desktop_files.patch
index 05a3dc2..1a0e26b 100644
--- a/debian/patches/add_keywords_to_desktop_files.patch
+++ b/debian/patches/add_keywords_to_desktop_files.patch
@@ -1,16 +1,16 @@
 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 @@
+--- calligra.orig/kexi/kexi.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/kexi/kexi.desktop	2013-12-26 11:12:41.421000310 +0100
+@@ -171,3 +171,4 @@
  X-KDE-NativeMimeType=application/x-kexiproject-sqlite
  X-KDE-NOTKoDocumentEmbeddable=true
  Categories=Qt;KDE;Office;
 +Keywords=Database;SQL;Access
 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
+--- calligra.orig/stage/app/stage.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/stage/app/stage.desktop	2013-12-26 11:12:41.421000310 +0100
 @@ -127,3 +127,4 @@
  X-DocPath=stage/index.html
  X-KDE-StartupNotify=true
@@ -18,8 +18,8 @@ Index: calligra/stage/app/stage.desktop
 +Keywords=Slideshow;Slides;Presentation;PowerPoint;odp;ppt;pptx
 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
+--- calligra.orig/active/calligraactive.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/active/calligraactive.desktop	2013-12-26 11:12:41.421000310 +0100
 @@ -40,3 +40,4 @@
  #The right solution would be to make it possible to build libs without building the apps
  InitialPreference=4
@@ -27,26 +27,26 @@ Index: calligra/active/calligraactive.desktop
 +Keywords=tablet;mobile;Plasma Active;touch
 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 @@
+--- calligra.orig/words/part/author/author.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/words/part/author/author.desktop	2013-12-26 11:12:41.421000310 +0100
+@@ -95,3 +95,4 @@
  X-DBUS-ServiceName=org.calligra.author
  Categories=Qt;KDE;Office;
  InitialPreference=3
 +Keywords=Word;book;ebook;epub
 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 @@
+--- calligra.orig/flow/part/flow.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/flow/part/flow.desktop	2013-12-26 11:12:41.421000310 +0100
+@@ -102,3 +102,4 @@
  X-DBUS-StartupType=Multi
  X-DBUS-ServiceName=org.calligra.flow
  Categories=Qt;KDE;Office;
 +Keywords=Diagram;flowchart;chart
 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
+--- calligra.orig/braindump/data/braindump.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/braindump/data/braindump.desktop	2013-12-26 11:12:41.421000310 +0100
 @@ -78,3 +78,4 @@
  X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
  X-KDE-SubstituteUID=false
@@ -54,8 +54,8 @@ Index: calligra/braindump/data/braindump.desktop
 +Keywords=Organize;whiteboard;brainstorming
 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
+--- calligra.orig/sheets/sheets.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/sheets/sheets.desktop	2013-12-26 11:12:41.421000310 +0100
 @@ -121,3 +121,4 @@
  X-DocPath=sheets/index.html
  X-KDE-StartupNotify=true
@@ -63,26 +63,26 @@ Index: calligra/sheets/sheets.desktop
 +Keywords=Spreadsheet;Excel;Calc;xls;xlsx;ods
 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 @@
+--- calligra.orig/krita/krita.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/krita/krita.desktop	2013-12-26 11:13:19.109187194 +0100
+@@ -128,3 +128,4 @@
  X-DBUS-StartupType=Multi
  X-DBUS-ServiceName=org.krita.krita
- X-Krita-Version=27
+ X-Krita-Version=28
 +Keywords=Photo;Photoshop;Paint;art;sketch
 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 @@
+--- calligra.orig/karbon/data/karbon.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/karbon/data/karbon.desktop	2013-12-26 11:12:41.425000329 +0100
+@@ -142,3 +142,4 @@
  Comment[zh_CN]=创建可缩放矢量绘图
  Comment[zh_TW]=建立可調整向量圖
  X-DocPath=http://userbase.kde.org/Special:MyLanguage/Karbon
 +Keywords=Vector;Illustration;graphics
 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
+--- calligra.orig/words/app/words.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/words/app/words.desktop	2013-12-26 11:12:41.425000329 +0100
 @@ -131,3 +131,4 @@
  X-DBUS-ServiceName=org.calligra.words
  Categories=Qt;KDE;Office;
@@ -90,18 +90,18 @@ Index: calligra/words/app/words.desktop
 +Keywords=Text;Word;odt;doc;docx
 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
+--- calligra.orig/plan/plan.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/plan/plan.desktop	2013-12-26 11:13:56.217371218 +0100
 @@ -100,3 +100,4 @@
+ X-DocPath=http://userbase.kde.org/Plan/Manual
  Categories=Qt;KDE;Office;
  X-KDE-StartupNotify=true
- X-KDE-NOTKoDocumentEmbeddable=true
 +Keywords=Organization;Project;Gantt;Management;
 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 @@
+--- calligra.orig/plan/workpackage/planwork.desktop	2013-12-26 11:12:41.429000355 +0100
++++ calligra/plan/workpackage/planwork.desktop	2013-12-26 11:12:41.425000329 +0100
+@@ -94,3 +94,4 @@
  Categories=Qt;KDE;Office;
  X-KDE-StartupNotify=true
  X-DocPath=http://userbase.kde.org/PlanWork/Manual

-- 
Calligra suite packaging

More information about the pkg-kde-commits mailing list