=== modified file 'debian/calligra-data.install' --- debian/calligra-data.install 2013-02-06 17:55:08 +0000 +++ debian/calligra-data.install 2013-02-19 15:21:42 +0000 @@ -307,6 +307,7 @@ usr/share/kde4/services/pluginshape.desktop usr/share/kde4/services/spacenavigator.desktop usr/share/kde4/services/spellcheck.desktop +usr/share/kde4/services/words_Mobi_export.desktop usr/share/kde4/services/textshape.desktop usr/share/kde4/services/textvariables.desktop usr/share/kde4/services/thesaurustool.desktop === modified file 'debian/calligra-dev.install' --- debian/calligra-dev.install 2012-11-27 08:34:46 +0000 +++ debian/calligra-dev.install 2013-02-19 15:21:42 +0000 @@ -39,6 +39,7 @@ usr/lib/libkritalibbrush.so usr/lib/libkritalibpaintop.so usr/lib/libkritaui.so +usr/lib/libkdgantt.so usr/lib/libkundo2.so usr/lib/libmsooxml.so usr/lib/libpigmentcms.so === modified file 'debian/calligra-libs.install' --- debian/calligra-libs.install 2012-11-27 08:34:46 +0000 +++ debian/calligra-libs.install 2013-02-19 15:21:42 +0000 @@ -9,6 +9,7 @@ usr/lib/kde4/changecase.so usr/lib/kde4/chartshape.so usr/lib/kde4/defaulttools.so +usr/lib/kde4/exportMobi.so usr/lib/kde4/formulashape.so usr/lib/kde4/kodocinfopropspage.so usr/lib/kde4/kolcmsengine.so @@ -47,6 +48,10 @@ usr/lib/libkopageapp.so.11.0.0 usr/lib/libkoplugin.so.11 usr/lib/libkoplugin.so.11.0.0 +usr/lib/libkdgantt.so.11 +usr/lib/libkdgantt.so.11.0.0 +usr/lib/librcps_plan.so.11 +usr/lib/librcps_plan.so.11.0.0 usr/lib/libkoproperty.so.11 usr/lib/libkoproperty.so.11.0.0 usr/lib/libkoreport.so.11 === modified file 'debian/calligraauthor.install' --- debian/calligraauthor.install 2012-10-30 23:27:40 +0000 +++ debian/calligraauthor.install 2013-02-19 15:21:42 +0000 @@ -1,6 +1,5 @@ usr/bin/calligraauthor usr/lib/kde4/authorpart.so -usr/lib/libkdeinit4_calligraauthor.so usr/share/applications/kde4/author.desktop usr/share/kde4/apps/author/author.rc usr/share/kde4/apps/author/author_readonly.rc === modified file 'debian/calligraflow.install' --- debian/calligraflow.install 2012-10-30 23:27:40 +0000 +++ debian/calligraflow.install 2013-02-19 15:21:42 +0000 @@ -3,7 +3,6 @@ usr/lib/kde4/flowpart.so usr/lib/libflowprivate.so.11 usr/lib/libflowprivate.so.11.0.0 -usr/lib/libkdeinit4_calligraflow.so usr/share/applications/kde4/flow.desktop usr/share/kde4/services/ServiceMenus/flow_print.desktop usr/share/kde4/services/flowdockersplugin.desktop === modified file 'debian/calligraplan.install' --- debian/calligraplan.install 2013-02-06 17:55:08 +0000 +++ debian/calligraplan.install 2013-02-19 15:21:42 +0000 @@ -7,8 +7,6 @@ usr/lib/kde4/planpart.so usr/lib/kde4/plantjscheduler.so usr/lib/kde4/planworkpart.so -usr/lib/libkdeinit4_calligraplan.so -usr/lib/libkdeinit4_calligraplanwork.so usr/lib/libkplatokernel.so.11 usr/lib/libkplatokernel.so.11.0.0 usr/lib/libkplatomodels.so.11 === modified file 'debian/calligrasheets.install' --- debian/calligrasheets.install 2013-02-06 17:55:08 +0000 +++ debian/calligrasheets.install 2013-02-19 15:21:42 +0000 @@ -34,7 +34,6 @@ usr/lib/libcalligrasheetscommon.so.11.0.0 usr/lib/libcalligrasheetsodf.so.11 usr/lib/libcalligrasheetsodf.so.11.0.0 -usr/lib/libkdeinit4_calligrasheets.so usr/share/applications/kde4/sheets.desktop usr/share/doc/kde/HTML/en/sheets usr/share/kde4/apps/sheets/ === modified file 'debian/calligrastage.install' --- debian/calligrastage.install 2013-02-06 17:55:08 +0000 +++ debian/calligrastage.install 2013-02-19 15:21:42 +0000 @@ -18,7 +18,6 @@ usr/lib/kde4/pptximport.so usr/lib/libcalligrastageprivate.so.11 usr/lib/libcalligrastageprivate.so.11.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 @@ -51,7 +50,6 @@ usr/share/kde4/services/stagepart.desktop usr/share/kde4/servicetypes/kpr_pageeffect.desktop usr/share/kde4/servicetypes/kpr_shapeanimation.desktop - usr/share/kde4/services/stage_kpr_thumbnail.desktop usr/share/kde4/services/stage_odp_thumbnail.desktop usr/share/kde4/services/stage_powerpoint_thumbnail.desktop === modified file 'debian/calligrawords.install' --- debian/calligrawords.install 2012-10-30 23:27:40 +0000 +++ debian/calligrawords.install 2013-02-19 15:21:42 +0000 @@ -1,6 +1,6 @@ usr/bin/calligrawords usr/lib/kde4/wordspart.so -usr/lib/libkdeinit4_calligrawords.so usr/share/applications/kde4/words.desktop usr/share/kde4/services/ServiceMenus/words_print.desktop usr/share/kde4/services/wordspart.desktop + === modified file 'debian/changelog' --- debian/changelog 2013-02-06 17:55:08 +0000 +++ debian/changelog 2013-02-19 15:21:42 +0000 @@ -1,3 +1,11 @@ +calligra (1:2.6.1-0ubuntu1) raring; urgency=low + + * New upstream release. + * Refreshed the patches so they are without offsets + * Fixed multiple .install files to make installation work. + + -- Howard Chan Mon, 18 Feb 2013 19:09:22 +0800 + calligra (1:2.6.0-0ubuntu1) raring; urgency=low * New upstream release. === modified file 'debian/karbon.install' --- debian/karbon.install 2013-02-06 17:55:08 +0000 +++ debian/karbon.install 2013-02-19 15:21:42 +0000 @@ -20,7 +20,6 @@ usr/lib/libkarboncommon.so.11.0.0 usr/lib/libkarbonui.so.11 usr/lib/libkarbonui.so.11.0.0 -usr/lib/libkdeinit4_karbon.so usr/share/applications/kde4/karbon.desktop usr/share/icons/hicolor/16x16/apps/calligrakarbon.png usr/share/icons/hicolor/22x22/apps/calligrakarbon.png === modified file 'debian/krita-data.install' --- debian/krita-data.install 2013-02-06 17:55:08 +0000 +++ debian/krita-data.install 2013-02-19 15:21:42 +0000 @@ -25,3 +25,27 @@ usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/edit-table-cell-split.png usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/zoom-draw.png usr/share/kde4/apps/calligra/icons/hicolor/32x32/actions/tool_imageeffects.png +usr/share/kde4/apps/calligra/palettes/Nature_stones.gpl +usr/share/kde4/apps/calligra/palettes/photoshop-swatches-sketchlings-swatches.aco.gpl +usr/share/kde4/apps/calligra/palettes/1-classic-kit.gpl +usr/share/kde4/apps/calligra/palettes/1-All-Color-for-good-colors-choice.gpl +usr/share/kde4/apps/calligra/palettes/Nature_Grass.gpl +usr/share/kde4/apps/calligra/palettes/Fabric_jeans.gpl +usr/share/kde4/apps/calligra/palettes/Human_Skin.gpl +usr/share/kde4/apps/calligra/palettes/Nature_wood.gpl +usr/share/kde4/apps/calligra/palettes/Paletilla.gpl +usr/share/kde4/apps/calligra/palettes/Untitled.gpl +usr/share/kde4/apps/calligra/palettes/Fabric_colored.gpl +usr/share/kde4/apps/calligra/palettes/bugslife_final.png-10.gpl +usr/share/kde4/apps/calligra/palettes/Skin.gpl.txt.gpl +usr/share/kde4/apps/calligra/palettes/Human_Hair.gpl +usr/share/kde4/apps/calligra/palettes/testgimp_swatches.aco.gpl +usr/share/kde4/apps/calligra/palettes/color_wheel-2-rgb.aco.gpl +usr/share/kde4/apps/calligra/palettes/NESPAL.gpl.gpl +usr/share/kde4/apps/calligra/palettes/Nature_flowers.gpl +usr/share/kde4/apps/calligra/palettes/Nature_Water_Sky.gpl +usr/share/kde4/apps/calligra/palettes/Human_eyes.gpl +usr/share/kde4/apps/calligra/palettes/Named_Colors.gpl +usr/share/kde4/apps/calligra/palettes/mi-paleta-2009.aco.gpl +usr/share/kde4/apps/calligra/palettes/Human_lips.gpl +usr/share/kde4/apps/calligra/palettes/new_kde.gpl === modified file 'debian/krita.install' --- debian/krita.install 2013-02-06 17:55:08 +0000 +++ debian/krita.install 2013-02-19 15:21:42 +0000 @@ -91,7 +91,6 @@ usr/lib/kde4/kritaunsharpfilter.so usr/lib/kde4/kritawavefilter.so usr/lib/kde4/kritaxcfimport.so -usr/lib/libkdeinit4_krita.so usr/lib/libkritaimage.so.11 usr/lib/libkritaimage.so.11.0.0 usr/lib/libkritalibbrush.so.11 @@ -232,3 +231,4 @@ usr/share/icons/hicolor/1024x1024/apps/calligrakrita.png usr/lib/kde4/kritapsdexport.so usr/share/kde4/services/krita_psd_export.desktop +usr/share/icons/hicolor/scalable/apps/calligrakrita.svgz === modified file 'debian/patches/kubuntu_build_calligraactive.diff' --- debian/patches/kubuntu_build_calligraactive.diff 2013-02-06 17:55:08 +0000 +++ debian/patches/kubuntu_build_calligraactive.diff 2013-02-19 15:21:42 +0000 @@ -4,8 +4,8 @@ Author: Philip Muškovac Index: calligra/CMakeLists.txt =================================================================== ---- calligra.orig/CMakeLists.txt 2013-02-06 22:26:15.701677266 +0800 -+++ calligra/CMakeLists.txt 2013-02-06 22:26:17.469677240 +0800 +--- calligra.orig/CMakeLists.txt 2013-02-18 19:11:38.194627132 +0800 ++++ calligra/CMakeLists.txt 2013-02-18 19:11:38.189627132 +0800 @@ -93,7 +93,7 @@ set(SHOULD_BUILD_CALLIGRA TRUE) set(SHOULD_BUILD_CSTESTER TRUE) === modified file 'debian/patches/kubuntu_words_mimetype.diff' --- debian/patches/kubuntu_words_mimetype.diff 2013-02-06 17:55:08 +0000 +++ debian/patches/kubuntu_words_mimetype.diff 2013-02-19 15:21:42 +0000 @@ -4,9 +4,9 @@ Author: Jonathan Riddell Index: calligra/words/part/words.desktop =================================================================== ---- calligra.orig/words/part/words.desktop 2013-02-06 22:26:15.601677268 +0800 -+++ calligra/words/part/words.desktop 2013-02-06 22:26:18.881677219 +0800 -@@ -112,7 +112,7 @@ +--- calligra.orig/words/part/words.desktop 2013-02-18 19:11:40.452627098 +0800 ++++ calligra/words/part/words.desktop 2013-02-18 19:11:40.448627098 +0800 +@@ -116,7 +116,7 @@ Comment[x-test]=xxWrite documentsxx Comment[zh_CN]=编写文档 Comment[zh_TW]=寫文件 === modified file 'debian/patches/kubuntu_x11_link.patch' --- debian/patches/kubuntu_x11_link.patch 2013-02-06 17:55:08 +0000 +++ debian/patches/kubuntu_x11_link.patch 2013-02-19 15:21:42 +0000 @@ -3,8 +3,8 @@ ## Bug: bug URL Index: calligra/krita/ui/CMakeLists.txt =================================================================== ---- calligra.orig/krita/ui/CMakeLists.txt 2013-02-06 22:26:15.449677270 +0800 -+++ calligra/krita/ui/CMakeLists.txt 2013-02-06 22:26:21.061677187 +0800 +--- calligra.orig/krita/ui/CMakeLists.txt 2013-02-18 19:11:44.729627035 +0800 ++++ calligra/krita/ui/CMakeLists.txt 2013-02-18 19:11:44.724627035 +0800 @@ -289,6 +289,7 @@ endif(HAVE_OPENGL)