diff -Nru calligra-2.9.2/debian/calligragemini.install calligra-2.9.2/debian/calligragemini.install
--- calligra-2.9.2/debian/calligragemini.install	2015-04-03 15:36:17.000000000 +0000
+++ calligra-2.9.2/debian/calligragemini.install	2015-04-07 10:17:37.000000000 +0000
@@ -2,6 +2,8 @@
 usr/bin/calligrageminithumbnailhelper
 usr/lib/calligra/imports/Calligra/Gemini/Dropbox/libcalligrageminidropboxplugin.so
 usr/lib/calligra/imports/Calligra/Gemini/Dropbox/qmldir
+usr/lib/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
+usr/lib/calligra/imports/org/calligra/CalligraComponents/qmldir
 usr/share/applications/kde4/calligragemini.desktop
 usr/share/icons/hicolor/1024x1024/apps/calligragemini.png
 usr/share/icons/hicolor/128x128/apps/calligragemini.png
diff -Nru calligra-2.9.2/debian/calligra-libs.install calligra-2.9.2/debian/calligra-libs.install
--- calligra-2.9.2/debian/calligra-libs.install	2015-04-03 15:36:17.000000000 +0000
+++ calligra-2.9.2/debian/calligra-libs.install	2015-04-07 10:17:37.000000000 +0000
@@ -1,13 +1,12 @@
 usr/bin/calligra
 usr/bin/calligraconverter
 usr/bin/kexi_sqlite3_dump
-usr/lib/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
-usr/lib/calligra/imports/org/calligra/CalligraComponents/qmldir
 usr/lib/kde4/calligra_device_spacenavigator.so
 usr/lib/kde4/calligra_docker_defaults.so
 usr/lib/kde4/calligra_filter_html2ods.so
 usr/lib/kde4/calligra_filter_key2odp.so
 usr/lib/kde4/calligra_filter_kspread2tex.so
+usr/lib/kde4/calligra_filter_odt2docx.so
 usr/lib/kde4/calligra_filter_odt2wiki.so
 usr/lib/kde4/calligra_semanticitem_contact.so
 usr/lib/kde4/calligra_semanticitem_event.so
@@ -38,7 +37,6 @@
 usr/lib/kde4/kopabackgroundtool.so
 usr/lib/kde4/koreport_barcodeplugin.so
 usr/lib/kde4/koreport_chartplugin.so
-usr/lib/kde4/kplatorcpsscheduler.so
 usr/lib/libbasicflakes.so.14
 usr/lib/libbasicflakes.so.14.0.0
 usr/lib/libcalligradb.so.14
@@ -89,4 +87,3 @@
 usr/lib/libpigmentcms.so.14.0.0
 usr/share/kde4/services/calligra/calligradocinfopropspage.desktop
 usr/share/kde4/services/calligra/koreport_chartplugin.desktop
-usr/lib/kde4/calligra_filter_odt2docx.so
diff -Nru calligra-2.9.2/debian/calligraplan.install calligra-2.9.2/debian/calligraplan.install
--- calligra-2.9.2/debian/calligraplan.install	2015-04-03 15:36:17.000000000 +0000
+++ calligra-2.9.2/debian/calligraplan.install	2015-04-07 10:17:37.000000000 +0000
@@ -1,6 +1,7 @@
 usr/bin/calligraplan
 usr/bin/calligraplanwork
 usr/lib/kde4/calligra_filter_mpxj2plan.so
+usr/lib/kde4/kplatorcpsscheduler.so
 usr/lib/kde4/krossmoduleplan.so
 usr/lib/kde4/planconvert/PlanConvert.jar
 usr/lib/kde4/planicalexport.so
diff -Nru calligra-2.9.2/debian/calligrasheets.install calligra-2.9.2/debian/calligrasheets.install
--- calligra-2.9.2/debian/calligrasheets.install	2015-04-03 15:36:17.000000000 +0000
+++ calligra-2.9.2/debian/calligrasheets.install	2015-04-07 10:17:37.000000000 +0000
@@ -1,6 +1,7 @@
 usr/bin/calligrasheets
 usr/lib/kde4/calligra_filter_applixspread2kspread.so
 usr/lib/kde4/calligra_filter_csv2sheets.so
+usr/lib/kde4/calligra_filter_dbase2kspread.so
 usr/lib/kde4/calligra_filter_gnumeric2sheets.so
 usr/lib/kde4/calligra_filter_opencalc2sheets.so
 usr/lib/kde4/calligra_filter_qpro2sheets.so
@@ -93,4 +94,3 @@
 usr/share/kde4/servicetypes/sheets_viewplugin.desktop
 usr/share/templates/.source/SpreadSheet.ods
 usr/share/templates/SpreadSheet.desktop
-usr/lib/kde4/calligra_filter_dbase2kspread.so
diff -Nru calligra-2.9.2/debian/changelog calligra-2.9.2/debian/changelog
--- calligra-2.9.2/debian/changelog	2015-04-03 15:36:31.000000000 +0000
+++ calligra-2.9.2/debian/changelog	2015-04-07 10:17:37.000000000 +0000
@@ -1,3 +1,13 @@
+calligra (1:2.9.2-0ubuntu2) vivid; urgency=medium
+
+  * Move kplato plugin to calligraplan where it belongs. This avoids having
+    the libs package depend on calligraplan due to so dependencies.
+  * Adjust breaks and replaces accordingly
+  * Move qtquick components to gemini as it is only used there and hard links
+    to private libs that are in the app specific packages.
+
+ -- Harald Sitter <sitter@kde.org>  Tue, 07 Apr 2015 12:13:24 +0200
+
 calligra (1:2.9.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff -Nru calligra-2.9.2/debian/control calligra-2.9.2/debian/control
--- calligra-2.9.2/debian/control	2015-04-03 15:36:17.000000000 +0000
+++ calligra-2.9.2/debian/control	2015-04-07 10:17:37.000000000 +0000
@@ -341,6 +341,8 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: khelpcenter
+Replaces: calligra-libs (<< 1:2.9.2-0ubuntu2~)
+Breaks: calligra-libs (<< 1:2.9.2-0ubuntu2~)
 Homepage: http://www.calligra-suite.org/krita/
 Description: responsive user interface for Calligra
  Calligra Gemini has a UI which can switch between tablet and desktop
@@ -371,8 +373,8 @@
 
 Package: calligraplan
 Architecture: any
-Replaces: calligra-libs (<< 1:2.6.1-0ubuntu4), kplato (<< 1:2.4)
-Breaks: calligra-libs (<< 1:2.6.1-0ubuntu4), kplato (<< 1:2.4)
+Replaces: calligra-libs (<< 1:2.9.2-0ubuntu2~), kplato (<< 1:2.4)
+Breaks: calligra-libs (<< 1:2.9.2-0ubuntu2~), kplato (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -528,8 +530,8 @@
 Section: libs
 Architecture: any
 Replaces: kexi (<< 1:2.6.1), kformula, koffice-libs
-Conflicts: kformula, koffice-libs, calligrasheets (<< 1:2.9.0-0ubuntu2~)
-Breaks: kexi (<< 1:2.6.1), calligrasheets (<< 1:2.9.0-0ubuntu2~)
+Conflicts: calligrasheets (<< 1:2.9.0-0ubuntu2~), kformula, koffice-libs
+Breaks: calligrasheets (<< 1:2.9.0-0ubuntu2~), kexi (<< 1:2.6.1)
 Depends: calligra-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}