diff -Nru calligra-2.8.5+dfsg/debian/changelog calligra-2.8.5+dfsg/debian/changelog --- calligra-2.8.5+dfsg/debian/changelog 2015-06-21 06:38:53.000000000 +0000 +++ calligra-2.8.5+dfsg/debian/changelog 2016-08-16 11:27:36.000000000 +0000 @@ -1,3 +1,31 @@ +calligra (1:2.8.5+dfsg-1.2+rpi4) stretch-staging; urgency=medium + + * Change mindistances from qreal to double to avoid narrowing conversion errror. + * Change field Transisition.c to signed char to avoid narrowing conversion error. + * Reorder includes in krita/plugins/filters/unsharp/kis_unsharp_filter.cpp to avoid type ambiguities. + + -- Peter Michael Green Tue, 16 Aug 2016 11:27:36 +0000 + +calligra (1:2.8.5+dfsg-1.2+rpi3) stretch-staging; urgency=medium + + * Remove dependency on kde-runtime-dbg which no longer exists. + + -- Peter Michael Green Sun, 12 Jun 2016 22:17:59 +0000 + +calligra (1:2.8.5+dfsg-1.2+rpi2) stretch-staging; urgency=medium + + * Drop kexi-map-form-widget and calligra-reports-map-element binary packages + and drop build-dependencies on libmarble-dev. It seems marble has moved + entirely to qt5 and is hence incompatble with this package. + + -- Peter Michael Green Thu, 19 Nov 2015 02:47:44 +0000 + +calligra (1:2.8.5+dfsg-1.2+rpi1) stretch-staging; urgency=medium + + * Add build-depends on libsoprano-dev (Closes: 797389) + + -- Peter Michael Green Sun, 13 Sep 2015 10:57:47 +0000 + calligra (1:2.8.5+dfsg-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru calligra-2.8.5+dfsg/debian/control calligra-2.8.5+dfsg/debian/control --- calligra-2.8.5+dfsg/debian/control 2015-06-21 06:38:20.000000000 +0000 +++ calligra-2.8.5+dfsg/debian/control 2016-06-12 22:17:41.000000000 +0000 @@ -27,7 +27,6 @@ libkactivities-dev (>= 4:4.10), libkdcraw-dev (>= 4:4.12), liblcms2-dev (>= 2.4), - libmarble-dev (>> 4:4.12), libmysqlclient-dev, libodfgen-dev (>= 0.1), libopencolorio-dev, @@ -59,7 +58,8 @@ pstoedit, shared-desktop-ontologies, shared-mime-info, - zlib1g-dev + zlib1g-dev, + libsoprano-dev Standards-Version: 3.9.5 XS-Testsuite: autopkgtest Homepage: http://www.calligra-suite.org/ @@ -273,23 +273,6 @@ . This package is part of the Calligra Suite. -Package: kexi-map-form-widget -Architecture: any -Section: database -Depends: kexi (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: kexi (<< 1:2.3.70) -Replaces: kexi (<< 1:2.3.70) -Description: map form widget for Kexi - Kexi is an integrated data management application. It can be used for - creating database schemas, inserting data, performing queries, and - processing data. Forms can be created to provide a custom interface to - your data. All database objects - tables, queries and forms - are stored - in the database, making it easy to share data and design. - . - This package provides a map widget for Kexi using the Marble library. - . - This package is part of the Calligra Suite. - Package: calligra-reports-web-element Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -303,20 +286,6 @@ . This package is part of the Calligra Suite. -Package: calligra-reports-map-element -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: map element for Calligra Reports - Calligra Suite is a set of applications written to help you to accomplish - your work. It includes office applications such as a word processor, - a spreadsheet, a presentation program, a database application, etc., and - raster and vector graphics tools. - . - This package provides a map element for Calligra Reports, based on the - Marble library. - . - This package is part of the Calligra Suite. - Package: krita Architecture: any Section: graphics @@ -573,7 +542,7 @@ Section: debug Architecture: any Priority: extra -Depends: calligra-libs (= ${binary:Version}), kde-runtime-dbg, ${misc:Depends} +Depends: calligra-libs (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for Calligra This package contains the debugging symbols associated with Calligra. They will automatically be used by gdb for debugging calligra-related diff -Nru calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install --- calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install 2014-08-12 13:42:38.000000000 +0000 +++ calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/kde4/kformdesigner_mapbrowser.so -usr/share/kde4/services/kformdesigner/kformdesigner_mapbrowser.desktop diff -Nru calligra-2.8.5+dfsg/debian/patches/gcc6.diff calligra-2.8.5+dfsg/debian/patches/gcc6.diff --- calligra-2.8.5+dfsg/debian/patches/gcc6.diff 1970-01-01 00:00:00.000000000 +0000 +++ calligra-2.8.5+dfsg/debian/patches/gcc6.diff 2016-08-16 11:27:36.000000000 +0000 @@ -0,0 +1,53 @@ +Description: gcc 6 related fixes + * Change mindistances from qreal to double to avoid narrowing conversion errror. + * Change field Transisition.c to signed char to avoid narrowing conversion error. + * Reorder includes in krita/plugins/filters/unsharp/kis_unsharp_filter.cpp to avoid type ambiguities. +Author: Peter Michael Green + +Index: calligra-2.8.5+dfsg/libs/flake/KoSnapStrategy.cpp +=================================================================== +--- calligra-2.8.5+dfsg.orig/libs/flake/KoSnapStrategy.cpp ++++ calligra-2.8.5+dfsg/libs/flake/KoSnapStrategy.cpp +@@ -180,7 +180,7 @@ bool ExtensionSnapStrategy::snap(const Q + Q_ASSERT(isfinite(maxSnapDistance)); + + const qreal maxDistance = maxSnapDistance * maxSnapDistance; +- qreal minDistances[2] = { HUGE_VAL, HUGE_VAL }; ++ double minDistances[2] = { HUGE_VAL, HUGE_VAL }; + + QPointF snappedPoints[2] = { mousePosition, mousePosition }; + QPointF startPoints[2]; +Index: calligra-2.8.5+dfsg/filters/karbon/eps/PsCommentLexer.cpp +=================================================================== +--- calligra-2.8.5+dfsg.orig/filters/karbon/eps/PsCommentLexer.cpp ++++ calligra-2.8.5+dfsg/filters/karbon/eps/PsCommentLexer.cpp +@@ -63,7 +63,7 @@ const char*statetoa(State state) + + typedef struct { + State oldState; +- char c; ++ signed char c; + State newState; + Action action; + } Transition; +Index: calligra-2.8.5+dfsg/krita/plugins/filters/unsharp/kis_unsharp_filter.cpp +=================================================================== +--- calligra-2.8.5+dfsg.orig/krita/plugins/filters/unsharp/kis_unsharp_filter.cpp ++++ calligra-2.8.5+dfsg/krita/plugins/filters/unsharp/kis_unsharp_filter.cpp +@@ -26,6 +26,8 @@ + #include + #include + ++#include "KoColorSpaceTraits.h" ++ + #include + #include + #include +@@ -40,7 +42,6 @@ + #include "kis_wdg_unsharp.h" + #include "ui_wdgunsharp.h" + #include +-#include "KoColorSpaceTraits.h" + + + KisUnsharpFilter::KisUnsharpFilter() : KisFilter(id(), categoryEnhance(), i18n("&Unsharp Mask...")) diff -Nru calligra-2.8.5+dfsg/debian/patches/series calligra-2.8.5+dfsg/debian/patches/series --- calligra-2.8.5+dfsg/debian/patches/series 2015-05-19 22:40:03.000000000 +0000 +++ calligra-2.8.5+dfsg/debian/patches/series 2016-08-16 11:27:36.000000000 +0000 @@ -13,3 +13,4 @@ channelFlags_logic_change do_not_install_removed_files libwps-0.4.diff +gcc6.diff