1 files changed, 351 insertions, 255 deletions

diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 0d2742f3ce42..d64caf5773ae 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -8,18 +8,17 @@ bin/calligraplanwork
 bin/calligrasheets
 bin/calligrastage
 bin/calligrawords
-bin/cstester
-bin/cstrunner
 bin/karbon
 bin/kexi
 bin/kexi_sqlite3_dump
 bin/krita
-bin/visualimagecompare
 include/DebugPigment.h
 include/InsertSemanticObjectActionBase.h
 include/InsertSemanticObjectCreateAction.h
 include/InsertSemanticObjectReferenceAction.h
 include/Ko3dScene.h
+include/KoAnchorInlineObject.h
+include/KoAnchorTextRange.h
 include/KoAnnotationManager.h
 include/KoApplication.h
 include/KoApplicationAdaptor.h
@@ -65,6 +64,7 @@ include/KoConfig.h
 include/KoConnectionPoint.h
 include/KoConvolutionOp.h
 include/KoCopyController.h
+include/KoCreatePathTool.h
 include/KoCutController.h
 include/KoDataCenterBase.h
 include/KoDeferredShapeFactoryBase.h
@@ -91,6 +91,7 @@ include/KoEventActionAddCommand.h
 include/KoEventActionRemoveCommand.h
 include/KoFactory.h
 include/KoFallBackColorTransformation.h
+include/KoFillConfigWidget.h
 include/KoFilter.h
 include/KoFilterChain.h
 include/KoFilterChainLinkList.h
@@ -123,6 +124,7 @@ include/KoGenericRegistryModel.h
 include/KoGlobal.h
 include/KoGrayColorSpaceTraits.h
 include/KoGridData.h
+include/KoGroupButton.h
 include/KoGuidesData.h
 include/KoHistogramProducer.h
 include/KoID.h
@@ -160,6 +162,7 @@ include/KoOdfPaste.h
 include/KoOdfReadStore.h
 include/KoOdfStylesReader.h
 include/KoOdfWriteStore.h
+include/KoOpacityConfigWidget.h
 include/KoPACanvas.h
 include/KoPACanvasBase.h
 include/KoPACanvasItem.h
@@ -196,6 +199,7 @@ include/KoPathReverseCommand.h
 include/KoPathSegment.h
 include/KoPathSegmentTypeCommand.h
 include/KoPathShapeMarkerCommand.h
+include/KoPencilTool.h
 include/KoPointedAt.h
 include/KoPointerEvent.h
 include/KoPositionSelector.h
@@ -228,6 +232,7 @@ include/KoShadowConfigWidget.h
 include/KoShadowStyle.h
 include/KoShape.h
 include/KoShapeAlignCommand.h
+include/KoShapeAnchor.h
 include/KoShapeApplicationData.h
 include/KoShapeBackgroundCommand.h
 include/KoShapeBasedDocumentBase.h
@@ -273,7 +278,6 @@ include/KoStyleThumbnailer.h
 include/KoSubpathRemoveCommand.h
 include/KoTableTemplate.h
 include/KoText.h
-include/KoTextAnchor.h
 include/KoTextBlockBorderData.h
 include/KoTextBlockData.h
 include/KoTextCommandBase.h
@@ -318,6 +322,7 @@ include/KoXYColorSelector.h
 include/KoXmlNS.h
 include/KoXmlReader.h
 include/KoXmlReaderForward.h
+include/KoXmlStreamReader.h
 include/KoXmlWriter.h
 include/KoXyzColorSpaceTraits.h
 include/KoYcbcrColorSpaceTraits.h
@@ -331,10 +336,10 @@ include/RdfForward.h
 include/RdfSemanticTreeWidgetAction.h
 include/RdfSemanticTreeWidgetSelectAction.h
 include/StatesRegistry.h
+include/basicflakes_export.h
 include/calligraversion.h
 include/changetracker/KoChangeTracker.h
 include/changetracker/KoChangeTrackerElement.h
-include/changetracker/KoDeleteChangeMarker.h
 include/changetracker/KoDeletedCellData.cpp
 include/changetracker/KoDeletedColumnData.cpp
 include/changetracker/KoDeletedRowColumnDataStore.h
@@ -368,7 +373,6 @@ include/kis_filter_registry.h
 include/kis_filter_strategy.h
 include/kis_generator.h
 include/kis_generator_registry.h
-include/kis_generic_colorspace.h
 include/kis_global.h
 include/kis_image.h
 include/kis_mask.h
@@ -396,12 +400,13 @@ include/kis_types.h
 include/kis_ui_types.h
 include/kis_view2.h
 include/kis_warptransform_worker.h
-include/koChart.h
 include/komain_export.h
 include/koodf_export.h
 include/kopageapp_export.h
+include/kordf_export.h
 include/kotext_export.h
 include/kowidgets_export.h
+include/kowidgetutils_export.h
 include/krita_export.h
 include/kundo2_export.h
 include/kundo2command.h
@@ -449,6 +454,7 @@ include/sheets/part/Doc.h
 include/sheets/part/Find.h
 include/sheets/part/HeaderItems.h
 include/sheets/part/Headers.h
+include/sheets/part/Part.h
 include/sheets/part/ToolRegistry.h
 include/sheets/part/View.h
 include/sheets/ui/CellEditorBase.h
@@ -499,15 +505,16 @@ include/words/part/frames/KWFrameLayout.h
 include/words/part/frames/KWFrameSet.h
 include/words/part/frames/KWTextFrameSet.h
 include/words/part/words_export.h
-lib/kde4/Filterkpr2odf.so
 lib/kde4/applixspreadimport.so
 lib/kde4/applixwordimport.so
 lib/kde4/artistictextshape.so
+lib/kde4/asciiexport.so
 lib/kde4/asciiimport.so
 lib/kde4/authorpart.so
 lib/kde4/autocorrect.so
+lib/kde4/basicflakesplugin.so
+lib/kde4/calligradocinfopropspage.so
 lib/kde4/calligradockers.so
-lib/kde4/calligragoogledocs.so
 lib/kde4/calligraimagethumbnail.so
 lib/kde4/calligrasheetspart.so
 lib/kde4/calligrastageeventactions.so
@@ -568,11 +575,9 @@ lib/kde4/kformdesigner_kexidbwidgets.so
 %%MARBLE%%lib/kde4/kformdesigner_mapbrowser.so
 lib/kde4/kformdesigner_stdwidgets.so
 lib/kde4/kformdesigner_webbrowser.so
-lib/kde4/kodocinfopropspage.so
 lib/kde4/kolcmsengine.so
 lib/kde4/kopabackgroundtool.so
 lib/kde4/koreport_barcodeplugin.so
-lib/kde4/koreport_chartplugin.so
 %%MARBLE%%lib/kde4/koreport_mapsplugin.so
 lib/kde4/koreport_webplugin.so
 lib/kde4/kplatorcpsscheduler.so
@@ -610,7 +615,6 @@ lib/kde4/kritadefaultpaintops.so
 lib/kde4/kritadefaulttools.so
 lib/kde4/kritadeformpaintop.so
 lib/kde4/kritadigitalmixer.so
-lib/kde4/kritadodgeburn.so
 lib/kde4/kritadropshadow.so
 lib/kde4/kritadynapaintop.so
 lib/kde4/kritaembossfilter.so
@@ -621,6 +625,7 @@ lib/kde4/kritaexrimport.so
 lib/kde4/kritaextensioncolorsfilters.so
 lib/kde4/kritafastcolortransferfilter.so
 lib/kde4/kritafilterop.so
+lib/kde4/kritaflipbookimport.so
 lib/kde4/kritagridpaintop.so
 lib/kde4/kritahairypaintop.so
 lib/kde4/kritahatchingpaintop.so
@@ -634,13 +639,14 @@ lib/kde4/kritajp2export.so
 lib/kde4/kritajp2import.so
 lib/kde4/kritajpegexport.so
 lib/kde4/kritajpegimport.so
-lib/kde4/kritalayercompose.so
+lib/kde4/kritalayergroupswitcher.so
 lib/kde4/kritalevelfilter.so
 lib/kde4/kritalutdocker.so
 lib/kde4/kritametadataeditor.so
 lib/kde4/kritamodifyselection.so
 lib/kde4/kritanoisefilter.so
 lib/kde4/kritaodgimport.so
+lib/kde4/kritaoffsetimage.so
 lib/kde4/kritaoilpaintfilter.so
 lib/kde4/kritaoraexport.so
 lib/kde4/kritaoraimport.so
@@ -657,6 +663,7 @@ lib/kde4/kritappmimport.so
 lib/kde4/kritapresetdocker.so
 lib/kde4/kritapsdexport.so
 lib/kde4/kritapsdimport.so
+lib/kde4/kritaqmlexport.so
 lib/kde4/kritaraindropsfilter.so
 lib/kde4/kritarandompickfilter.so
 lib/kde4/kritarotateimage.so
@@ -714,8 +721,10 @@ lib/kde4/opencalcexport.so
 lib/kde4/opencalcimport.so
 lib/kde4/pathshapes.so
 lib/kde4/pictureshape.so
+lib/kde4/planconvert/PlanConvert.jar
 lib/kde4/planicalexport.so
 lib/kde4/plankplatoimport.so
+lib/kde4/planmpxjimport.so
 lib/kde4/planpart.so
 lib/kde4/plantjscheduler.so
 lib/kde4/planworkpart.so
@@ -732,7 +741,6 @@ lib/kde4/stateshape.so
 lib/kde4/textshape.so
 lib/kde4/textvariables.so
 lib/kde4/thesaurustool.so
-lib/kde4/threedshape.so
 lib/kde4/vectorshape.so
 lib/kde4/videoshape.so
 lib/kde4/vsdximport.so
@@ -745,40 +753,46 @@ lib/kde4/wpgimport.so
 lib/kde4/wpsimport.so
 lib/kde4/xlsximport.so
 lib/libRtfReader.so
-lib/libRtfReader.so.11
-lib/libRtfReader.so.11.0.0
-lib/libbraindumpcore.so.11
-lib/libbraindumpcore.so.11.0.0
+lib/libRtfReader.so.12
+lib/libRtfReader.so.12.0.0
+lib/libbasicflakes.so
+lib/libbasicflakes.so.12
+lib/libbasicflakes.so.12.0.0
+lib/libbraindumpcore.so.12
+lib/libbraindumpcore.so.12.0.0
 lib/libcalligradb.so
-lib/libcalligradb.so.11
-lib/libcalligradb.so.11.0.0
+lib/libcalligradb.so.12
+lib/libcalligradb.so.12.0.0
+lib/libcalligrakdchart.so
+lib/libcalligrakdchart.so.12
+lib/libcalligrakdchart.so.12.0.0
+lib/libcalligrakdgantt.so
+lib/libcalligrakdgantt.so.12
+lib/libcalligrakdgantt.so.12.0.0
 lib/libcalligrasheetscommon.so
-lib/libcalligrasheetscommon.so.11
-lib/libcalligrasheetscommon.so.11.0.0
+lib/libcalligrasheetscommon.so.12
+lib/libcalligrasheetscommon.so.12.0.0
 lib/libcalligrasheetsodf.so
-lib/libcalligrasheetsodf.so.11
-lib/libcalligrasheetsodf.so.11.0.0
+lib/libcalligrasheetsodf.so.12
+lib/libcalligrasheetsodf.so.12.0.0
 lib/libcalligrastageprivate.so
-lib/libcalligrastageprivate.so.11
-lib/libcalligrastageprivate.so.11.0.0
+lib/libcalligrastageprivate.so.12
+lib/libcalligrastageprivate.so.12.0.0
 lib/libchartshapelib.so
-lib/libchartshapelib.so.11
-lib/libchartshapelib.so.11.0.0
+lib/libchartshapelib.so.12
+lib/libchartshapelib.so.12.0.0
 lib/libflake.so
-lib/libflake.so.11
-lib/libflake.so.11.0.0
+lib/libflake.so.12
+lib/libflake.so.12.0.0
 lib/libflowprivate.so
-lib/libflowprivate.so.11
-lib/libflowprivate.so.11.0.0
+lib/libflowprivate.so.12
+lib/libflowprivate.so.12.0.0
 lib/libkarboncommon.so
-lib/libkarboncommon.so.11
-lib/libkarboncommon.so.11.0.0
+lib/libkarboncommon.so.12
+lib/libkarboncommon.so.12.0.0
 lib/libkarbonui.so
-lib/libkarbonui.so.11
-lib/libkarbonui.so.11.0.0
-lib/libkdchart.so
-lib/libkdchart.so.11
-lib/libkdchart.so.11.0.0
+lib/libkarbonui.so.12
+lib/libkarbonui.so.12.0.0
 lib/libkdeinit4_calligraauthor.so
 lib/libkdeinit4_calligraflow.so
 lib/libkdeinit4_calligraplan.so
@@ -788,132 +802,135 @@ lib/libkdeinit4_calligrastage.so
 lib/libkdeinit4_calligrawords.so
 lib/libkdeinit4_karbon.so
 lib/libkdeinit4_krita.so
-lib/libkdgantt.so
-lib/libkdgantt.so.11
-lib/libkdgantt.so.11.0.0
 lib/libkexicore.so
-lib/libkexicore.so.11
-lib/libkexicore.so.11.0.0
+lib/libkexicore.so.12
+lib/libkexicore.so.12.0.0
 lib/libkexidatatable.so
-lib/libkexidatatable.so.11
-lib/libkexidatatable.so.11.0.0
+lib/libkexidatatable.so.12
+lib/libkexidatatable.so.12.0.0
 lib/libkexidataviewcommon.so
-lib/libkexidataviewcommon.so.11
-lib/libkexidataviewcommon.so.11.0.0
+lib/libkexidataviewcommon.so.12
+lib/libkexidataviewcommon.so.12.0.0
 lib/libkexidb.so
-lib/libkexidb.so.11
-lib/libkexidb.so.11.0.0
+lib/libkexidb.so.12
+lib/libkexidb.so.12.0.0
 lib/libkexiextendedwidgets.so
-lib/libkexiextendedwidgets.so.11
-lib/libkexiextendedwidgets.so.11.0.0
+lib/libkexiextendedwidgets.so.12
+lib/libkexiextendedwidgets.so.12.0.0
 lib/libkexiformutils.so
-lib/libkexiformutils.so.11
-lib/libkexiformutils.so.11.0.0
+lib/libkexiformutils.so.12
+lib/libkexiformutils.so.12.0.0
 lib/libkexiguiutils.so
-lib/libkexiguiutils.so.11
-lib/libkexiguiutils.so.11.0.0
+lib/libkexiguiutils.so.12
+lib/libkexiguiutils.so.12.0.0
 lib/libkeximain.so
-lib/libkeximain.so.11
-lib/libkeximain.so.11.0.0
+lib/libkeximain.so.12
+lib/libkeximain.so.12.0.0
 lib/libkeximigrate.so
-lib/libkeximigrate.so.11
-lib/libkeximigrate.so.11.0.0
+lib/libkeximigrate.so.12
+lib/libkeximigrate.so.12.0.0
 lib/libkexirelationsview.so
-lib/libkexirelationsview.so.11
-lib/libkexirelationsview.so.11.0.0
+lib/libkexirelationsview.so.12
+lib/libkexirelationsview.so.12.0.0
 lib/libkexiutils.so
-lib/libkexiutils.so.11
-lib/libkexiutils.so.11.0.0
+lib/libkexiutils.so.12
+lib/libkexiutils.so.12.0.0
 lib/libkformdesigner.so
-lib/libkformdesigner.so.11
-lib/libkformdesigner.so.11.0.0
+lib/libkformdesigner.so.12
+lib/libkformdesigner.so.12.0.0
 lib/libkformulalib.so
-lib/libkformulalib.so.11
-lib/libkformulalib.so.11.0.0
-lib/libkochart.so
-lib/libkochart.so.11
-lib/libkochart.so.11.0.0
+lib/libkformulalib.so.12
+lib/libkformulalib.so.12.0.0
 lib/libkokross.so
-lib/libkokross.so.11
-lib/libkokross.so.11.0.0
+lib/libkokross.so.12
+lib/libkokross.so.12.0.0
 lib/libkomain.so
-lib/libkomain.so.11
-lib/libkomain.so.11.0.0
+lib/libkomain.so.12
+lib/libkomain.so.12.0.0
 lib/libkoodf.so
-lib/libkoodf.so.11
-lib/libkoodf.so.11.0.0
+lib/libkoodf.so.12
+lib/libkoodf.so.12.0.0
 lib/libkopageapp.so
-lib/libkopageapp.so.11
-lib/libkopageapp.so.11.0.0
+lib/libkopageapp.so.12
+lib/libkopageapp.so.12.0.0
 lib/libkoplugin.so
-lib/libkoplugin.so.11
-lib/libkoplugin.so.11.0.0
+lib/libkoplugin.so.12
+lib/libkoplugin.so.12.0.0
 lib/libkoproperty.so
-lib/libkoproperty.so.11
-lib/libkoproperty.so.11.0.0
+lib/libkoproperty.so.12
+lib/libkoproperty.so.12.0.0
+lib/libkordf.so
+lib/libkordf.so.12
+lib/libkordf.so.12.0.0
 lib/libkoreport.so
-lib/libkoreport.so.11
-lib/libkoreport.so.11.0.0
+lib/libkoreport.so.12
+lib/libkoreport.so.12.0.0
 lib/libkotext.so
-lib/libkotext.so.11
-lib/libkotext.so.11.0.0
+lib/libkotext.so.12
+lib/libkotext.so.12.0.0
 lib/libkowidgets.so
-lib/libkowidgets.so.11
-lib/libkowidgets.so.11.0.0
+lib/libkowidgets.so.12
+lib/libkowidgets.so.12.0.0
+lib/libkowidgetutils.so
+lib/libkowidgetutils.so.12
+lib/libkowidgetutils.so.12.0.0
 lib/libkowv2.so
 lib/libkowv2.so.9
 lib/libkowv2.so.9.0.0
 lib/libkplatokernel.so
-lib/libkplatokernel.so.11
-lib/libkplatokernel.so.11.0.0
+lib/libkplatokernel.so.12
+lib/libkplatokernel.so.12.0.0
 lib/libkplatomodels.so
-lib/libkplatomodels.so.11
-lib/libkplatomodels.so.11.0.0
+lib/libkplatomodels.so.12
+lib/libkplatomodels.so.12.0.0
 lib/libkplatoui.so
-lib/libkplatoui.so.11
-lib/libkplatoui.so.11.0.0
+lib/libkplatoui.so.12
+lib/libkplatoui.so.12.0.0
 lib/libkritaimage.so
-lib/libkritaimage.so.11
-lib/libkritaimage.so.11.0.0
+lib/libkritaimage.so.12
+lib/libkritaimage.so.12.0.0
 lib/libkritalibbrush.so
-lib/libkritalibbrush.so.11
-lib/libkritalibbrush.so.11.0.0
+lib/libkritalibbrush.so.12
+lib/libkritalibbrush.so.12.0.0
 lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.11
-lib/libkritalibpaintop.so.11.0.0
+lib/libkritalibpaintop.so.12
+lib/libkritalibpaintop.so.12.0.0
 lib/libkritaui.so
-lib/libkritaui.so.11
-lib/libkritaui.so.11.0.0
+lib/libkritaui.so.12
+lib/libkritaui.so.12.0.0
 lib/libkundo2.so
-lib/libkundo2.so.11
-lib/libkundo2.so.11.0.0
+lib/libkundo2.so.12
+lib/libkundo2.so.12.0.0
 lib/libmsooxml.so
-lib/libmsooxml.so.11
-lib/libmsooxml.so.11.0.0
+lib/libmsooxml.so.12
+lib/libmsooxml.so.12.0.0
+lib/libodftraverse.so
+lib/libodftraverse.so.12
+lib/libodftraverse.so.12.0.0
 lib/libpigmentcms.so
-lib/libpigmentcms.so.11
-lib/libpigmentcms.so.11.0.0
+lib/libpigmentcms.so.12
+lib/libpigmentcms.so.12.0.0
 lib/libplanprivate.so
-lib/libplanprivate.so.11
-lib/libplanprivate.so.11.0.0
+lib/libplanprivate.so.12
+lib/libplanprivate.so.12.0.0
 lib/libplanworkapp.so
-lib/libplanworkapp.so.11
-lib/libplanworkapp.so.11.0.0
+lib/libplanworkapp.so.12
+lib/libplanworkapp.so.12.0.0
 lib/libplanworkfactory.so
-lib/libplanworkfactory.so.11
-lib/libplanworkfactory.so.11.0.0
+lib/libplanworkfactory.so.12
+lib/libplanworkfactory.so.12.0.0
 lib/librcps_plan.so
-lib/librcps_plan.so.11
-lib/librcps_plan.so.11.0.0
+lib/librcps_plan.so.12
+lib/librcps_plan.so.12.0.0
 lib/libtextlayout.so
-lib/libtextlayout.so.11
-lib/libtextlayout.so.11.0.0
+lib/libtextlayout.so.12
+lib/libtextlayout.so.12.0.0
 lib/libvectorimage.so
-lib/libvectorimage.so.11
-lib/libvectorimage.so.11.0.0
+lib/libvectorimage.so.12
+lib/libvectorimage.so.12.0.0
 lib/libwordsprivate.so
-lib/libwordsprivate.so.11
-lib/libwordsprivate.so.11.0.0
+lib/libwordsprivate.so.12
+lib/libwordsprivate.so.12.0.0
 share/applications/kde4/author.desktop
 share/applications/kde4/braindump.desktop
 share/applications/kde4/calligra.desktop
@@ -923,6 +940,7 @@ share/applications/kde4/kexi.desktop
 share/applications/kde4/krita.desktop
 share/applications/kde4/krita_bmp.desktop
 share/applications/kde4/krita_exr.desktop
+share/applications/kde4/krita_flipbook.desktop
 share/applications/kde4/krita_jp2.desktop
 share/applications/kde4/krita_jpeg.desktop
 share/applications/kde4/krita_odg.desktop
@@ -960,9 +978,6 @@ share/apps/calligra/icons/hicolor/16x16/actions/abs.png
 share/apps/calligra/icons/hicolor/16x16/actions/bevelled.png
 share/apps/calligra/icons/hicolor/16x16/actions/borderpainter.png
 share/apps/calligra/icons/hicolor/16x16/actions/brackets.png
-share/apps/calligra/icons/hicolor/16x16/actions/cap_butt.png
-share/apps/calligra/icons/hicolor/16x16/actions/cap_round.png
-share/apps/calligra/icons/hicolor/16x16/actions/cap_square.png
 share/apps/calligra/icons/hicolor/16x16/actions/enclosed.png
 share/apps/calligra/icons/hicolor/16x16/actions/escape-direction-all.png
 share/apps/calligra/icons/hicolor/16x16/actions/escape-direction-down.png
@@ -988,9 +1003,6 @@ share/apps/calligra/icons/hicolor/16x16/actions/inline_table.png
 share/apps/calligra/icons/hicolor/16x16/actions/insert-pagebreak.png
 share/apps/calligra/icons/hicolor/16x16/actions/insert_table_row.png
 share/apps/calligra/icons/hicolor/16x16/actions/int.png
-share/apps/calligra/icons/hicolor/16x16/actions/join_bevel.png
-share/apps/calligra/icons/hicolor/16x16/actions/join_miter.png
-share/apps/calligra/icons/hicolor/16x16/actions/join_round.png
 share/apps/calligra/icons/hicolor/16x16/actions/kdb_form.png
 share/apps/calligra/icons/hicolor/16x16/actions/kdb_table.png
 share/apps/calligra/icons/hicolor/16x16/actions/line.png
@@ -1117,7 +1129,9 @@ share/apps/calligra/icons/hicolor/22x22/actions/sqrt.png
 share/apps/calligra/icons/hicolor/22x22/actions/sum.png
 share/apps/calligra/icons/hicolor/22x22/actions/toggle_docbrowser.png
 share/apps/calligra/icons/hicolor/22x22/actions/tool-text.png
+share/apps/calligra/icons/hicolor/22x22/actions/tool_cellformatting.png
 share/apps/calligra/icons/hicolor/22x22/actions/tool_references.png
+share/apps/calligra/icons/hicolor/22x22/actions/tool_review.png
 share/apps/calligra/icons/hicolor/22x22/actions/under.png
 share/apps/calligra/icons/hicolor/22x22/actions/vector.png
 share/apps/calligra/icons/hicolor/22x22/actions/zoom-pixels.png
@@ -1237,9 +1251,11 @@ share/apps/color-schemes/KritaDark.colors
 share/apps/color-schemes/KritaDarker.colors
 share/apps/flow/flow.rc
 share/apps/flow/icons/hicolor/48x48/actions/template_basicflow.png
-share/apps/flow/icons/hicolor/48x48/actions/template_empty.png
+share/apps/flow/icons/hicolor/48x48/actions/template_empty_landscape.png
+share/apps/flow/icons/hicolor/48x48/actions/template_empty_portrait.png
 share/apps/flow/icons/hicolor/scalable/actions/template_basicworkflow.svgz
-share/apps/flow/icons/hicolor/scalable/actions/template_empty.svgz
+share/apps/flow/icons/hicolor/scalable/actions/template_empty_landscape.svgz
+share/apps/flow/icons/hicolor/scalable/actions/template_empty_portrait.svgz
 share/apps/flow/stencils/Assorted/arrow-chevron.desktop
 share/apps/flow/stencils/Assorted/arrow-chevron.odg
 share/apps/flow/stencils/Assorted/arrow-chevron.png
@@ -5107,8 +5123,10 @@ share/apps/flow/stencils/Value_Stream_Mapping/collection.desktop
 share/apps/flow/stencils/Value_Stream_Mapping/happy_face.desktop
 share/apps/flow/stencils/Value_Stream_Mapping/happy_face.odg
 share/apps/flow/stencils/Value_Stream_Mapping/happy_face.png
-share/apps/flow/templates/Basic/.source/empty.otg
-share/apps/flow/templates/Basic/empty.desktop
+share/apps/flow/templates/Basic/.source/empty-landscape.otg
+share/apps/flow/templates/Basic/.source/empty-portrait.otg
+share/apps/flow/templates/Basic/empty-landscape.desktop
+share/apps/flow/templates/Basic/empty-portrait.desktop
 share/apps/formulashape/fonts/Arev.ttf
 share/apps/formulashape/fonts/ArevBI.ttf
 share/apps/formulashape/fonts/ArevBd.ttf
@@ -5303,81 +5321,119 @@ share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
 share/apps/kexi/icons/hicolor/48x48/actions/key.png
 share/apps/kexi/icons/hicolor/64x64/actions/business_user.png
 share/apps/kexi/icons/hicolor/64x64/actions/form_action.png
+share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-kexi-connectiondata.png
+share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-kexiproject-shortcut.png
 share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-kexiproject-sqlite.png
 share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-kexiproject-sqlite2.png
 share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-kexiproject-sqlite3.png
+share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-sqlite2.png
+share/apps/kexi/icons/oxygen/128x128/mimetypes/application-x-sqlite3.png
 share/apps/kexi/icons/oxygen/16x16/actions/data-source-tag.png
 share/apps/kexi/icons/oxygen/16x16/actions/table.png
+share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexi-connectiondata.png
+share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-shortcut.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite2.png
 share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite3.png
+share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite2.png
+share/apps/kexi/icons/oxygen/16x16/mimetypes/application-x-sqlite3.png
 share/apps/kexi/icons/oxygen/22x22/actions/data-source-tag.png
 share/apps/kexi/icons/oxygen/22x22/actions/table.png
+share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexi-connectiondata.png
+share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-shortcut.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite2.png
 share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite3.png
+share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite2.png
+share/apps/kexi/icons/oxygen/22x22/mimetypes/application-x-sqlite3.png
 share/apps/kexi/icons/oxygen/32x32/actions/table.png
+share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexi-connectiondata.png
+share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-shortcut.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite2.png
 share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite3.png
+share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite2.png
+share/apps/kexi/icons/oxygen/32x32/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexi-connectiondata.png
+share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-shortcut.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-sqlite.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-sqlite2.png
 share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-kexiproject-sqlite3.png
+share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite2.png
+share/apps/kexi/icons/oxygen/48x48/mimetypes/application-x-sqlite3.png
+share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexi-connectiondata.png
+share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-shortcut.png
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-sqlite.png
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-sqlite2.png
 share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-kexiproject-sqlite3.png
+share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-sqlite2.png
+share/apps/kexi/icons/oxygen/64x64/mimetypes/application-x-sqlite3.png
 share/apps/kexi/icons/oxygen/scalable/actions/small/16x16/data-source-tag.svgz
 share/apps/kexi/icons/oxygen/scalable/actions/small/22x22/data-source-tag.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-kexi-connectiondata.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-kexiproject-shortcut.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-kexiproject-sqlite.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-kexiproject-sqlite2.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-kexiproject-sqlite3.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-sqlite2.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/application-x-sqlite3.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-kexi-connectiondata.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-kexiproject-shortcut.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-kexiproject-sqlite.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-kexiproject-sqlite2.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-kexiproject-sqlite3.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-sqlite2.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16/application-x-sqlite3.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-kexi-connectiondata.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-kexiproject-shortcut.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-kexiproject-sqlite.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-kexiproject-sqlite2.svgz
 share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-kexiproject-sqlite3.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-sqlite2.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22/application-x-sqlite3.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/32x32/application-x-kexi-connectiondata.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/32x32/application-x-kexiproject-shortcut.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/48x48/application-x-kexi-connectiondata.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/48x48/application-x-kexiproject-shortcut.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/64x64/application-x-kexi-connectiondata.svgz
+share/apps/kexi/icons/oxygen/scalable/mimetypes/small/64x64/application-x-kexiproject-shortcut.svgz
 share/apps/kexi/pics/calligra-logo-black-glow.png
 share/apps/kexi/pics/calligra-logo-white-glow.png
 share/apps/kexi/pics/external-link.png
 share/apps/kexi/pics/kexi-logo-white.png
 share/apps/kexi/pics/kexi-logo.png
-share/apps/kexi/status/2.5.0/contribution_details.ui
-share/apps/kexi/status/2.5.0/contribution_help.ui
-share/apps/kexi/status/2.5.0/status.rcc
-share/apps/kexi/status/2.5.0/status.ui
-share/apps/kexi/status/2.5.0/status_strings.ui
+share/apps/kexi/status/2.7.0/contribution_details.ui
+share/apps/kexi/status/2.7.0/contribution_help.ui
+share/apps/kexi/status/2.7.0/status.rcc
+share/apps/kexi/status/2.7.0/status.ui
+share/apps/kexi/status/2.7.0/status_strings.ui
 share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
-share/apps/krita/brushes/A_Angular_box.gih
-share/apps/krita/brushes/A_Angular_box_2.gih
-share/apps/krita/brushes/A_Angular_box_soft.gih
-share/apps/krita/brushes/A_Angular_church.gih
-share/apps/krita/brushes/A_Angular_church_HR.gih
-share/apps/krita/brushes/A_Braids-.gih
-share/apps/krita/brushes/A_Braids-b.gih
-share/apps/krita/brushes/A_Chain.gih
+share/apps/krita/brushes/A_Angular_church.gbr
+share/apps/krita/brushes/A_Angular_church_HR.gbr
+share/apps/krita/brushes/A_Braids.gbr
+share/apps/krita/brushes/A_Braids_b.gbr
+share/apps/krita/brushes/A_Chain.gbr
 share/apps/krita/brushes/A_Nice_sketch.gbr
 share/apps/krita/brushes/A_Nice_sketch2.gbr
-share/apps/krita/brushes/A_Rake.gih
-share/apps/krita/brushes/A_Zend.gbr
-share/apps/krita/brushes/A_abstract-textured1.gih
-share/apps/krita/brushes/A_abstract-textured2.gih
+share/apps/krita/brushes/A_Rake.gbr
+share/apps/krita/brushes/A_abstract-textured1.gbr
+share/apps/krita/brushes/A_abstract-textured2.gbr
 share/apps/krita/brushes/A_bamboo-leaves.gih
 share/apps/krita/brushes/A_bamboo.gih
 share/apps/krita/brushes/A_bokey.gbr
-share/apps/krita/brushes/A_cloudy.gih
-share/apps/krita/brushes/A_concrete.gih
-share/apps/krita/brushes/A_crackled.gih
-share/apps/krita/brushes/A_craqules.gih
-share/apps/krita/brushes/A_crayon.gih
+share/apps/krita/brushes/A_cloudy.gbr
+share/apps/krita/brushes/A_concrete.gbr
+share/apps/krita/brushes/A_crackled.gbr
+share/apps/krita/brushes/A_craqules.gbr
+share/apps/krita/brushes/A_crayon.gbr
 share/apps/krita/brushes/A_dirty-brush.gih
-share/apps/krita/brushes/A_dirty-spot.gih
+share/apps/krita/brushes/A_dirty-spot.gbr
 share/apps/krita/brushes/A_distant-mountain.gih
 share/apps/krita/brushes/A_dynamic-brush.gih
 share/apps/krita/brushes/A_dynamic-brush3.gih
 share/apps/krita/brushes/A_eroded-brush2.gih
 share/apps/krita/brushes/A_eroded-cercle-anim.gih
-share/apps/krita/brushes/A_eroded-cercle-anim2.gih
+share/apps/krita/brushes/A_eroded-cercle_2.gbr
 share/apps/krita/brushes/A_eroded-chinese-anim.gih
 share/apps/krita/brushes/A_eroded-dirtybrush-anim.gih
 share/apps/krita/brushes/A_eroded-knife-anim.gih
@@ -5392,57 +5448,58 @@ share/apps/krita/brushes/A_leaves-mapple.gih
 share/apps/krita/brushes/A_leaves.gih
 share/apps/krita/brushes/A_lucky_star.gbr
 share/apps/krita/brushes/A_mineral-cristal.gih
-share/apps/krita/brushes/A_mountain-texture.gih
+share/apps/krita/brushes/A_mountain-texture.gbr
 share/apps/krita/brushes/A_pin.gih
-share/apps/krita/brushes/A_provencal.gih
+share/apps/krita/brushes/A_provencal.gbr
 share/apps/krita/brushes/A_random-vegetal.gih
 share/apps/krita/brushes/A_random-vegetal2.gih
-share/apps/krita/brushes/A_random-vegetal3.gih
-share/apps/krita/brushes/A_reptile-skin.gih
+share/apps/krita/brushes/A_random-vegetal3.gbr
+share/apps/krita/brushes/A_reptile-skin.gbr
 share/apps/krita/brushes/A_rocks-floor-neg.gih
 share/apps/krita/brushes/A_rocks.gih
-share/apps/krita/brushes/A_smoke.gih
+share/apps/krita/brushes/A_smoke.gbr
 share/apps/krita/brushes/A_snow-pack.gih
 share/apps/krita/brushes/A_sparkle1.gbr
 share/apps/krita/brushes/A_sparkle2.gbr
 share/apps/krita/brushes/A_sparkle3.gbr
-share/apps/krita/brushes/A_splat1.gih
+share/apps/krita/brushes/A_splat1.gbr
 share/apps/krita/brushes/A_splat2.gih
 share/apps/krita/brushes/A_starfield.gih
-share/apps/krita/brushes/A_starfield2.gih
+share/apps/krita/brushes/A_starfield2.gbr
 share/apps/krita/brushes/A_wall-texture.gih
-share/apps/krita/brushes/C_Cloud_1.gih
-share/apps/krita/brushes/C_Dirty_Spot.gih
-share/apps/krita/brushes/D_Dust_1.gih
+share/apps/krita/brushes/C_Cloud_1.gbr
+share/apps/krita/brushes/C_Dirty_Spot.gbr
+share/apps/krita/brushes/D_Dust_1.gbr
 share/apps/krita/brushes/D_Dust_Particles.gih
 share/apps/krita/brushes/D_Normal_dust.gbr
 share/apps/krita/brushes/F_Furr_fast.gbr
 share/apps/krita/brushes/G_Sparks.gih
-share/apps/krita/brushes/LJF_Foliage_Brush_01.gih
-share/apps/krita/brushes/LJF_Foliage_Brush_02.gih
+share/apps/krita/brushes/LJF_Foliage_Brush_01.gbr
+share/apps/krita/brushes/LJF_Foliage_Brush_02.gbr
 share/apps/krita/brushes/LJF_Water_Brush_02.gih
 share/apps/krita/brushes/LJF_Water_Brush_03.gih
 share/apps/krita/brushes/LJF_smoke_c.gih
-share/apps/krita/brushes/L_Coroballs.gih
-share/apps/krita/brushes/L_Foliage_1.gih
-share/apps/krita/brushes/L_Leaf_2.gih
-share/apps/krita/brushes/L_Leaf_3.gih
+share/apps/krita/brushes/L_Coroballs.gbr
+share/apps/krita/brushes/L_Foliage_1.gbr
+share/apps/krita/brushes/L_Leaf_2.gbr
+share/apps/krita/brushes/L_Leaf_3.gbr
 share/apps/krita/brushes/L_Trees.gih
-share/apps/krita/brushes/M_01.gih
-share/apps/krita/brushes/M_02.gih
-share/apps/krita/brushes/M_03.gih
-share/apps/krita/brushes/M_04.gih
-share/apps/krita/brushes/M_05.gih
+share/apps/krita/brushes/MZ_leaves.gbr
+share/apps/krita/brushes/M_01.gbr
+share/apps/krita/brushes/M_02.gbr
+share/apps/krita/brushes/M_03.gbr
+share/apps/krita/brushes/M_04.gbr
+share/apps/krita/brushes/M_05.gbr
 share/apps/krita/brushes/M_06.gbr
-share/apps/krita/brushes/M_07.gih
+share/apps/krita/brushes/M_07.gbr
 share/apps/krita/brushes/M_08.gbr
-share/apps/krita/brushes/M_09.gih
-share/apps/krita/brushes/M_Arrow.gih
-share/apps/krita/brushes/M_Bulb.gih
-share/apps/krita/brushes/M_Cage.gih
-share/apps/krita/brushes/M_Pipe_1.gih
-share/apps/krita/brushes/M_Pipe_2.gih
-share/apps/krita/brushes/M_Pipe_3.gih
+share/apps/krita/brushes/M_09.gbr
+share/apps/krita/brushes/M_Arrow.gbr
+share/apps/krita/brushes/M_Bulb.gbr
+share/apps/krita/brushes/M_Cage.gbr
+share/apps/krita/brushes/M_Pipe_1.gbr
+share/apps/krita/brushes/M_Pipe_2.gbr
+share/apps/krita/brushes/M_Pipe_3.gbr
 share/apps/krita/brushes/M_Pipe_whiteflat.png
 share/apps/krita/brushes/N_Grass_1.gih
 share/apps/krita/brushes/N_Grass_2.gih
@@ -5458,15 +5515,13 @@ share/apps/krita/brushes/P_Graphite_Pencil_grain.gih
 share/apps/krita/brushes/P_Graphite_Pencil_grainb.gih
 share/apps/krita/brushes/P_RealPencil10x10.gih
 share/apps/krita/brushes/P_RealPencil16x16.gih
-share/apps/krita/brushes/R_Rake1.gih
-share/apps/krita/brushes/R_Rake2.gih
-share/apps/krita/brushes/R_Rake3.gih
-share/apps/krita/brushes/R_Rake4.gih
-share/apps/krita/brushes/R_Rake_small.gih
-share/apps/krita/brushes/Real_Oil_2.gih
-share/apps/krita/brushes/Real_Oil_2b.gih
+share/apps/krita/brushes/R_Rake1.gbr
+share/apps/krita/brushes/R_Rake2.gbr
+share/apps/krita/brushes/R_Rake3.gbr
+share/apps/krita/brushes/R_Rake4.gbr
+share/apps/krita/brushes/R_Rake_small.gbr
+share/apps/krita/brushes/Real_Oil_2.gbr
 share/apps/krita/brushes/Real_oil_1.gbr
-share/apps/krita/brushes/Real_oil_1.gih
 share/apps/krita/brushes/S_Smudge_Cheese.gbr
 share/apps/krita/brushes/S_splats_02.gih
 share/apps/krita/brushes/Sc_Scratch.gih
@@ -5475,7 +5530,7 @@ share/apps/krita/brushes/Sc_Scratches_2.gbr
 share/apps/krita/brushes/Sc_Scratches_3.gbr
 share/apps/krita/brushes/T_Fibers_1.gih
 share/apps/krita/brushes/T_Fibers_2.gih
-share/apps/krita/brushes/T_Texture_1.gih
+share/apps/krita/brushes/T_Texture_1.gbr
 share/apps/krita/brushes/T_Texture_2.gih
 share/apps/krita/brushes/T_Texture_3.gih
 share/apps/krita/brushes/T_Texture_4.gih
@@ -5483,7 +5538,7 @@ share/apps/krita/brushes/T_Texture_5.gih
 share/apps/krita/brushes/T_Texture_6.gih
 share/apps/krita/brushes/T_Texture_7.gih
 share/apps/krita/brushes/Te_Techno_1.gih
-share/apps/krita/brushes/Te_Techno_Angular_Cross.gih
+share/apps/krita/brushes/Te_Techno_Angular_Cross.gbr
 share/apps/krita/brushes/U_Circle_circuit.gbr
 share/apps/krita/brushes/U_Circle_shape_1.gbr
 share/apps/krita/brushes/U_Circle_shape_2.gbr
@@ -5493,18 +5548,16 @@ share/apps/krita/brushes/U_Circle_shape_5.gbr
 share/apps/krita/brushes/U_Circle_shape_5b.gbr
 share/apps/krita/brushes/U_Circle_shape_5c.gbr
 share/apps/krita/brushes/V_Vyle_Rock.gih
-share/apps/krita/brushes/Z_Chain_1.gih
+share/apps/krita/brushes/Z_Chain_1.gbr
 share/apps/krita/brushes/Z_Pixel_1.gbr
 share/apps/krita/brushes/Z_Pixel_4x4_rounded.gbr
 share/apps/krita/brushes/Z_Pixel_Cross.gbr
 share/apps/krita/brushes/Z_Pixel__4_pix__45a.gbr
 share/apps/krita/brushes/Z_Test-pressure.gih
-share/apps/krita/brushes/Z_Triangle_shape_1.gih
-share/apps/krita/brushes/Z_Triangle_shape_2.gih
-share/apps/krita/brushes/mz_galhos.gih
-share/apps/krita/brushes/mz_galhos01.gih
-share/apps/krita/brushes/rake_textured_01.gih
-share/apps/krita/brushes/rake_textured_02.gih
+share/apps/krita/brushes/Z_Triangle_shape_1.gbr
+share/apps/krita/brushes/Z_Triangle_shape_2.gbr
+share/apps/krita/brushes/rake_textured_01.gbr
+share/apps/krita/brushes/rake_textured_02.gbr
 share/apps/krita/brushes/texture-a.png
 share/apps/krita/brushes/z_study_pencil_2H.gih
 share/apps/krita/brushes/z_study_pencil_2H_horiz.gih
@@ -5591,6 +5644,10 @@ share/apps/krita/paintoppresets/Basic_erase_soft.kpp
 share/apps/krita/paintoppresets/Basic_ink_05.kpp
 share/apps/krita/paintoppresets/Basic_ink_10.kpp
 share/apps/krita/paintoppresets/Basic_ink_ballpen.kpp
+share/apps/krita/paintoppresets/Basic_ink_brush_25.kpp
+share/apps/krita/paintoppresets/Basic_ink_gpen_10.kpp
+share/apps/krita/paintoppresets/Basic_ink_gpen_25.kpp
+share/apps/krita/paintoppresets/Basic_ink_pen_03.kpp
 share/apps/krita/paintoppresets/Basic_ink_tilt_10.kpp
 share/apps/krita/paintoppresets/Basic_ink_tilt_20.kpp
 share/apps/krita/paintoppresets/Basic_mix.kpp
@@ -5617,6 +5674,7 @@ share/apps/krita/paintoppresets/Basic_tip_soft.kpp
 share/apps/krita/paintoppresets/Block_mix_tilt.kpp
 share/apps/krita/paintoppresets/Block_paint.kpp
 share/apps/krita/paintoppresets/Block_paint_dirty_square.kpp
+share/apps/krita/paintoppresets/Block_paint_fuzzy.kpp
 share/apps/krita/paintoppresets/Block_paint_squary.kpp
 share/apps/krita/paintoppresets/Block_paint_tilt.kpp
 share/apps/krita/paintoppresets/Block_smudge_tilt.kpp
@@ -5658,7 +5716,7 @@ share/apps/krita/paintoppresets/Rake_paint_dry_bristle.kpp
 share/apps/krita/paintoppresets/Rake_paint_texture.kpp
 share/apps/krita/paintoppresets/Rake_smudge.kpp
 share/apps/krita/paintoppresets/Rake_smudge_2.kpp
-share/apps/krita/paintoppresets/Shape_basic_fill.kpp
+share/apps/krita/paintoppresets/Shape_fill.kpp
 share/apps/krita/paintoppresets/Shape_smooth.kpp
 share/apps/krita/paintoppresets/Sketch_2.kpp
 share/apps/krita/paintoppresets/Sketch_chrome.kpp
@@ -5678,54 +5736,71 @@ share/apps/krita/paintoppresets/Splat_paint_texture.kpp
 share/apps/krita/paintoppresets/Splat_paint_texture_2.kpp
 share/apps/krita/paintoppresets/Spray_splat.kpp
 share/apps/krita/paintoppresets/Texture_dirty.kpp
+share/apps/krita/paintoppresets/Texture_fuzzy.kpp
 share/apps/krita/paintoppresets/Texture_hair.kpp
+share/apps/krita/paintoppresets/Texture_leaves_fuzzy.kpp
 share/apps/krita/paintoppresets/Texture_mix_over_structure.kpp
 share/apps/krita/paintoppresets/Texture_paint_chalk.kpp
+share/apps/krita/paintoppresets/Texture_paint_dirty.kpp
 share/apps/krita/paintoppresets/Texture_paint_floor.kpp
+share/apps/krita/paintoppresets/Texture_paint_fuzzy.kpp
 share/apps/krita/paintoppresets/Texture_paint_noisy_big.kpp
 share/apps/krita/paintoppresets/Texture_paint_noisy_cells.kpp
 share/apps/krita/paintoppresets/Texture_paint_trees.kpp
 share/apps/krita/paintoppresets/pixel1.kpp
-share/apps/krita/patterns/Canvas_01.pat
-share/apps/krita/patterns/Canvas_02.pat
-share/apps/krita/patterns/Canvas_03.pat
-share/apps/krita/patterns/Canvas_04.pat
+share/apps/krita/patterns/01_canvas.png
+share/apps/krita/patterns/02_rough-canvas.png
+share/apps/krita/patterns/02b_WoofTissue.png
+share/apps/krita/patterns/03_default-paper.png
+share/apps/krita/patterns/04_paper-C-grain.png
+share/apps/krita/patterns/05_paper-torchon.png
+share/apps/krita/patterns/06_hard-grain.png
+share/apps/krita/patterns/07_big-grain.png
+share/apps/krita/patterns/08_bump-relief.png
+share/apps/krita/patterns/09_drawed_crosshatched.png
+share/apps/krita/patterns/09b_drawed-CrossedLines.png
+share/apps/krita/patterns/10_drawed_dotted.png
+share/apps/krita/patterns/11_drawed_furry.png
+share/apps/krita/patterns/12_drawed_vertical.png
+share/apps/krita/patterns/13_drawed_swirl.png
+share/apps/krita/patterns/14_texture-rock.png
+share/apps/krita/patterns/15_texture-rockB.png
+share/apps/krita/patterns/16_texture-woody.png
+share/apps/krita/patterns/17_texture-melt.png
+share/apps/krita/patterns/18_texture-bark.png
+share/apps/krita/patterns/18b_WaveFlex.png
+share/apps/krita/patterns/19_texture-crackle.png
+share/apps/krita/patterns/20_texture-vegetal.png
+share/apps/krita/patterns/21_texture-chainmail.png
+share/apps/krita/patterns/22_texture-reptile.png
+share/apps/krita/patterns/23-dynamic-screentone-A.png
+share/apps/krita/patterns/24-dynamic-screentone-B.png
+share/apps/krita/patterns/25-dynamic-screentone-C.png
+share/apps/krita/patterns/Canvas_Hard.pat
 share/apps/krita/patterns/Canvas_covered.pat
-share/apps/krita/patterns/Circuit_01.pat
+share/apps/krita/patterns/Canvas_small_01.pat
+share/apps/krita/patterns/Canvas_small_02.pat
 share/apps/krita/patterns/Cross01.pat
-share/apps/krita/patterns/Cross011.pat
 share/apps/krita/patterns/Cross02.pat
 share/apps/krita/patterns/Cross03.pat
 share/apps/krita/patterns/Cross04.pat
 share/apps/krita/patterns/Cross05.pat
 share/apps/krita/patterns/Cross06.pat
 share/apps/krita/patterns/Cross07.pat
-share/apps/krita/patterns/Galvplat_01.pat
-share/apps/krita/patterns/Granite_1c.pat
+share/apps/krita/patterns/Crumpled_Paper.pat
 share/apps/krita/patterns/Grid01.pat
 share/apps/krita/patterns/Grid02.pat
 share/apps/krita/patterns/Grid03.pat
 share/apps/krita/patterns/Grid04.pat
 share/apps/krita/patterns/Grid05.pat
-share/apps/krita/patterns/HR_Canvas_01.pat
-share/apps/krita/patterns/HR_Canvas_02.pat
-share/apps/krita/patterns/HR_Cork.pat
-share/apps/krita/patterns/HR_Deco_Paper.pat
-share/apps/krita/patterns/HR_PastelPaper_01.pat
 share/apps/krita/patterns/HR_PastelPaper_02.pat
-share/apps/krita/patterns/HR_RoughPaper.pat
-share/apps/krita/patterns/HR_SketchPaper_01.pat
-share/apps/krita/patterns/HR_SketchPaper_02.pat
 share/apps/krita/patterns/HR_Wall_Paper.pat
-share/apps/krita/patterns/HR_Water_Color.pat
-share/apps/krita/patterns/Hexacol__1_5.pat
 share/apps/krita/patterns/Pattern01.pat
 share/apps/krita/patterns/Pattern02.pat
 share/apps/krita/patterns/Pattern03.pat
 share/apps/krita/patterns/Pattern04.pat
 share/apps/krita/patterns/Pattern05.pat
 share/apps/krita/patterns/Pattern06.pat
-share/apps/krita/patterns/Rock_01.pat
 share/apps/krita/patterns/Squares01.pat
 share/apps/krita/patterns/Squares02.pat
 share/apps/krita/patterns/Squares03.pat
@@ -5748,20 +5823,11 @@ share/apps/krita/patterns/Zigzag01.pat
 share/apps/krita/patterns/Zigzag02.pat
 share/apps/krita/patterns/Zigzag03.pat
 share/apps/krita/patterns/Zigzag04.pat
-share/apps/krita/patterns/Zigzag041.pat
 share/apps/krita/patterns/fractal_pattern.pat
 share/apps/krita/patterns/generic_paper1.pat
 share/apps/krita/patterns/generic_paper2.pat
-share/apps/krita/patterns/generic_paper3.pat
-share/apps/krita/patterns/generic_paper4.pat
-share/apps/krita/patterns/granite1b.pat
+share/apps/krita/patterns/granite.pat
 share/apps/krita/patterns/hexacolBW__2.pat
-share/apps/krita/patterns/hexacolBW__2_5.pat
-share/apps/krita/patterns/hexacolBW__2b.pat
-share/apps/krita/patterns/hexacolBW__3.pat
-share/apps/krita/patterns/metal_01.pat
-share/apps/krita/patterns/solid_noise.pat
-share/apps/krita/patterns/walnut2.pat
 share/apps/krita/pics/AboutKrita.png
 share/apps/krita/pics/arrow_east.png
 share/apps/krita/pics/arrow_north.png
@@ -5785,6 +5851,7 @@ share/apps/krita/pics/krita_tool_color_picker.png
 share/apps/krita/pics/krita_tool_dyna.png
 share/apps/krita/pics/krita_tool_ellipse.png
 share/apps/krita/pics/krita_tool_freehand.png
+share/apps/krita/pics/krita_tool_freehandvector.png
 share/apps/krita/pics/krita_tool_gradient.png
 share/apps/krita/pics/krita_tool_grid.png
 share/apps/krita/pics/krita_tool_line.png
@@ -5794,6 +5861,7 @@ share/apps/krita/pics/krita_tool_multihand.png
 share/apps/krita/pics/krita_tool_rectangle.png
 share/apps/krita/pics/krita_tool_ruler_assistant.png
 share/apps/krita/pics/krita_tool_transform.png
+share/apps/krita/pics/krita_tool_transform_recursive.png
 share/apps/krita/pics/landscape.png
 share/apps/krita/pics/linked.png
 share/apps/krita/pics/local_selection_active.png
@@ -5992,6 +6060,8 @@ share/apps/krita/templates/texture/Texture8k16bitscalar.desktop
 share/apps/krita/templates/texture/Texture8k32bitscalar.desktop
 share/apps/krita/templates/texture/Texture8k8bitsrgb.desktop
 share/apps/krita/workspaces/Default.kws
+share/apps/krita/workspaces/Painting.kws
+share/apps/krita/workspaces/Vectors.kws
 share/apps/kritaplugins/bigbrother.rc
 share/apps/kritaplugins/colorrange.rc
 share/apps/kritaplugins/colorspaceconversion.rc
@@ -6000,13 +6070,13 @@ share/apps/kritaplugins/histogram.rc
 share/apps/kritaplugins/imageseparate.rc
 share/apps/kritaplugins/imagesize.rc
 share/apps/kritaplugins/imagesplit.rc
-share/apps/kritaplugins/layercompose.rc
 share/apps/kritaplugins/metadataeditor.rc
 share/apps/kritaplugins/metadataeditor/dublincore.rc
 share/apps/kritaplugins/metadataeditor/dublincore.ui
 share/apps/kritaplugins/metadataeditor/exif.rc
 share/apps/kritaplugins/metadataeditor/exif.ui
 share/apps/kritaplugins/modify_selection.rc
+share/apps/kritaplugins/offsetimage.rc
 share/apps/kritaplugins/rotateimage.rc
 share/apps/kritaplugins/shearimage.rc
 share/apps/musicshape/fonts/Emmentaler-14.ttf
@@ -6029,6 +6099,8 @@ share/apps/plan/plan_readonly.rc
 share/apps/plan/scripts/extensions/busyinfoclear.py
 share/apps/plan/scripts/extensions/busyinfoexport.py
 share/apps/plan/scripts/extensions/busyinfoimport.py
+share/apps/plan/scripts/extensions/plan2csvexport.py
+share/apps/plan/scripts/extensions/plan2odsexport.py
 share/apps/plan/scripts/extensions/resourcesimport.py
 share/apps/plan/scripts/samples/sample_busyinfocheck.py
 share/apps/plan/scripts/samples/sample_project.py
@@ -6184,7 +6256,6 @@ share/apps/sheets/icons/hicolor/scalable/actions/template_pricequotation.svgz
 share/apps/sheets/icons/hicolor/scalable/actions/template_studentidcard.svgz
 share/apps/sheets/icons/hicolor/scalable/actions/template_vacationchecklist.svgz
 share/apps/sheets/icons/hicolor/scalable/actions/template_worksheet.svgz
-share/apps/sheets/kpartplugins/googledocs-sheets.rc
 share/apps/sheets/kpartplugins/scripting.rc
 share/apps/sheets/kpartplugins/solver.rc
 share/apps/sheets/scripts/docker/consoledocker.py
@@ -6291,7 +6362,6 @@ share/apps/stage/icons/hicolor/64x64/actions/thread_animation.png
 share/apps/stage/icons/hicolor/64x64/actions/vertical_animations.png
 share/apps/stage/icons/hicolor/64x64/actions/zoom_animation.png
 share/apps/stage/icons/hicolor/scalable/actions/template_emptylandscape.svgz
-share/apps/stage/kpartplugins/googledocs-stage.rc
 share/apps/stage/pics/layout-elements.svg
 share/apps/stage/pics/webslideshow-sidebar.png
 share/apps/stage/stage.rc
@@ -6353,7 +6423,6 @@ share/apps/words/icons/hicolor/48x48/actions/template_plaintext.png
 share/apps/words/icons/hicolor/scalable/actions/template_a4.svgz
 share/apps/words/icons/hicolor/scalable/actions/template_fax.svgz
 share/apps/words/icons/hicolor/scalable/actions/template_letter.svgz
-share/apps/words/kpartplugins/googledocs-words.rc
 share/apps/words/styles/defaultstyles.xml
 share/apps/words/templates/Normal/.directory
 share/apps/words/templates/Normal/.source/A4.odt
@@ -6467,6 +6536,10 @@ share/doc/HTML/en/sheets/index.cache.bz2
 share/doc/HTML/en/sheets/index.docbook
 share/doc/HTML/en/sheets/newdocument.png
 share/doc/HTML/en/sheets/percent.png
+share/doc/HTML/en/sheets/pivot1.png
+share/doc/HTML/en/sheets/pivot2.png
+share/doc/HTML/en/sheets/pivot3.png
+share/doc/HTML/en/sheets/pivot4.png
 share/doc/HTML/en/sheets/sheetproperties.png
 share/doc/HTML/en/sheets/shortcut1.png
 share/doc/HTML/en/sheets/sort1.png
@@ -6506,6 +6579,7 @@ share/doc/HTML/en/stage/tut25.png
 share/doc/HTML/en/stage/tut26.png
 share/doc/HTML/en/stage/tutorial.docbook
 share/icons/hicolor/1024x1024/apps/braindump.png
+share/icons/hicolor/1024x1024/apps/calligraauthor.png
 share/icons/hicolor/1024x1024/apps/calligraflow.png
 share/icons/hicolor/1024x1024/apps/calligrakarbon.png
 share/icons/hicolor/1024x1024/apps/calligrakexi.png
@@ -6515,6 +6589,7 @@ share/icons/hicolor/1024x1024/apps/calligrasheets.png
 share/icons/hicolor/1024x1024/apps/calligrastage.png
 share/icons/hicolor/1024x1024/apps/calligrawords.png
 share/icons/hicolor/128x128/apps/braindump.png
+share/icons/hicolor/128x128/apps/calligraauthor.png
 share/icons/hicolor/128x128/apps/calligraflow.png
 share/icons/hicolor/128x128/apps/calligrakarbon.png
 share/icons/hicolor/128x128/apps/calligrakexi.png
@@ -6524,12 +6599,15 @@ share/icons/hicolor/128x128/apps/calligraplanwork.png
 share/icons/hicolor/128x128/apps/calligrasheets.png
 share/icons/hicolor/128x128/apps/calligrastage.png
 share/icons/hicolor/128x128/apps/calligrawords.png
+share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.png
+share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
 share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/16x16/actions/black.png
 share/icons/hicolor/16x16/actions/highlight.png
 share/icons/hicolor/16x16/actions/pen.png
 share/icons/hicolor/16x16/apps/braindump.png
+share/icons/hicolor/16x16/apps/calligraauthor.png
 share/icons/hicolor/16x16/apps/calligraflow.png
 share/icons/hicolor/16x16/apps/calligrakarbon.png
 share/icons/hicolor/16x16/apps/calligrakexi.png
@@ -6539,11 +6617,14 @@ share/icons/hicolor/16x16/apps/calligraplanwork.png
 share/icons/hicolor/16x16/apps/calligrasheets.png
 share/icons/hicolor/16x16/apps/calligrastage.png
 share/icons/hicolor/16x16/apps/calligrawords.png
+share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/22x22/actions/stateshape.png
 share/icons/hicolor/22x22/actions/statetool.png
 share/icons/hicolor/22x22/actions/tool_pagelayout.png
 share/icons/hicolor/22x22/apps/braindump.png
+share/icons/hicolor/22x22/apps/calligraauthor.png
+share/icons/hicolor/22x22/apps/calligraflow.png
 share/icons/hicolor/22x22/apps/calligrakarbon.png
 share/icons/hicolor/22x22/apps/calligrakexi.png
 share/icons/hicolor/22x22/apps/calligrakrita.png
@@ -6552,8 +6633,10 @@ share/icons/hicolor/22x22/apps/calligraplanwork.png
 share/icons/hicolor/22x22/apps/calligrasheets.png
 share/icons/hicolor/22x22/apps/calligrastage.png
 share/icons/hicolor/22x22/apps/calligrawords.png
+share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/256x256/apps/braindump.png
+share/icons/hicolor/256x256/apps/calligraauthor.png
 share/icons/hicolor/256x256/apps/calligraflow.png
 share/icons/hicolor/256x256/apps/calligrakarbon.png
 share/icons/hicolor/256x256/apps/calligrakexi.png
@@ -6563,6 +6646,7 @@ share/icons/hicolor/256x256/apps/calligrasheets.png
 share/icons/hicolor/256x256/apps/calligrastage.png
 share/icons/hicolor/256x256/apps/calligrawords.png
 share/icons/hicolor/32x32/apps/braindump.png
+share/icons/hicolor/32x32/apps/calligraauthor.png
 share/icons/hicolor/32x32/apps/calligraflow.png
 share/icons/hicolor/32x32/apps/calligrakarbon.png
 share/icons/hicolor/32x32/apps/calligrakexi.png
@@ -6572,8 +6656,11 @@ share/icons/hicolor/32x32/apps/calligraplanwork.png
 share/icons/hicolor/32x32/apps/calligrasheets.png
 share/icons/hicolor/32x32/apps/calligrastage.png
 share/icons/hicolor/32x32/apps/calligrawords.png
+share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/48x48/apps/braindump.png
+share/icons/hicolor/48x48/apps/calligraauthor.png
+share/icons/hicolor/48x48/apps/calligraflow.png
 share/icons/hicolor/48x48/apps/calligrakarbon.png
 share/icons/hicolor/48x48/apps/calligrakexi.png
 share/icons/hicolor/48x48/apps/calligrakrita.png
@@ -6582,8 +6669,10 @@ share/icons/hicolor/48x48/apps/calligraplanwork.png
 share/icons/hicolor/48x48/apps/calligrasheets.png
 share/icons/hicolor/48x48/apps/calligrastage.png
 share/icons/hicolor/48x48/apps/calligrawords.png
+share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/512x512/apps/braindump.png
+share/icons/hicolor/512x512/apps/calligraauthor.png
 share/icons/hicolor/512x512/apps/calligraflow.png
 share/icons/hicolor/512x512/apps/calligrakarbon.png
 share/icons/hicolor/512x512/apps/calligrakexi.png
@@ -6593,6 +6682,7 @@ share/icons/hicolor/512x512/apps/calligrasheets.png
 share/icons/hicolor/512x512/apps/calligrastage.png
 share/icons/hicolor/512x512/apps/calligrawords.png
 share/icons/hicolor/64x64/apps/braindump.png
+share/icons/hicolor/64x64/apps/calligraauthor.png
 share/icons/hicolor/64x64/apps/calligraflow.png
 share/icons/hicolor/64x64/apps/calligrakarbon.png
 share/icons/hicolor/64x64/apps/calligrakexi.png
@@ -6602,9 +6692,12 @@ share/icons/hicolor/64x64/apps/calligraplanwork.png
 share/icons/hicolor/64x64/apps/calligrasheets.png
 share/icons/hicolor/64x64/apps/calligrastage.png
 share/icons/hicolor/64x64/apps/calligrawords.png
+share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.png
+share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.work.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.png
 share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.plan.work.png
 share/icons/hicolor/scalable/apps/braindump.svgz
+share/icons/hicolor/scalable/apps/calligraauthor.svgz
 share/icons/hicolor/scalable/apps/calligraflow.svgz
 share/icons/hicolor/scalable/apps/calligrakarbon.svgz
 share/icons/hicolor/scalable/apps/calligrakexi.svgz
@@ -6614,6 +6707,8 @@ share/icons/hicolor/scalable/apps/calligraplanwork.svgz
 share/icons/hicolor/scalable/apps/calligrasheets.svgz
 share/icons/hicolor/scalable/apps/calligrastage.svgz
 share/icons/hicolor/scalable/apps/calligrawords.svgz
+share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.kplato.svgz
+share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.kplato.work.svgz
 share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.svgz
 share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.work.svgz
 share/icons/oxygen/16x16/actions/curve-connector.png
@@ -6645,7 +6740,6 @@ share/icons/oxygen/32x32/actions/x-shape-image.png
 share/icons/oxygen/32x32/actions/x-shape-text.png
 share/icons/oxygen/48x48/actions/table.png
 share/icons/oxygen/scalable/actions/table.svgz
-share/kde4/services/Filterkpr2odf.desktop
 share/kde4/services/ServiceMenus/flow_print.desktop
 share/kde4/services/ServiceMenus/karbon_print.desktop
 share/kde4/services/ServiceMenus/krita_print.desktop
@@ -6655,7 +6749,9 @@ share/kde4/services/ServiceMenus/words_print.desktop
 share/kde4/services/artistictextshape.desktop
 share/kde4/services/authorpart.desktop
 share/kde4/services/autocorrect.desktop
+share/kde4/services/basicflakesplugin.desktop
 share/kde4/services/calligra_odg_thumbnail.desktop
+share/kde4/services/calligradocinfopropspage.desktop
 share/kde4/services/calligradockers.desktop
 share/kde4/services/calligrastageeventactions.desktop
 share/kde4/services/calligrastagetoolanimation.desktop
@@ -6686,7 +6782,6 @@ share/kde4/services/karbon_xfig_thumbnail.desktop
 share/kde4/services/karbonfiltereffects.desktop
 share/kde4/services/karbonpart.desktop
 share/kde4/services/karbontools.desktop
-share/kde4/services/kchartpart.desktop
 share/kde4/services/kexi/kexicsv_importexporthandler.desktop
 share/kde4/services/kexi/kexiformhandler.desktop
 share/kde4/services/kexi/keximigrationhandler.desktop
@@ -6711,11 +6806,9 @@ share/kde4/services/kformdesigner/kformdesigner_kexidbfactory.desktop
 share/kde4/services/kformdesigner/kformdesigner_stdwidgets.desktop
 share/kde4/services/kformdesigner/kformdesigner_webbrowser.desktop
 share/kde4/services/kformulapart.desktop
-share/kde4/services/kodocinfopropspage.desktop
 share/kde4/services/kolcmsengine.desktop
 share/kde4/services/kopabackgroundtool.desktop
 share/kde4/services/koreport_barcodeplugin.desktop
-share/kde4/services/koreport_chartplugin.desktop
 %%MARBLE%%share/kde4/services/koreport_mapsplugin.desktop
 share/kde4/services/koreport_webplugin.desktop
 share/kde4/services/kpr_pageeffect_barwipe.desktop
@@ -6741,6 +6834,7 @@ share/kde4/services/krita_compositiondocker.desktop
 share/kde4/services/krita_digitalmixer.desktop
 share/kde4/services/krita_exr_export.desktop
 share/kde4/services/krita_exr_import.desktop
+share/kde4/services/krita_flipbook_import.desktop
 share/kde4/services/krita_jp2_export.desktop
 share/kde4/services/krita_jp2_import.desktop
 share/kde4/services/krita_jpeg_export.desktop
@@ -6760,6 +6854,7 @@ share/kde4/services/krita_ppm_import.desktop
 share/kde4/services/krita_presetdocker.desktop
 share/kde4/services/krita_psd_export.desktop
 share/kde4/services/krita_psd_import.desktop
+share/kde4/services/krita_qml_export.desktop
 share/kde4/services/krita_raw_import.desktop
 share/kde4/services/krita_smallcolorselector.desktop
 share/kde4/services/krita_specificcolorselector.desktop
@@ -6781,7 +6876,6 @@ share/kde4/services/kritadefaultdockers.desktop
 share/kde4/services/kritadefaultpaintops.desktop
 share/kde4/services/kritadefaulttools.desktop
 share/kde4/services/kritadeformpaintop.desktop
-share/kde4/services/kritadodgeburn.desktop
 share/kde4/services/kritadropshadow.desktop
 share/kde4/services/kritadynapaintop.desktop
 share/kde4/services/kritaembossfilter.desktop
@@ -6799,11 +6893,12 @@ share/kde4/services/kritaimagedocker.desktop
 share/kde4/services/kritaimageenhancement.desktop
 share/kde4/services/kritaimagesize.desktop
 share/kde4/services/kritaimagesplit.desktop
-share/kde4/services/kritalayercompose.desktop
+share/kde4/services/kritalayergroupswitcher.desktop
 share/kde4/services/kritalevelfilter.desktop
 share/kde4/services/kritametadataeditor.desktop
 share/kde4/services/kritamodifyselection.desktop
 share/kde4/services/kritanoisefilter.desktop
+share/kde4/services/kritaoffsetimage.desktop
 share/kde4/services/kritaoilpaintfilter.desktop
 share/kde4/services/kritapart.desktop
 share/kde4/services/kritaparticlepaintop.desktop
@@ -6870,6 +6965,9 @@ share/kde4/services/pathshapes.desktop
 share/kde4/services/pictureshape.desktop
 share/kde4/services/plan_icalendar_export.desktop
 share/kde4/services/plan_kplato_import.desktop
+share/kde4/services/plan_msproject_import.desktop
+share/kde4/services/plan_msprojectexchange_import.desktop
+share/kde4/services/plan_planner_import.desktop
 share/kde4/services/planpart.desktop
 share/kde4/services/planrcpsscheduler.desktop
 share/kde4/services/plantjscheduler.desktop
@@ -6882,7 +6980,6 @@ share/kde4/services/sheetspart.desktop
 share/kde4/services/spellcheck.desktop
 share/kde4/services/spreadsheetshape-deferred.desktop
 share/kde4/services/spreadsheetshape.desktop
-share/kde4/services/stage_kpr_thumbnail.desktop
 share/kde4/services/stage_odp_thumbnail.desktop
 share/kde4/services/stage_powerpoint_thumbnail.desktop
 share/kde4/services/stage_pptx_thumbnail.desktop
@@ -6891,12 +6988,12 @@ share/kde4/services/stateshape.desktop
 share/kde4/services/textshape.desktop
 share/kde4/services/textvariables.desktop
 share/kde4/services/thesaurustool.desktop
-share/kde4/services/threedshape.desktop
 share/kde4/services/vectorshape.desktop
 share/kde4/services/videoshape.desktop
 share/kde4/services/webshape.desktop
 share/kde4/services/words_Mobi_export.desktop
 share/kde4/services/words_applixword_import.desktop
+share/kde4/services/words_ascii_export.desktop
 share/kde4/services/words_ascii_import.desktop
 share/kde4/services/words_docx_import.desktop
 share/kde4/services/words_docx_thumbnail.desktop
@@ -6915,9 +7012,10 @@ share/kde4/services/wordspart.desktop
 share/kde4/servicetypes/braindump_extensions.desktop
 share/kde4/servicetypes/calligra_application.desktop
 share/kde4/servicetypes/calligra_deferred_plugin.desktop
+share/kde4/servicetypes/calligra_filter.desktop
+share/kde4/servicetypes/calligra_part.desktop
 share/kde4/servicetypes/calligradb_driver.desktop
 share/kde4/servicetypes/calligradocker.desktop
-share/kde4/servicetypes/calligrapart.desktop
 share/kde4/servicetypes/filtereffect.desktop
 share/kde4/servicetypes/flake.desktop
 share/kde4/servicetypes/flakedevice.desktop
@@ -6928,10 +7026,6 @@ share/kde4/servicetypes/inlinetextobject.desktop
 share/kde4/servicetypes/karbon_module.desktop
 share/kde4/servicetypes/kexihandler.desktop
 share/kde4/servicetypes/keximigration_driver.desktop
-share/kde4/servicetypes/kochart.desktop
-share/kde4/servicetypes/kofilter.desktop
-share/kde4/servicetypes/kofilterwrapper.desktop
-share/kde4/servicetypes/koplugin.desktop
 share/kde4/servicetypes/koreport_itemplugin.desktop
 share/kde4/servicetypes/kpr_pageeffect.desktop
 share/kde4/servicetypes/kpr_shapeanimation.desktop
@@ -6949,10 +7043,10 @@ share/kde4/servicetypes/presentationeventaction.desktop
 share/kde4/servicetypes/scripteventaction.desktop
 share/kde4/servicetypes/sheets_plugin.desktop
 share/kde4/servicetypes/texteditingplugin.desktop
-share/kde4/servicetypes/textvariableplugin.desktop
 share/kde4/servicetypes/widgetfactory.desktop
-share/mime/image/x-svm.xml
+share/mime/packages/calligra_planner_mpp.xml
 share/mime/packages/calligra_svm.xml
+share/mime/packages/krita.xml
 share/mime/packages/krita_ora.xml
 share/mime/packages/msooxml-all.xml
 share/templates/.source/Illustration.odg
@@ -6983,7 +7077,6 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/words/templates/Normal
 @dirrm share/apps/words/templates
 @dirrm share/apps/words/styles
-@dirrm share/apps/words/kpartplugins
 @dirrm share/apps/words/icons/hicolor/scalable/actions
 @dirrm share/apps/words/icons/hicolor/scalable
 @dirrm share/apps/words/icons/hicolor/48x48/actions
@@ -7004,7 +7097,6 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/stage/templates
 @dirrm share/apps/stage/styles
 @dirrm share/apps/stage/pics
-@dirrm share/apps/stage/kpartplugins
 @dirrm share/apps/stage/icons/hicolor/scalable/actions
 @dirrm share/apps/stage/icons/hicolor/scalable
 @dirrm share/apps/stage/icons/hicolor/64x64/actions
@@ -7123,9 +7215,12 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/koproperty/icons/hicolor
 @dirrm share/apps/koproperty/icons
 @dirrm share/apps/koproperty
-@dirrm share/apps/kexi/status/2.5.0
+@dirrm share/apps/kexi/status/2.7.0
 @dirrm share/apps/kexi/status
 @dirrm share/apps/kexi/pics
+@dirrm share/apps/kexi/icons/oxygen/scalable/mimetypes/small/64x64
+@dirrm share/apps/kexi/icons/oxygen/scalable/mimetypes/small/48x48
+@dirrm share/apps/kexi/icons/oxygen/scalable/mimetypes/small/32x32
 @dirrm share/apps/kexi/icons/oxygen/scalable/mimetypes/small/22x22
 @dirrm share/apps/kexi/icons/oxygen/scalable/mimetypes/small/16x16
 @dirrm share/apps/kexi/icons/oxygen/scalable/mimetypes/small
@@ -7269,6 +7364,7 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/braindump/icons
 @dirrm share/apps/braindump
 @dirrm share/apps/author
+@dirrm lib/kde4/planconvert
 @dirrm include/words/part/frames
 @dirrm include/words/part
 @dirrm include/words