[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-7-gfd60ca3

[Raúl Sánchez Siles]

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

The following commit has been merged in the master branch:
commit e5e692a21e0d7dc223f149fe6019fe0ec56ff5bf
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sat Oct 4 20:58:07 2014 +0200

    Move .desktop files in services to calligra subdirectory.
---
 debian/calligra-data.install                |  4 ++--
 debian/calligra-reports-map-element.install |  2 +-
 debian/calligra-reports-web-element.install |  2 +-
 debian/kexi-calligrasheets-driver.install   |  2 +-
 debian/kexi-map-form-widget.install         |  2 +-
 debian/kexi-mysql-driver.install            |  4 ++--
 debian/kexi-postgresql-driver.install       |  4 ++--
 debian/kexi-sybase-driver.install           |  4 ++--
 debian/kexi-web-form-widget.install         |  2 +-
 debian/kexi-xbase-driver.install            |  4 ++--
 debian/kexi.install                         | 12 ++++++------
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 53356d5..ae00185 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -306,11 +306,11 @@ usr/share/kde4/services/calligra_textinlineobject_variables.desktop
 usr/share/kde4/services/calligra_tool_basicflakes.desktop
 usr/share/kde4/services/calligra_tool_defaults.desktop
 usr/share/kde4/services/calligradocinfopropspage.desktop
-usr/share/kde4/services/kexidb_sqlite3driver.desktop
+usr/share/kde4/services/calligra/kexidb_sqlite3driver.desktop
 usr/share/kde4/services/kformulapart.desktop
 usr/share/kde4/services/kolcmsengine.desktop
 usr/share/kde4/services/kopabackgroundtool.desktop
-usr/share/kde4/services/koreport_barcodeplugin.desktop
+usr/share/kde4/services/calligra/koreport_barcodeplugin.desktop
 usr/share/kde4/servicetypes/calligra_application.desktop
 usr/share/kde4/servicetypes/calligra_deferred_plugin.desktop
 usr/share/kde4/servicetypes/calligra_filter.desktop
diff --git a/debian/calligra-reports-map-element.install b/debian/calligra-reports-map-element.install
index d1ce73d..5f8e750 100644
--- a/debian/calligra-reports-map-element.install
+++ b/debian/calligra-reports-map-element.install
@@ -1,3 +1,3 @@
 usr/lib/kde4/koreport_mapsplugin.so
 usr/share/kde4/apps/calligra/icons/hicolor/*/actions/report_map_element.png
-usr/share/kde4/services/koreport_mapsplugin.desktop
+usr/share/kde4/services/calligra/koreport_mapsplugin.desktop
diff --git a/debian/calligra-reports-web-element.install b/debian/calligra-reports-web-element.install
index 6019c81..de4bd2f 100644
--- a/debian/calligra-reports-web-element.install
+++ b/debian/calligra-reports-web-element.install
@@ -1,3 +1,3 @@
 usr/lib/kde4/koreport_webplugin.so
 usr/share/kde4/apps/calligra/icons/hicolor/*/actions/report_web_element.png
-usr/share/kde4/services/koreport_webplugin.desktop
+usr/share/kde4/services/calligra/koreport_webplugin.desktop
diff --git a/debian/kexi-calligrasheets-driver.install b/debian/kexi-calligrasheets-driver.install
index 600acab..2235c39 100644
--- a/debian/kexi-calligrasheets-driver.install
+++ b/debian/kexi-calligrasheets-driver.install
@@ -1,2 +1,2 @@
 usr/lib/kde4/keximigrate_spreadsheet.so
-usr/share/kde4/services/keximigrate_spreadsheet.desktop
+usr/share/kde4/services/calligra/keximigrate_spreadsheet.desktop
diff --git a/debian/kexi-map-form-widget.install b/debian/kexi-map-form-widget.install
index e4a0b3c..b3f5de1 100644
--- a/debian/kexi-map-form-widget.install
+++ b/debian/kexi-map-form-widget.install
@@ -1,2 +1,2 @@
 usr/lib/kde4/kformdesigner_mapbrowser.so
-usr/share/kde4/services/kformdesigner/kformdesigner_mapbrowser.desktop
+usr/share/kde4/services/calligra/kformdesigner_mapbrowser.desktop
diff --git a/debian/kexi-mysql-driver.install b/debian/kexi-mysql-driver.install
index 10efe76..9e06ab4 100644
--- a/debian/kexi-mysql-driver.install
+++ b/debian/kexi-mysql-driver.install
@@ -1,4 +1,4 @@
 usr/lib/kde4/kexidb_mysqldriver.so
 usr/lib/kde4/keximigrate_mysql.so
-usr/share/kde4/services/kexidb_mysqldriver.desktop
-usr/share/kde4/services/keximigrate_mysql.desktop
+usr/share/kde4/services/calligra/kexidb_mysqldriver.desktop
+usr/share/kde4/services/calligra/keximigrate_mysql.desktop
diff --git a/debian/kexi-postgresql-driver.install b/debian/kexi-postgresql-driver.install
index 83d394d..a144dc6 100644
--- a/debian/kexi-postgresql-driver.install
+++ b/debian/kexi-postgresql-driver.install
@@ -1,4 +1,4 @@
 usr/lib/kde4/kexidb_pqxxsqldriver.so
 usr/lib/kde4/keximigrate_pqxx.so
-usr/share/kde4/services/kexidb_pqxxsqldriver.desktop
-usr/share/kde4/services/keximigrate_pqxx.desktop
+usr/share/kde4/services/calligra/kexidb_pqxxsqldriver.desktop
+usr/share/kde4/services/calligra/keximigrate_pqxx.desktop
diff --git a/debian/kexi-sybase-driver.install b/debian/kexi-sybase-driver.install
index e08a109..d06d718 100644
--- a/debian/kexi-sybase-driver.install
+++ b/debian/kexi-sybase-driver.install
@@ -1,4 +1,4 @@
 usr/lib/kde4/kexidb_sybasedriver.so
 usr/lib/kde4/keximigrate_sybase.so
-usr/share/kde4/services/kexidb_sybasedriver.desktop
-usr/share/kde4/services/keximigrate_sybase.desktop
+usr/share/kde4/services/calligra/kexidb_sybasedriver.desktop
+usr/share/kde4/services/calligra/keximigrate_sybase.desktop
diff --git a/debian/kexi-web-form-widget.install b/debian/kexi-web-form-widget.install
index d19dfa5..dabe3a9 100644
--- a/debian/kexi-web-form-widget.install
+++ b/debian/kexi-web-form-widget.install
@@ -1,2 +1,2 @@
 usr/lib/kde4/kformdesigner_webbrowser.so
-usr/share/kde4/services/kformdesigner/kformdesigner_webbrowser.desktop
+usr/share/kde4/services/calligra/kformdesigner_webbrowser.desktop
diff --git a/debian/kexi-xbase-driver.install b/debian/kexi-xbase-driver.install
index 0909e0e..9ef4ca6 100644
--- a/debian/kexi-xbase-driver.install
+++ b/debian/kexi-xbase-driver.install
@@ -1,4 +1,4 @@
 usr/lib/kde4/kexidb_xbasedriver.so
 usr/lib/kde4/keximigrate_xbase.so
-usr/share/kde4/services/kexidb_xbasedriver.desktop
-usr/share/kde4/services/keximigrate_xbase.desktop
+usr/share/kde4/services/calligra/kexidb_xbasedriver.desktop
+usr/share/kde4/services/calligra/keximigrate_xbase.desktop
diff --git a/debian/kexi.install b/debian/kexi.install
index 89c3758..58d0b78 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -39,9 +39,9 @@ usr/lib/libkformdesigner.so.13
 usr/lib/libkformdesigner.so.13.0.0
 usr/share/applications/kde4/kexi.desktop
 usr/share/kde4/services/kexi
-usr/share/kde4/services/keximigrate_mdb.desktop
-usr/share/kde4/services/keximigrate_txt.desktop
-usr/share/kde4/services/kexirelationdesignshape.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_containers.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
-usr/share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
+usr/share/kde4/services/calligra/keximigrate_mdb.desktop
+usr/share/kde4/services/calligra/keximigrate_txt.desktop
+usr/share/kde4/services/calligra/kexirelationdesignshape.desktop
+usr/share/kde4/services/calligra/kformdesigner_containers.desktop
+usr/share/kde4/services/calligra/kformdesigner_kexidbfactory.desktop
+usr/share/kde4/services/calligra/kformdesigner_stdwidgets.desktop

-- 
Calligra suite packaging