[SCM] Calligra suite packaging. branch, master, updated. 0e704cdc4e9a601107768dc757739285e78c6813
Adrien Grellier
adrien-guest at alioth.debian.org
Fri Dec 2 19:59:20 UTC 2011
The following commit has been merged in the master branch:
commit 74b280a9fb76d5dd9472879e72b6ea0c08d6a578
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date: Fri Dec 2 20:20:56 2011 +0100
backport patch from upstream to correct KDEinit pb
When quiting calligra apps, the message «impossible for KDEinit to launch calligrawords» is removed.
---
debian/patches/series | 1 +
debian/patches/upstream_KDEinit_pb.patch | 54 ++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 80e7dac..6de1827 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
braindump_shlib-without-versioned-soname.patch
+upstream_KDEinit_pb.patch
diff --git a/debian/patches/upstream_KDEinit_pb.patch b/debian/patches/upstream_KDEinit_pb.patch
new file mode 100644
index 0000000..f7bc7cd
--- /dev/null
+++ b/debian/patches/upstream_KDEinit_pb.patch
@@ -0,0 +1,54 @@
+From: Yue Liu <yue.liu at mail.com>
+Date: Wed, 30 Nov 2011 03:45:38 +0000
+Subject: fixed X-DBUS-ServiceName due to org domain change
+X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=4169833df0d144092b07f199858fe53311e360f6
+---
+fixed X-DBUS-ServiceName due to org domain change
+---
+
+
+--- a/flow/part/flow.desktop
++++ b/flow/part/flow.desktop
+@@ -81,5 +81,5 @@ X-Calligra-DefaultMimeTypes=application/
+ X-DocPath=http://userbase.kde.org/Flow
+ X-KDE-StartupNotify=true
+ X-DBUS-StartupType=Multi
+-X-DBUS-ServiceName=org.calligra-suite.flow
++X-DBUS-ServiceName=org.calligra.flow
+ Categories=Qt;KDE;Office;
+
+--- a/stage/part/stage.desktop
++++ b/stage/part/stage.desktop
+@@ -95,7 +95,7 @@ Icon=stage
+ X-KDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
+ X-Calligra-DefaultMimeTypes=application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/x-kpresenter,application/mspowerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,application/vnd.openxmlformats-officedocument.presentationml.template
+ X-DBUS-StartupType=multi
+-X-DBUS-ServiceName=org.calligra-suite.stage
++X-DBUS-ServiceName=org.calligra.stage
+ X-DocPath=stage/index.html
+ X-KDE-StartupNotify=true
+ Categories=Qt;KDE;Office;
+
+--- a/tables/tables.desktop
++++ b/tables/tables.desktop
+@@ -96,7 +96,7 @@ X-KDE-ServiceTypes=Calligra/Application
+ X-Calligra-DefaultMimeTypes=application/vnd.oasis.opendocument.spreadsheet,application/x-kspread,application/vnd.ms-excel,text/csv,application/x-quattropro,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.spreadsheetml.template
+ X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
+ X-DBUS-StartupType=multi
+-X-DBUS-ServiceName=org.calligra-suite.tables
++X-DBUS-ServiceName=org.calligra.tables
+ X-DocPath=tables/index.html
+ X-KDE-StartupNotify=true
+ Categories=Qt;KDE;Office;
+
+--- a/words/part/words.desktop
++++ b/words/part/words.desktop
+@@ -90,6 +90,6 @@ X-Calligra-DefaultMimeTypes=application/
+ X-DocPath=http://userbase.kde.org/Words
+ X-KDE-StartupNotify=true
+ X-DBUS-StartupType=Multi
+-X-DBUS-ServiceName=org.calligra-suite.words
++X-DBUS-ServiceName=org.calligra.words
+ Categories=Qt;KDE;Office;
+ InitialPreference=3
+
--
Calligra suite packaging.
More information about the pkg-kde-commits
mailing list