diff -Nru calligra-2.8.0/debian/changelog calligra-2.8.0/debian/changelog --- calligra-2.8.0/debian/changelog 2014-03-20 13:20:54.000000000 +0000 +++ calligra-2.8.0/debian/changelog 2014-03-24 12:19:25.000000000 +0000 @@ -1,6 +1,14 @@ +calligra (1:2.8.0-0ubuntu4) trusty; urgency=medium + + [ Scarlett Clark ] + * Merge krita sketch paintbrush engine back into main krita package. + + -- Jonathan Riddell Mon, 24 Mar 2014 12:16:35 +0000 + calligra (1:2.8.0-0ubuntu3) trusty; urgency=medium - * Recompile for new okular libaries + [ Jonathan Riddell ] + * Recompile for new okular libraries -- Jonathan Riddell Thu, 20 Mar 2014 13:19:22 +0000 diff -Nru calligra-2.8.0/debian/control calligra-2.8.0/debian/control --- calligra-2.8.0/debian/control 2014-03-20 13:20:54.000000000 +0000 +++ calligra-2.8.0/debian/control 2014-03-24 12:19:25.000000000 +0000 @@ -304,7 +304,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, krita-data (>= ${source:Version}), calligra-libs (= ${binary:Version}) Suggests: khelpcenter4 Breaks: krita-data (<< 1:2.4) -Replaces: krita-data (<< 1:2.4) +Replaces: krita-data (<< 1:2.4), kritasketch (<< 1:2.8.0-0ubuntu4) Homepage: http://www.calligra-suite.org/krita/ Description: pixel-based image manipulation program for the Calligra Suite Krita is a creative application for raster images. Whether you want to create @@ -329,7 +329,7 @@ Section: graphics Depends: ${misc:Depends} Replaces: calligra-data (<< 1:2.6.92-0ubuntu4), krita (<< 1:2.6.92) -Breaks: calligra-data (<< 1:2.6.92-0ubuntu4), krita (<< 1:2.6.92) +Breaks: calligra-data (<< 1:2.6.92-0ubuntu4), krita (<< 1:2.6.92), kritasketch (<< 1:2.8.0-0ubuntu4) Homepage: http://www.calligra-suite.org/krita/ Description: data files for Krita painting program This package contains architecture-independent data files for Krita, diff -Nru calligra-2.8.0/debian/krita-data.install calligra-2.8.0/debian/krita-data.install --- calligra-2.8.0/debian/krita-data.install 2014-03-20 13:20:54.000000000 +0000 +++ calligra-2.8.0/debian/krita-data.install 2014-03-24 12:19:25.000000000 +0000 @@ -29,4 +29,5 @@ usr/share/kde4/services/krita_overviewdocker.desktop usr/share/kde4/services/krita_palettedocker.desktop usr/share/kde4/services/kritapatterngenerator.desktop +usr/share/kde4/services/kritasketchpaintop.desktop usr/share/mime/packages/krita.xml diff -Nru calligra-2.8.0/debian/krita.install calligra-2.8.0/debian/krita.install --- calligra-2.8.0/debian/krita.install 2014-03-20 13:20:54.000000000 +0000 +++ calligra-2.8.0/debian/krita.install 2014-03-24 12:19:25.000000000 +0000 @@ -114,6 +114,7 @@ usr/lib/libkritalibpaintop.so.13.0.0 usr/lib/libkritaui.so.13 usr/lib/libkritaui.so.13.0.0 +usr/lib/kde4/kritasketchpaintop.so usr/share/applications/kde4/krita_bmp.desktop usr/share/applications/kde4/krita.desktop usr/share/applications/kde4/krita_exr.desktop @@ -237,3 +238,4 @@ usr/share/kde4/servicetypes/krita_paintop.desktop usr/share/kde4/servicetypes/krita_plugin.desktop usr/share/kde4/servicetypes/krita_tool.desktop + diff -Nru calligra-2.8.0/debian/kritasketch.install calligra-2.8.0/debian/kritasketch.install --- calligra-2.8.0/debian/kritasketch.install 2014-03-20 13:20:54.000000000 +0000 +++ calligra-2.8.0/debian/kritasketch.install 2014-03-24 12:19:25.000000000 +0000 @@ -4,8 +4,6 @@ usr/share/kde4/config/kritasketchpanelsrc usr/share/kde4/config/kritasketchrc usr/share/applications/kde4/kritasketch.desktop -usr/share/kde4/services/kritasketchpaintop.desktop -usr/lib/kde4/kritasketchpaintop.so usr/lib/libkritasketchlib.so.13.0.0 usr/lib/libkritasketchlib.so.13 usr/lib/calligra/imports/org/krita/draganddrop/qmldir