[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit 1a8ebd655420233edba87f2151f4e18f823996da
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sat Dec 17 19:28:10 2011 +0100

    Remove upstream_KDEinit_pb.patch applied upstream.
---
 debian/patches/series                    |    1 -
 debian/patches/upstream_KDEinit_pb.patch |   54 ------------------------------
 2 files changed, 0 insertions(+), 55 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 2d2ed06..30a2dff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 do_not_link_blas
 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
deleted file mode 100644
index f7bc7cd..0000000
--- a/debian/patches/upstream_KDEinit_pb.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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