[SCM] Calligra suite packaging branch, master, updated. 63d7af390c52b0c4b355a2206111d44885ec85a6

[Raúl Sánchez Siles]

The following commit has been merged in the master branch:
commit 6823b3e8ceae80f9e7b5ca7cdbbea4a861420fb9
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Wed Jan 18 23:43:37 2012 +0100

    Update to 2.3.86 (2.4Beta6).
---
 debian/calligraplan.install  |   14 +++++++-------
 debian/calligrastage.install |    1 +
 debian/changelog             |    4 ++--
 debian/control               |    4 +++-
 debian/kexi.install          |    1 +
 debian/krita-data.install    |    1 -
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index 7ba7bcb..652aea5 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -26,28 +26,28 @@ usr/lib/librcps_plan.so.9.0.0
 usr/share/applications/kde4/plan.desktop
 usr/share/applications/kde4/planwork.desktop
 usr/share/icons/hicolor/128x128/apps/calligraplan.png
-usr/share/icons/hicolor/128x128/apps/planwork.png
+usr/share/icons/hicolor/128x128/apps/calligraplanwork.png
 usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
 usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/16x16/apps/calligraplan.png
-usr/share/icons/hicolor/16x16/apps/planwork.png
+usr/share/icons/hicolor/16x16/apps/calligraplanwork.png
 usr/share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/22x22/apps/calligraplan.png
-usr/share/icons/hicolor/22x22/apps/planwork.png
+usr/share/icons/hicolor/22x22/apps/calligraplanwork.png
 usr/share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/32x32/apps/calligraplan.png
-usr/share/icons/hicolor/32x32/apps/planwork.png
+usr/share/icons/hicolor/32x32/apps/calligraplanwork.png
 usr/share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/45x45/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/48x48/apps/calligraplan.png
-usr/share/icons/hicolor/48x48/apps/planwork.png
+usr/share/icons/hicolor/48x48/apps/calligraplanwork.png
 usr/share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/64x64/apps/calligraplan.png
-usr/share/icons/hicolor/64x64/apps/planwork.png
+usr/share/icons/hicolor/64x64/apps/calligraplanwork.png
 usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
 usr/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.work.png
 usr/share/icons/hicolor/scalable/apps/calligraplan.svgz
-usr/share/icons/hicolor/scalable/apps/planwork.svgz
+usr/share/icons/hicolor/scalable/apps/calligraplanwork.svgz
 usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.svgz
 usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.work.svgz
 usr/share/kde4/apps/plan/
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index e6b2eda..3817724 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -20,6 +20,7 @@ usr/lib/libcalligrastageprivate.so.9
 usr/lib/libcalligrastageprivate.so.9.0.0
 usr/lib/libkdeinit4_calligrastage.so
 usr/share/applications/kde4/stage.desktop
+usr/share/doc/kde/HTML/en/stage
 usr/share/icons/hicolor/16x16/actions/black.png
 usr/share/icons/hicolor/16x16/actions/highlight.png
 usr/share/icons/hicolor/16x16/actions/pen.png
diff --git a/debian/changelog b/debian/changelog
index e6e4c01..a49eed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-calligra (1:2.3.85-0r1) UNRELEASED; urgency=low
+calligra (1:2.3.86-1) UNRELEASED; urgency=low
 
   * Initial release.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Dec 2011 23:22:59 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Jan 2012 19:16:05 +0100
diff --git a/debian/control b/debian/control
index 24d98cd..c9a1867 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Build-Depends: debhelper (>= 7.4.10), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
   liblcms2-dev,
   libmarble-dev,
 # no in koffice
-  libgsf-1-dev, libdcmtk2-dev, libspnav-dev, shared-desktop-ontologies
+  libgsf-1-dev, libdcmtk2-dev, libspnav-dev, shared-desktop-ontologies,
+  libattica-dev,
+  libicu-dev
 Standards-Version: 3.9.2
 Homepage: http://www.calligra-suite.org/
 Vcs-Git: git://git.debian.org/pkg-kde/kde-std/calligra.git
diff --git a/debian/kexi.install b/debian/kexi.install
index 75700ed..674748e 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -1,5 +1,6 @@
 usr/bin/kexi
 usr/lib/kde4/kexidb_sqlite3driver.so
+usr/lib/kde4/kexidb_sqlite3_icu.so
 usr/lib/kde4/kexihandler_csv_importexport.so
 usr/lib/kde4/kexihandler_form.so
 usr/lib/kde4/kexihandler_migration.so
diff --git a/debian/krita-data.install b/debian/krita-data.install
index 2800bc5..41e2bda 100644
--- a/debian/krita-data.install
+++ b/debian/krita-data.install
@@ -9,7 +9,6 @@ usr/share/kde4/apps/krita/
 usr/share/kde4/apps/kritaplugins/
 usr/share/kde4/config/kritabrushes.knsrc
 usr/share/kde4/config/kritagradients.knsrc
-usr/share/kde4/config/krita.knsrc
 usr/share/kde4/config/kritapatterns.knsrc
 usr/share/kde4/config/kritapresets.knsrc
 usr/share/kde4/config/kritarc

-- 
Calligra suite packaging