[SCM] Calligra suite packaging branch, tip, updated. debian/2.6.4-1-51-g5a93d81

[Raúl Sánchez Siles]

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

The following commit has been merged in the tip branch:
commit a39cfbda443896c81a5a4c7777ad877920bd1b91
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 9 19:56:58 2013 +0200

    fix misplaced files
---
 debian/calligra-libs.install | 3 ---
 debian/calligraplan.install  | 2 ++
 debian/calligrawords.install | 1 +
 debian/changelog             | 2 ++
 debian/kexi-data.install     | 8 --------
 debian/kexi.install          | 8 ++++++++
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index e4f5ae0..8860b7d 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -2,7 +2,6 @@ usr/bin/calligra
 usr/bin/calligraconverter
 usr/bin/kexi_sqlite3_dump
 usr/lib/kde4/artistictextshape.so
-usr/lib/kde4/asciiexport.so
 usr/lib/kde4/autocorrect.so
 usr/lib/kde4/basicflakesplugin.so
 usr/lib/kde4/calligradocinfopropspage.so
@@ -37,8 +36,6 @@ usr/lib/libcalligradb.so.12
 usr/lib/libcalligradb.so.12.0.0
 usr/lib/libcalligrakdchart.so.12
 usr/lib/libcalligrakdchart.so.12.0.0
-usr/lib/libcalligrakdgantt.so.12
-usr/lib/libcalligrakdgantt.so.12.0.0
 usr/lib/libchartshapelib.so.12
 usr/lib/libchartshapelib.so.12.0.0
 usr/lib/libflake.so.12
diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index 2b14823..24dcd89 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -9,6 +9,8 @@ usr/lib/kde4/planmpxjimport.so
 usr/lib/kde4/planpart.so
 usr/lib/kde4/plantjscheduler.so
 usr/lib/kde4/planworkpart.so
+usr/lib/libcalligrakdgantt.so.12
+usr/lib/libcalligrakdgantt.so.12.0.0
 usr/lib/libkdeinit4_calligraplan.so
 usr/lib/libkdeinit4_calligraplanwork.so
 usr/lib/libkplatokernel.so.12
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index c15b658..5b9fc55 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -1,5 +1,6 @@
 usr/bin/calligrawords
 usr/lib/kde4/applixwordimport.so
+usr/lib/kde4/asciiexport.so
 usr/lib/kde4/asciiimport.so
 usr/lib/kde4/docximport.so
 usr/lib/kde4/exportMobi.so
diff --git a/debian/changelog b/debian/changelog
index 81bf7af..59a404c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ calligra (1:2.7.1-0r1) UNRELEASED; urgency=low
     (lintian: font-package-not-multi-arch-foreign)
   * patch to add keywords to desktop files
 
+  [ Pino Toscano ]
+  * Update .install files.
 
  -- Adrien Grellier <perso at adrieng.fr>  Sat, 27 Jul 2013 17:54:00 +0200
 
diff --git a/debian/kexi-data.install b/debian/kexi-data.install
index f3b535e..808fca1 100644
--- a/debian/kexi-data.install
+++ b/debian/kexi-data.install
@@ -1,4 +1,3 @@
-usr/share/applications/kde4/kexi.desktop
 usr/share/doc/kde/HTML/en/kexi
 usr/share/icons/hicolor/1024x1024/apps/calligrakexi.png
 usr/share/icons/hicolor/128x128/apps/calligrakexi.png
@@ -12,13 +11,6 @@ usr/share/icons/hicolor/64x64/apps/calligrakexi.png
 usr/share/icons/hicolor/scalable/apps/calligrakexi.svgz
 usr/share/kde4/apps/kexi
 usr/share/kde4/config/kexirc
-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/servicetypes/kexihandler.desktop
 usr/share/kde4/servicetypes/keximigration_driver.desktop
 usr/share/kde4/servicetypes/widgetfactory.desktop
diff --git a/debian/kexi.install b/debian/kexi.install
index 807180c..2530c99 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -37,3 +37,11 @@ usr/lib/libkexiutils.so.12
 usr/lib/libkexiutils.so.12.0.0
 usr/lib/libkformdesigner.so.12
 usr/lib/libkformdesigner.so.12.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

-- 
Calligra suite packaging