[neon/extras/calligra/Neon/release] debian: revert back to neon branch but update changelog version

Jonathan Esk-Riddell null at kde.org
Wed Sep 7 22:06:10 BST 2022


Git commit 8c82e4d1cac9eac3f52df9a642520b2d5899a9ff by Jonathan Esk-Riddell.
Committed on 07/09/2022 at 21:06.
Pushed by jriddell into branch 'Neon/release'.

revert back to neon branch but update changelog version

D  +0    -1    debian/.gitattributes
M  +41   -3    debian/README.source
A  +3    -0    debian/TODO.Debian
M  +200  -27   debian/calligra-data.install
D  +0    -6    debian/calligra-data.lintian-overrides
D  +0    -1    debian/calligra-gemini-data.install
D  +0    -25   debian/calligra-gemini-data.links
D  +0    -4    debian/calligra-gemini-data.lintian-overrides
M  +8    -4    debian/calligra-gemini.install
D  +0    -4    debian/calligra-gemini.lintian-overrides
M  +6    -3    debian/calligra-libs.install
M  +2    -0    debian/calligra-libs.install.amd64
M  +0    -3    debian/calligra-libs.lintian-overrides
A  +3    -0    debian/calligra-libs.manpages
D  +0    -14   debian/calligrasheets-data.install
D  +0    -1    debian/calligrasheets-data.lintian-overrides
M  +10   -1    debian/calligrasheets.install
M  +17   -3    debian/calligrasheets.lintian-overrides
A  +1    -0    debian/calligrasheets.manpages
M  +4    -5    debian/calligrastage-data.install
D  +0    -2    debian/calligrastage-data.lintian-overrides
M  +2    -0    debian/calligrastage.install
M  +0    -3    debian/calligrastage.lintian-overrides
A  +1    -0    debian/calligrastage.manpages
M  +0    -5    debian/calligrawords-data.install
M  +8    -1    debian/calligrawords.install
M  +0    -3    debian/calligrawords.lintian-overrides
A  +1    -0    debian/calligrawords.manpages
M  +9    -413  debian/changelog
A  +1    -0    debian/compat
M  +97   -104  debian/control
M  +1329 -16   debian/copyright
M  +2    -5    debian/karbon.install
M  +0    -3    debian/karbon.lintian-overrides
A  +1    -0    debian/karbon.manpages
A  +83   -0    debian/man/braindump.1
A  +45   -0    debian/man/braindump.rst
A  +94   -0    debian/man/calligra.1
A  +53   -0    debian/man/calligra.rst
A  +78   -0    debian/man/calligraactive.1
A  +48   -0    debian/man/calligraactive.rst
A  +81   -0    debian/man/calligraauthor.1
A  +52   -0    debian/man/calligraauthor.rst
A  +102  -0    debian/man/calligraconverter.1
A  +59   -0    debian/man/calligraconverter.rst
A  +87   -0    debian/man/calligraflow.1
A  +49   -0    debian/man/calligraflow.rst
A  +86   -0    debian/man/calligraplan.1
A  +48   -0    debian/man/calligraplan.rst
A  +85   -0    debian/man/calligraplanwork.1
A  +47   -0    debian/man/calligraplanwork.rst
A  +87   -0    debian/man/calligrasheets.1
A  +49   -0    debian/man/calligrasheets.rst
A  +89   -0    debian/man/calligrastage.1
A  +51   -0    debian/man/calligrastage.rst
A  +90   -0    debian/man/calligrawords.1
A  +53   -0    debian/man/calligrawords.rst
A  +90   -0    debian/man/karbon.1
A  +53   -0    debian/man/karbon.rst
A  +263  -0    debian/man/kexi.1
A  +166  -0    debian/man/kexi.rst
A  +47   -0    debian/man/kexi_sqlite3_dump.1
A  +34   -0    debian/man/kexi_sqlite3_dump.rst
A  +9    -0    debian/not-installed
M  +1    -2    debian/okular-backend-odp.install
D  +0    -6    debian/okular-backend-odp.lintian-overrides
M  +1    -5    debian/okular-backend-odt.install
D  +0    -6    debian/okular-backend-odt.lintian-overrides
M  +1    -10   debian/patches/series
D  +0    -22   debian/patches/upstream_Fix-compile-with-newer-versions-of-poppler.patch
D  +0    -443  debian/patches/upstream_Fix-some-more-warnings.patch
D  +0    -86   debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
D  +0    -73   debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler.patch
D  +0    -94   debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler_2.patch
D  +0    -290  debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
D  +0    -32   debian/patches/upstream_Remove-old-std-c-11-setting-for-Vc.patch
D  +0    -128  debian/patches/upstream_Small-CMake-modernization.patch
D  +0    -25   debian/patches/upstream_SvgOutputDev-Fix-ifdef-version-for-getFont-API-chang.patch
D  +0    -38   debian/patches/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch
M  +35   -18   debian/rules
M  +1    -5    debian/watch [INFRASTRUCTURE]

https://invent.kde.org/neon/extras/calligra/commit/8c82e4d1cac9eac3f52df9a642520b2d5899a9ff

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/README.source b/debian/README.source
index bca1d32..96c053d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -53,26 +53,51 @@ Then run sbuild to build it ::
 Man pages
 ==========
 
-If there is any demand, please ask upstream to provide them. Please do not add
-Debian-specific ones, as they will rot easily, and be only in English.
+Upstream doesn't provide any man page, but the Debian policy specify to have
+a man page for each binary. So I created very basic page in debian/man, but
+it can be improved...
+
+I prefer to use the restructuredText_ format (.rst files), which is much more
+readable. To actually creates the man pages::
+
+    rst2man calligraauthor.rst > calligraauthor.1
+
+.. _restructuredText: http://docutils.sourceforge.net/
 
 Particularities
 ================
 
 - Unit test files do not have a license [#]_;
+- The file ./kexi/kexidb/sqlitedump/shell.c has a funny license, but we should
+ assume it's the same license as SQLite3 [#]_
 
 .. [#] From upstream, may 2013:
  “At one point, I think we had the explicit policy that unittests weren't
  going to have a license header. I don't know why... That was back in the
  KOffice days.”
 
+.. [#] From upstream, may 2013:
+ “Regarding this please assume the same license as you use with SQLite3
+ since the code is based on a small tool from SQLite3. This is
+ basically public domain.”
+
 
 Embedded libs
 ==============
 
 Calligra forks some library to fit to their purpose.
 
+- kexi/migration/mdb [#]_
 - filters/words/msword-odf/wv2 [#]_
+- 3rdparty/kdgantt
+- 3rdparty/kdchart
+
+.. [#] From upstream may 2013:
+ “This is not just a copy but a fork of software that was not actively
+ developed for years (that might have changes in the meantime but).
+ Unless volunteers come and move the modifications upsteam (what can or
+ cannot be practical but I asked for that) we depend on this exact fork
+ and this is a bug-for-bug type of dependency.”
 
 .. [#] From upstream, may 2013:
  “The wv2 in Calligra is different from the one on sourceforge (which is
@@ -93,6 +118,18 @@ Required for the matlab/octave formula tool
 
 https://bitbucket.org/cyrille/cauchy
 
+Java MPXJ
+----------
+
+Required by Plan mpxj import filter
+
+http://mpxj.sourceforge.net/
+
+libqgit2
+---------
+
+Calligra Gemini may use libqgit2.
+
 Dealing with bugs
 ==================
 
@@ -101,7 +138,8 @@ TODO
 Useful links
 ==============
 
-https://salsa.debian.org/qt-kde-team/extras/calligra
+http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-std/calligra.git;a=summary
 http://packages.qa.debian.org/c/calligra.html
+http://packages.qa.debian.org/c/calligra-l10n.html
 
 .. vim:set filetype=rst:
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
new file mode 100644
index 0000000..881d71c
--- /dev/null
+++ b/debian/TODO.Debian
@@ -0,0 +1,3 @@
+ * add DEP-3 headers to patches.
+ * install "not installed to anywhere" files.
+ * double-check disabled patches in "debian/patches/series".
diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index a0c192c..12d4cd0 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -1,32 +1,205 @@
 etc/xdg/calligra_stencils.knsrc
 usr/share/applications/calligra.desktop
-usr/share/calligra/
-usr/share/calligra_shape_music/
+usr/share/calligra/autocorrect/autocorrect.xml
+usr/share/calligra/autocorrect/en_US.xml
+usr/share/calligra/calligra_shell.rc
+usr/share/calligra/cursors/cursor_connect.png
+usr/share/calligra/cursors/cursor_rotate.png
+usr/share/calligra/cursors/cursor_shear.png
+usr/share/calligra/cursors/zoom_in_cursor.png
+usr/share/calligra/cursors/zoom_out_cursor.png
+usr/share/calligra/icons/hicolor/16x16/actions/abs.png
+usr/share/calligra/icons/hicolor/16x16/actions/animation-stage.png
+usr/share/calligra/icons/hicolor/16x16/actions/bevelled.png
+usr/share/calligra/icons/hicolor/16x16/actions/borderpainter.png
+usr/share/calligra/icons/hicolor/16x16/actions/brackets.png
+usr/share/calligra/icons/hicolor/16x16/actions/curve-connector.png
+usr/share/calligra/icons/hicolor/16x16/actions/enclosed.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-all.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-down.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-horizontal.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-left.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-right.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-up.png
+usr/share/calligra/icons/hicolor/16x16/actions/escape-direction-vertical.png
+usr/share/calligra/icons/hicolor/16x16/actions/frac.png
+usr/share/calligra/icons/hicolor/16x16/actions/gsub.png
+usr/share/calligra/icons/hicolor/16x16/actions/gsubup.png
+usr/share/calligra/icons/hicolor/16x16/actions/gsup.png
+usr/share/calligra/icons/hicolor/16x16/actions/insert-page-break.png
+usr/share/calligra/icons/hicolor/16x16/actions/int.png
+usr/share/calligra/icons/hicolor/16x16/actions/lines-connector.png
+usr/share/calligra/icons/hicolor/16x16/actions/lsub.png
+usr/share/calligra/icons/hicolor/16x16/actions/lsup.png
+usr/share/calligra/icons/hicolor/16x16/actions/matrix.png
+usr/share/calligra/icons/hicolor/16x16/actions/multiline.png
+usr/share/calligra/icons/hicolor/16x16/actions/onetwomatrix.png
+usr/share/calligra/icons/hicolor/16x16/actions/over.png
+usr/share/calligra/icons/hicolor/16x16/actions/paren.png
+usr/share/calligra/icons/hicolor/16x16/actions/root.png
+usr/share/calligra/icons/hicolor/16x16/actions/rsub.png
+usr/share/calligra/icons/hicolor/16x16/actions/rsubup.png
+usr/share/calligra/icons/hicolor/16x16/actions/rsup.png
+usr/share/calligra/icons/hicolor/16x16/actions/snap-bounding-box.png
+usr/share/calligra/icons/hicolor/16x16/actions/snap-extension.png
+usr/share/calligra/icons/hicolor/16x16/actions/sqrt.png
+usr/share/calligra/icons/hicolor/16x16/actions/standard-connector.png
+usr/share/calligra/icons/hicolor/16x16/actions/straight-connector.png
+usr/share/calligra/icons/hicolor/16x16/actions/table.png
+usr/share/calligra/icons/hicolor/16x16/actions/under.png
+usr/share/calligra/icons/hicolor/16x16/actions/vector.png
+usr/share/calligra/icons/hicolor/22x22/actions/abs.png
+usr/share/calligra/icons/hicolor/22x22/actions/artistictext-tool.png
+usr/share/calligra/icons/hicolor/22x22/actions/backgroundtool.png
+usr/share/calligra/icons/hicolor/22x22/actions/bevelled.png
+usr/share/calligra/icons/hicolor/22x22/actions/brackets.png
+usr/share/calligra/icons/hicolor/22x22/actions/calligraphy.png
+usr/share/calligra/icons/hicolor/22x22/actions/callout-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/circular-arrow-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/createpath.png
+usr/share/calligra/icons/hicolor/22x22/actions/cross-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/editpath.png
+usr/share/calligra/icons/hicolor/22x22/actions/edittext.png
+usr/share/calligra/icons/hicolor/22x22/actions/ellipse-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/enclosed.png
+usr/share/calligra/icons/hicolor/22x22/actions/flower-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-break-node.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-connect-node.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-convert-to-path.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-disconnect-node.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-insert-node.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-join-node.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-node-curve.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-node-line.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-remove-node.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-segment-curve.png
+usr/share/calligra/icons/hicolor/22x22/actions/format-segment-line.png
+usr/share/calligra/icons/hicolor/22x22/actions/frac.png
+usr/share/calligra/icons/hicolor/22x22/actions/gearhead-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/gradient.png
+usr/share/calligra/icons/hicolor/22x22/actions/gsub.png
+usr/share/calligra/icons/hicolor/22x22/actions/gsubup.png
+usr/share/calligra/icons/hicolor/22x22/actions/gsup.png
+usr/share/calligra/icons/hicolor/22x22/actions/hand.png
+usr/share/calligra/icons/hicolor/22x22/actions/hexagon-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/inscol.png
+usr/share/calligra/icons/hicolor/22x22/actions/insrow.png
+usr/share/calligra/icons/hicolor/22x22/actions/int.png
+usr/share/calligra/icons/hicolor/22x22/actions/lsub.png
+usr/share/calligra/icons/hicolor/22x22/actions/lsup.png
+usr/share/calligra/icons/hicolor/22x22/actions/matrix.png
+usr/share/calligra/icons/hicolor/22x22/actions/multiline.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-cross.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-dottednote.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-doublecross.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-doubleflat.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-flat.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-natural.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-128th.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-16th.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-32nd.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-64th.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-breve.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-eighth.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-half.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-quarter.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-note-whole.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-128th.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-16th.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-32nd.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-64th.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-breve.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-eighth.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-half.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-quarter.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-rest-whole.png
+usr/share/calligra/icons/hicolor/22x22/actions/music-tiednote.png
+usr/share/calligra/icons/hicolor/22x22/actions/node-type-cusp.png
+usr/share/calligra/icons/hicolor/22x22/actions/node-type-smooth.png
+usr/share/calligra/icons/hicolor/22x22/actions/node-type-symmetric.png
+usr/share/calligra/icons/hicolor/22x22/actions/onetwomatrix.png
+usr/share/calligra/icons/hicolor/22x22/actions/over.png
+usr/share/calligra/icons/hicolor/22x22/actions/paren.png
+usr/share/calligra/icons/hicolor/22x22/actions/pathshape.png
+usr/share/calligra/icons/hicolor/22x22/actions/pattern.png
+usr/share/calligra/icons/hicolor/22x22/actions/pentagon-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/rectangle-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/remcol.png
+usr/share/calligra/icons/hicolor/22x22/actions/remrow.png
+usr/share/calligra/icons/hicolor/22x22/actions/root.png
+usr/share/calligra/icons/hicolor/22x22/actions/rsub.png
+usr/share/calligra/icons/hicolor/22x22/actions/rsubup.png
+usr/share/calligra/icons/hicolor/22x22/actions/rsup.png
+usr/share/calligra/icons/hicolor/22x22/actions/select.png
+usr/share/calligra/icons/hicolor/22x22/actions/smiley-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/spiral-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/sqrt.png
+usr/share/calligra/icons/hicolor/22x22/actions/star-shape.png
+usr/share/calligra/icons/hicolor/22x22/actions/table.png
+usr/share/calligra/icons/hicolor/22x22/actions/text-put-on-path.png
+usr/share/calligra/icons/hicolor/22x22/actions/text-remove-from-path.png
+usr/share/calligra/icons/hicolor/22x22/actions/tool-text.png
+usr/share/calligra/icons/hicolor/22x22/actions/tool_references.png
+usr/share/calligra/icons/hicolor/22x22/actions/tool_review.png
+usr/share/calligra/icons/hicolor/22x22/actions/under.png
+usr/share/calligra/icons/hicolor/22x22/actions/vector.png
+usr/share/calligra/icons/hicolor/22x22/actions/zoom-pixels.png
+usr/share/calligra/icons/hicolor/24x24/actions/insert-page-break.png
+usr/share/calligra/icons/hicolor/32x32/actions/abs.png
+usr/share/calligra/icons/hicolor/32x32/actions/bevelled.png
+usr/share/calligra/icons/hicolor/32x32/actions/brackets.png
+usr/share/calligra/icons/hicolor/32x32/actions/enclosed.png
+usr/share/calligra/icons/hicolor/32x32/actions/frac.png
+usr/share/calligra/icons/hicolor/32x32/actions/gsub.png
+usr/share/calligra/icons/hicolor/32x32/actions/gsubup.png
+usr/share/calligra/icons/hicolor/32x32/actions/gsup.png
+usr/share/calligra/icons/hicolor/32x32/actions/insert-endnote.png
+usr/share/calligra/icons/hicolor/32x32/actions/insert-endnote.png
+usr/share/calligra/icons/hicolor/32x32/actions/insert-footnote.png
+usr/share/calligra/icons/hicolor/32x32/actions/insert-footnote.png
+usr/share/calligra/icons/hicolor/32x32/actions/insert-page-break.png
+usr/share/calligra/icons/hicolor/32x32/actions/insert-table-of-contents.png
+usr/share/calligra/icons/hicolor/32x32/actions/int.png
+usr/share/calligra/icons/hicolor/32x32/actions/lsub.png
+usr/share/calligra/icons/hicolor/32x32/actions/lsup.png
+usr/share/calligra/icons/hicolor/32x32/actions/matrix.png
+usr/share/calligra/icons/hicolor/32x32/actions/multiline.png
+usr/share/calligra/icons/hicolor/32x32/actions/onetwomatrix.png
+usr/share/calligra/icons/hicolor/32x32/actions/over.png
+usr/share/calligra/icons/hicolor/32x32/actions/paren.png
+usr/share/calligra/icons/hicolor/32x32/actions/root.png
+usr/share/calligra/icons/hicolor/32x32/actions/rsub.png
+usr/share/calligra/icons/hicolor/32x32/actions/rsubup.png
+usr/share/calligra/icons/hicolor/32x32/actions/rsup.png
+usr/share/calligra/icons/hicolor/32x32/actions/shape-choose.png
+usr/share/calligra/icons/hicolor/32x32/actions/sqrt.png
+usr/share/calligra/icons/hicolor/32x32/actions/table.png
+usr/share/calligra/icons/hicolor/32x32/actions/tool_imageeffects.png
+usr/share/calligra/icons/hicolor/32x32/actions/under.png
+usr/share/calligra/icons/hicolor/32x32/actions/vector.png
+usr/share/calligra/icons/hicolor/32x32/mimetypes/x-shape-connection.png
+usr/share/calligra/icons/hicolor/32x32/mimetypes/x-shape-formula.png
+usr/share/calligra/icons/hicolor/32x32/mimetypes/x-shape-image.png
+usr/share/calligra/icons/hicolor/32x32/mimetypes/x-shape-text.png
+usr/share/calligra/icons/hicolor/48x48/actions/table.png
+usr/share/calligra/icons/hicolor/scalable/actions/artistictext-tool.svg
+usr/share/calligra/icons/hicolor/scalable/actions/snap-bounding-box.svg
+usr/share/calligra/icons/hicolor/scalable/actions/snap-extension.svg
+usr/share/calligra/icons/hicolor/scalable/actions/table.svgz
+usr/share/calligra/icons/hicolor/scalable/actions/text-put-on-path.svg
+usr/share/calligra/icons/hicolor/scalable/actions/text-remove-from-path.svg
+usr/share/calligra/palettes/
+usr/share/calligra/pics/
+usr/share/calligra/pics/questionmark.png
+usr/share/calligra/stencils/
+usr/share/calligra/styles/markers.xml
+usr/share/calligra/thesaurus/thesaurus.txt
+usr/share/calligra_shape_music/fonts/Emmentaler-14.ttf
+usr/share/color/icc/calligra/
 usr/share/doc/HTML/*/calligra/
-usr/share/icons/hicolor/scalable/actions/
-usr/share/kservices5/calligradocinfopropspage.desktop
-usr/share/locale/*/LC_MESSAGES/calligra-defaulttools.mo
-usr/share/locale/*/LC_MESSAGES/calligra-dockers.mo
-usr/share/locale/*/LC_MESSAGES/calligra-opener.mo
-usr/share/locale/*/LC_MESSAGES/calligra.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_artistictext.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_chart.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_formula.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_music.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_paths.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_picture.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_plugin.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_text.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_threed.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_vector.mo
-usr/share/locale/*/LC_MESSAGES/calligra_shape_video.mo
-usr/share/locale/*/LC_MESSAGES/calligra_textediting_autocorrect.mo
-usr/share/locale/*/LC_MESSAGES/calligra_textediting_changecase.mo
-usr/share/locale/*/LC_MESSAGES/calligra_textediting_spellcheck.mo
-usr/share/locale/*/LC_MESSAGES/calligra_textediting_thesaurus.mo
-usr/share/locale/*/LC_MESSAGES/calligra_textinlineobject_variables.mo
-usr/share/locale/*/LC_MESSAGES/calligrafilters.mo
-usr/share/locale/*/LC_MESSAGES/kocolorspaces.mo
-usr/share/locale/*/LC_MESSAGES/koconverter.mo
+usr/share/icons/hicolor/scalable/actions/office-chart-stock-candlestick.svg
+usr/share/icons/hicolor/scalable/actions/office-chart-stock-hlc.svg
+usr/share/icons/hicolor/scalable/actions/office-chart-stock-ohlc.svg
+usr/share/locale/*/LC_MESSAGES/
 usr/share/mime/packages/calligra_svm.xml
 usr/share/mime/packages/wiki-format.xml
diff --git a/debian/calligra-data.lintian-overrides b/debian/calligra-data.lintian-overrides
deleted file mode 100644
index 8678955..0000000
--- a/debian/calligra-data.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# private font
-font-in-non-font-package
-# private font
-calligra-data: font-outside-font-dir
-# data file, and not documentation
-calligra-data: package-contains-documentation-outside-usr-share-doc [usr/share/calligra/thesaurus/thesaurus.txt]
diff --git a/debian/calligra-gemini-data.install b/debian/calligra-gemini-data.install
deleted file mode 100644
index bfb5a0b..0000000
--- a/debian/calligra-gemini-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/calligragemini/
diff --git a/debian/calligra-gemini-data.links b/debian/calligra-gemini-data.links
deleted file mode 100644
index 4cdaed1..0000000
--- a/debian/calligra-gemini-data.links
+++ /dev/null
@@ -1,25 +0,0 @@
-## texlive-fonts-extra:
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Black.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-Black.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-BlackIt.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-BlackIt.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Bold.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-Bold.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-BoldIt.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-BoldIt.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-ExtraLight.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-ExtraLight.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-ExtraLightIt.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-ExtraLightIt.otf
-#/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-It.otf
-#        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-It.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Light.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-Light.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-LightIt.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-LightIt.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Regular.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-Regular.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Semibold.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-Semibold.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-SemiboldIt.otf
-        /usr/share/calligragemini/themes/default/fonts/SourceSansPro-SemiboldIt.otf
diff --git a/debian/calligra-gemini-data.lintian-overrides b/debian/calligra-gemini-data.lintian-overrides
deleted file mode 100644
index 0baaa2c..0000000
--- a/debian/calligra-gemini-data.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# private fonts
-calligra-gemini-data: font-in-non-font-package
-# private fonts
-calligra-gemini-data: font-outside-font-dir
diff --git a/debian/calligra-gemini.install b/debian/calligra-gemini.install
index 6e7d209..34c6fd2 100644
--- a/debian/calligra-gemini.install
+++ b/debian/calligra-gemini.install
@@ -1,9 +1,13 @@
 usr/bin/calligragemini
 usr/bin/calligrageminithumbnailhelper
-usr/lib/*/libgemini.so.1*
-usr/lib/*/qt5/qml/Calligra/Gemini/
-usr/lib/*/qt5/qml/org/kde/calligra/
+usr/lib/*/libgemini.so.17
+usr/lib/*/libgemini.so.17*
+usr/lib/*/qt5/qml/Calligra/Gemini/Dropbox/libcalligrageminidropboxplugin.so
+usr/lib/*/qt5/qml/Calligra/Gemini/Dropbox/qmldir
+usr/lib/*/qt5/qml/Calligra/Gemini/Git/libcalligrageminigitplugin.so
+usr/lib/*/qt5/qml/Calligra/Gemini/Git/qmldir
 usr/share/applications/org.kde.calligragemini.desktop
+usr/share/calligragemini/
 usr/share/icons/hicolor/*/apps/calligragemini.png
-usr/share/icons/hicolor/scalable/apps/calligragemini.svg
+usr/share/icons/hicolor/*/apps/calligragemini.svg
 usr/share/metainfo/org.kde.calligragemini.appdata.xml
diff --git a/debian/calligra-gemini.lintian-overrides b/debian/calligra-gemini.lintian-overrides
deleted file mode 100644
index bf7232e..0000000
--- a/debian/calligra-gemini.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# private libraries
-calligra-gemini: package-name-doesnt-match-sonames
-# private library
-calligra-gemini: no-symbols-control-file
diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index 7ebcf82..0683ac1 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -1,9 +1,11 @@
 usr/bin/calligra
 usr/bin/calligraconverter
+usr/bin/cstester
+usr/bin/cstrunner
 usr/lib/*/libbasicflakes.so.1*
 usr/lib/*/libflake.so.1*
 usr/lib/*/libkoformula.so.1*
-usr/lib/*/libkokross.so.1*
+usr/lib/*/libkoformula.so.1*
 usr/lib/*/libkomain.so.1*
 usr/lib/*/libkomsooxml.so.1*
 usr/lib/*/libkoodf.so.1*
@@ -12,10 +14,10 @@ usr/lib/*/libkoodfreader.so.1*
 usr/lib/*/libkopageapp.so.1*
 usr/lib/*/libkoplugin.so.1*
 usr/lib/*/libkostore.so.1*
+usr/lib/*/libkostore.so.1*
 usr/lib/*/libkotext.so.1*
 usr/lib/*/libkotextlayout.so.1*
 usr/lib/*/libkovectorimage.so.1*
-usr/lib/*/libkoversion.so.1*
 usr/lib/*/libkowidgets.so.1*
 usr/lib/*/libkowidgetutils.so.1*
 usr/lib/*/libkundo2.so.1*
@@ -33,7 +35,6 @@ usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_paths.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_picture.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_plugin.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_text.so
-usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_threed.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_vector.so
 usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_video.so
 usr/lib/*/qt5/plugins/calligra/textediting/calligra_textediting_autocorrect.so
@@ -46,3 +47,5 @@ usr/lib/*/qt5/plugins/calligra/tools/calligra_tool_defaults.so
 usr/lib/*/qt5/plugins/calligradocinfopropspage.so
 usr/lib/*/qt5/plugins/calligraimagethumbnail.so
 usr/lib/*/qt5/plugins/calligrathumbnail.so
+usr/lib/*/qt5/qml/org/kde/calligra/libCalligraComponentsPlugin.so
+usr/lib/*/qt5/qml/org/kde/calligra/qmldir
diff --git a/debian/calligra-libs.install.amd64 b/debian/calligra-libs.install.amd64
index 3cc5c27..4ad5749 100644
--- a/debian/calligra-libs.install.amd64
+++ b/debian/calligra-libs.install.amd64
@@ -1,5 +1,7 @@
 usr/bin/calligra
 usr/bin/calligraconverter
+usr/bin/cstester
+usr/bin/cstrunner
 usr/lib/*/libbasicflakes.so.1*
 usr/lib/*/libflake.so.1*
 usr/lib/*/libkoformula.so.1*
diff --git a/debian/calligra-libs.lintian-overrides b/debian/calligra-libs.lintian-overrides
index 15a3c4b..0293554 100644
--- a/debian/calligra-libs.lintian-overrides
+++ b/debian/calligra-libs.lintian-overrides
@@ -1,5 +1,2 @@
-# "calligra-private" library, other packages have a strict dependency on this
 no-symbols-control-file *
 package-name-doesnt-match-sonames *
-# small helper library that uses only Qt
-calligra-libs: library-not-linked-against-libc [usr/lib/*/libkoversion.so.*]
diff --git a/debian/calligra-libs.manpages b/debian/calligra-libs.manpages
new file mode 100644
index 0000000..c1b3d4d
--- /dev/null
+++ b/debian/calligra-libs.manpages
@@ -0,0 +1,3 @@
+debian/man/calligra.1
+debian/man/calligraconverter.1
+debian/man/kexi_sqlite3_dump.1
diff --git a/debian/calligrasheets-data.install b/debian/calligrasheets-data.install
deleted file mode 100644
index 4f6f7f3..0000000
--- a/debian/calligrasheets-data.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/share/calligrasheets/
-usr/share/config.kcfg/calligrasheets.kcfg
-usr/share/doc/HTML/*/calligrasheets/
-usr/share/icons/hicolor/*/apps/calligrasheets.png
-usr/share/icons/hicolor/scalable/apps/calligrasheets.svgz
-usr/share/kxmlgui5/calligrasheets/calligrasheets.rc
-usr/share/kxmlgui5/calligrasheets/calligrasheets_readonly.rc
-usr/share/locale/*/LC_MESSAGES/calligra_shape_spreadsheet.mo
-usr/share/locale/*/LC_MESSAGES/calligrasheets.mo
-usr/share/locale/*/LC_MESSAGES/calligrasheets_calendar.mo
-usr/share/locale/*/LC_MESSAGES/calligrasheets_solver.mo
-usr/share/locale/*/LC_MESSAGES/krossmodulesheets.mo
-usr/share/templates/.source/SpreadSheet.ods
-usr/share/templates/SpreadSheet.desktop
diff --git a/debian/calligrasheets-data.lintian-overrides b/debian/calligrasheets-data.lintian-overrides
deleted file mode 100644
index 08eb498..0000000
--- a/debian/calligrasheets-data.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-calligrasheets-data: unusual-interpreter kross [usr/share/calligrasheets/scripts/docker/*.py]
diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index 055ab6a..828f4d6 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -18,7 +18,6 @@ usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_sheets2opencalc.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_xls2ods.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_xlsx2ods.so
 usr/lib/*/qt5/plugins/calligra/parts/calligrasheetspart.so
-usr/lib/*/qt5/plugins/calligrasheets/extensions/krossmodulesheets.so
 usr/lib/*/qt5/plugins/calligrasheets/extensions/sheetssolver.so
 usr/lib/*/qt5/plugins/calligrasheets/functions/kspreadbitopsmodule.so
 usr/lib/*/qt5/plugins/calligrasheets/functions/kspreadconversionmodule.so
@@ -34,8 +33,18 @@ usr/lib/*/qt5/plugins/calligrasheets/functions/kspreadstatisticalmodule.so
 usr/lib/*/qt5/plugins/calligrasheets/functions/kspreadtextmodule.so
 usr/lib/*/qt5/plugins/calligrasheets/functions/kspreadtrigonometrymodule.so
 usr/share/applications/org.kde.calligrasheets.desktop
+usr/share/calligrasheets/
+usr/share/config.kcfg/calligrasheets.kcfg
+usr/share/doc/HTML/*/calligrasheets/
+usr/share/doc/HTML/*/sheets/
+usr/share/icons/hicolor/*/apps/calligrasheets.png
+usr/share/icons/hicolor/scalable/apps/calligrasheets.svgz
 usr/share/kservices5/ServiceMenus/calligra/sheets_print.desktop
 usr/share/kservices5/sheets_excel_thumbnail.desktop
 usr/share/kservices5/sheets_ods_thumbnail.desktop
 usr/share/kservices5/sheets_xlsx_thumbnail.desktop
+usr/share/kxmlgui5/calligrasheets/calligrasheets.rc
+usr/share/kxmlgui5/calligrasheets/calligrasheets_readonly.rc
 usr/share/metainfo/org.kde.calligrasheets.appdata.xml
+usr/share/templates/.source/SpreadSheet.ods
+usr/share/templates/SpreadSheet.desktop
diff --git a/debian/calligrasheets.lintian-overrides b/debian/calligrasheets.lintian-overrides
index 915bf2b..dc39273 100644
--- a/debian/calligrasheets.lintian-overrides
+++ b/debian/calligrasheets.lintian-overrides
@@ -1,5 +1,19 @@
-# private library
 no-symbols-control-file *
-# private library
 package-name-doesnt-match-sonames *
-shared-library-lacks-version usr/lib/*/libkdeinit5_calligrasheets.so libkdeinit5_calligrasheets.so
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/docker/consoledocker.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/csvexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/csvimport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/htmlexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/kexidbexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/kexidbimport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/logger.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/myorca.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/odfpyexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/vcardimport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/extensions/xmlviewer.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/functions/functions.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/functions/pyregexp.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/functions/pytime.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/functions/rpyfunctions.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/functions/yfinance.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/sheets/scripts/functions/yweather.py #!kross
diff --git a/debian/calligrasheets.manpages b/debian/calligrasheets.manpages
new file mode 100644
index 0000000..04ca22e
--- /dev/null
+++ b/debian/calligrasheets.manpages
@@ -0,0 +1 @@
+debian/man/calligrasheets.1
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index 0ea1e1f..e605292 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -1,16 +1,15 @@
-etc/xdg/calligrastagerc
 usr/share/calligrastage
-usr/share/doc/HTML/*/calligrastage/
+usr/share/doc/HTML/*/calligrastage
+usr/share/doc/HTML/*/stage/
+usr/share/doc/HTML/*/stage/
 usr/share/icons/hicolor/*/apps/calligrastage.png
 usr/share/icons/hicolor/scalable/apps/calligrastage.svgz
 usr/share/kservices5/ServiceMenus/calligra/stage_print.desktop
 usr/share/kservices5/stage_key_thumbnail.desktop
+usr/share/kservices5/stage_key_thumbnail.desktop
 usr/share/kservices5/stage_kpr_thumbnail.desktop
 usr/share/kservices5/stage_odp_thumbnail.desktop
 usr/share/kservices5/stage_powerpoint_thumbnail.desktop
 usr/share/kservices5/stage_pptx_thumbnail.desktop
-usr/share/kxmlgui5/calligrastage/calligrastage.rc
-usr/share/kxmlgui5/calligrastage/calligrastage_readonly.rc
-usr/share/locale/*/LC_MESSAGES/calligrastage.mo
 usr/share/templates/.source/Presentation.odp
 usr/share/templates/Presentation.desktop
diff --git a/debian/calligrastage-data.lintian-overrides b/debian/calligrastage-data.lintian-overrides
deleted file mode 100644
index 3758987..0000000
--- a/debian/calligrastage-data.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# shipped like this by upstream
-calligrastage-data: repeated-path-segment templates [usr/share/calligrastage/templates/exportHTML/templates/]
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index f2ef845..ca0d52c 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -21,4 +21,6 @@ usr/lib/*/qt5/plugins/calligrastage/pageeffects/kpr_pageeffect_swapeffect.so
 usr/lib/*/qt5/plugins/calligrastage/shapeanimations/kpr_shapeanimation_example.so
 usr/lib/*/qt5/plugins/calligrastage/tools/calligrastagetoolanimation.so
 usr/share/applications/org.kde.calligrastage.desktop
+usr/share/kxmlgui5/calligrastage/calligrastage.rc
+usr/share/kxmlgui5/calligrastage/calligrastage_readonly.rc
 usr/share/metainfo/org.kde.calligrastage.appdata.xml
diff --git a/debian/calligrastage.lintian-overrides b/debian/calligrastage.lintian-overrides
index f05e6f3..0293554 100644
--- a/debian/calligrastage.lintian-overrides
+++ b/debian/calligrastage.lintian-overrides
@@ -1,5 +1,2 @@
-# private library
 no-symbols-control-file *
-# private library
 package-name-doesnt-match-sonames *
-shared-library-lacks-version usr/lib/*/libkdeinit5_calligrastage.so libkdeinit5_calligrastage.so
diff --git a/debian/calligrastage.manpages b/debian/calligrastage.manpages
new file mode 100644
index 0000000..bc944a7
--- /dev/null
+++ b/debian/calligrastage.manpages
@@ -0,0 +1 @@
+debian/man/calligrastage.1
diff --git a/debian/calligrawords-data.install b/debian/calligrawords-data.install
index 43a9cf0..eeb50a3 100644
--- a/debian/calligrawords-data.install
+++ b/debian/calligrawords-data.install
@@ -1,10 +1,5 @@
-etc/xdg/calligrawordsrc
 usr/share/calligrawords
 usr/share/icons/hicolor/*/apps/calligrawords.png
 usr/share/icons/hicolor/scalable/apps/calligrawords.svgz
-usr/share/kxmlgui5/calligrawords/calligrawords.rc
-usr/share/kxmlgui5/calligrawords/calligrawords_readonly.rc
-usr/share/locale/*/LC_MESSAGES/calligrawords.mo
-usr/share/locale/*/LC_MESSAGES/krossmodulewords.mo
 usr/share/templates/.source/TextDocument.odt
 usr/share/templates/TextDocument.desktop
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index 610f54a..f69655b 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -2,9 +2,12 @@ etc/xdg/calligrawordsrc
 usr/bin/calligrawords
 usr/lib/*/libRtfReader.so.1*
 usr/lib/*/libkdeinit5_calligrawords.so
-usr/lib/*/libkowv2.so.*
+usr/lib/*/libkoversion.so.1*
+usr/lib/*/libkowv2.so.9
+usr/lib/*/libkowv2.so.9.0.0
 usr/lib/*/libwordsprivate.so.1*
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_applixword2odt.so
+usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_applixword2odt.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_ascii2words.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_doc2odt.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_docx2odt.so
@@ -16,14 +19,18 @@ usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_odt2mobi.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_odt2wiki.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_rtf2odt.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wpd2odt.so
+usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wpg2odg.so
 usr/lib/*/qt5/plugins/calligra/parts/calligrawordspart.so
 usr/share/applications/org.kde.calligrawords.desktop
 usr/share/applications/org.kde.calligrawords_ascii.desktop
 usr/share/kservices5/ServiceMenus/calligra/words_print.desktop
+usr/share/kservices5/calligradocinfopropspage.desktop
 usr/share/kservices5/words_docx_thumbnail.desktop
 usr/share/kservices5/words_msword_thumbnail.desktop
 usr/share/kservices5/words_odt_thumbnail.desktop
 usr/share/kservices5/words_rtf_thumbnail.desktop
 usr/share/kservices5/words_wpd_thumbnail.desktop
 usr/share/kservices5/words_wps_thumbnail.desktop
+usr/share/kxmlgui5/calligrawords/calligrawords.rc
+usr/share/kxmlgui5/calligrawords/calligrawords_readonly.rc
 usr/share/metainfo/org.kde.calligrawords.appdata.xml
diff --git a/debian/calligrawords.lintian-overrides b/debian/calligrawords.lintian-overrides
index e150e97..0293554 100644
--- a/debian/calligrawords.lintian-overrides
+++ b/debian/calligrawords.lintian-overrides
@@ -1,5 +1,2 @@
-# private library
 no-symbols-control-file *
-# private library
 package-name-doesnt-match-sonames *
-shared-library-lacks-version usr/lib/*/libkdeinit5_calligrawords.so libkdeinit5_calligrawords.so
diff --git a/debian/calligrawords.manpages b/debian/calligrawords.manpages
new file mode 100644
index 0000000..588a0e5
--- /dev/null
+++ b/debian/calligrawords.manpages
@@ -0,0 +1 @@
+debian/man/calligrawords.1
diff --git a/debian/changelog b/debian/changelog
index f8f7a12..c3a3035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,424 +1,20 @@
-calligra (1:3.2.1+dfsg-6) unstable; urgency=medium
-
-  * Bump Standards-Version to 4.6.1, no changes required.
-  * Remove inactive Uploaders, adding myself as one to avoid leaving the source
-    with no human maintainers.
-  * Backport upstream commit 2bbbeb09f9d50f1952fd7f4020ca77a0c932d23b,
-    upstream commit 236bacbe13739414e919de868283b0caf2df5d8a,
-    upstream commit 6b75bec784c9835c78993349845d8c2ef22ec3de, and
-    upstream commit 59eb4d2235b88408accf452421526b6f281cbab0 to fix the build
-    with newer versions of Poppler; patches
-    upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch,
-    upstream_PdfImport-Fix-compile-with-newer-poppler.patch,
-    upstream_PdfImport-Fix-compile-with-newer-poppler_2.patch, and
-    upstream_SvgOutputDev-Fix-ifdef-version-for-getFont-API-chang.patch
-    (Closes: #1012846)
-    - bump the required version of Poppler to 0.83.0 accordingly
-    - add the libpoppler-qt5-dev build dependency
-  * Update lintian overrides.
-
- -- Pino Toscano <pino at debian.org>  Wed, 06 Jul 2022 19:14:47 +0200
-
-calligra (1:3.2.1+dfsg-5) unstable; urgency=medium
+calligra (1:3.2.1+dfsg-5neon) xenial; urgency=medium
 
-  * Team upload.
-  * Backport upstream commit 068cd9aec11052733e393976142516d2190e4564,
-    upstream commit 2ac46db52c6ad401f67ae5b5fcd859a5872f0311,
-    part of upstream commit 62f510702ef9c34ac50f8d8601a4290ab558464c,
-    upstream commit 19584bed9588860047e3bd04e3fd2cf7e36adc3a, and
-    upstream commit 2f220c6d1418ce7fa509e0dc598a67e66908cbd3 to fix the build
-    with newer versions of ECM, C++, and Poppler; patches
-    upstream_Fix-some-more-warnings.patch,
-    upstream_Small-CMake-modernization.patch,
-    upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch,
-    upstream_Remove-old-std-c-11-setting-for-Vc.patch, and
-    upstream_Fix-compile-with-newer-versions-of-poppler.patch.
-    (Closes: #1007891)
-  * Append -Wno-deprecated -Wno-deprecated-declarations to the CXXFLAGS,
-    as there are lots of deprecation warnings that make build logs bigger.
-  * Update watch file to v4, no changes required.
-  * Remove the commented calligraplan, kexi, and krita dependencies from the
-    calligra metapackage, as they are no more part of Calligra now.
-  * Update lintian overrides.
+  * New release
 
- -- Pino Toscano <pino at debian.org>  Sun, 20 Mar 2022 11:47:04 +0100
+ -- Neon CI <neon at kde.org>  Fri, 02 Feb 2018 14:28:24 +0000
 
-calligra (1:3.2.1+dfsg-4) unstable; urgency=medium
+calligra (1:3.0.1-0neon) xenial; urgency=medium
 
-  * Team upload.
-  * Remove the localized documentations of calligrasheets, and calligrastage:
-    because of the dfsg repack, the build directory has a "+" in it, and the
-    kdoctools_install() CMake macro of kdoctools cannot handle paths with it.
-
- -- Pino Toscano <pino at debian.org>  Sun, 26 Sep 2021 10:27:37 +0200
-
-calligra (1:3.2.1+dfsg-3) unstable; urgency=medium
-
-  * Team upload.
-  * Drop the transitional packages calligra-reports-web-element, and all the
-    calligra-l10n-*, no more needed after two Debian stable releases
-    (Closes: #987452)
-    - drop also the associated l10n breaks/replaces
-    - drop the lintian source override for them
-  * Remove the explicit as-needed linking, as it is done by binutils now.
-  * Use execute_after_dh_auto_install to avoid invoking dh_auto_install
-    manually.
-  * Backport upstream commit c7636fb343c848000300a9429410b74d17a4d54d to fix
-    build with newer CMake; patch
-    upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
-    - bump the cmake build dependency to 3.16 accordingly
-  * Bump Standards-Version to 4.6.0, no changes required.
-  * Update install files.
-  * Clean the color profiles (/usr/share/color/) from debian/tmp: they were
-    already not shipped, and this simply make it clearer.
-  * Bump the debhelper compatibility to 13:
-    - switch the debhelper-compat build dependency to 13
-  * Drop the breaks/replaces for versions older than Debian Buster.
-  * Update lintian overrides.
-
- -- Pino Toscano <pino at debian.org>  Sun, 26 Sep 2021 09:23:42 +0200
-
-calligra (1:3.2.1+dfsg-2) unstable; urgency=medium
-
-  * Team upload.
-  * Explicitly add the qtdeclarative5-dev build dependency, as it was pulled
-    by another package before. (Closes: #963421)
-  * Stop exporting QT_SELECT=5 in rules, no more needed.
-
- -- Pino Toscano <pino at debian.org>  Sat, 04 Jul 2020 11:24:41 +0200
-
-calligra (1:3.2.1+dfsg-1) unstable; urgency=medium
-
-  * Team upload.
-  * New upstream release.
-  * Move python, and ruby from recommends of calligra-libs to suggests of
-    calligrasheets: this because calligrasheets is the only application with
-    python, and ruby scripts.
-  * Add Rules-Requires-Root: no.
+  * New release
 
- -- Pino Toscano <pino at debian.org>  Fri, 15 May 2020 13:55:24 +0200
+ -- Neon CI <neon at kde.org>  Tue, 04 Apr 2017 10:17:32 +0000
 
-calligra (1:3.2.0+dfsg-1) unstable; urgency=medium
-
-  * Team upload.
-  * Upload to unstable.
-  * New upstream release.
-  * Replace the transitional libfontconfig1-dev build dependency with
-    libfontconfig-dev.
-  * Drop the man pages, as they do not provide any useful content.
-  * Switch the watch file back to stable releases.
-  * Update the build dependencies according to the upstream build system:
-    - bump libkchart-dev to 2.7.0
-  * Bump Standards-Version to 4.5.0, no changes required.
-  * Switch Vcs-Git back to the master packaging branch.
-  * Update install files.
-
- -- Pino Toscano <pino at debian.org>  Fri, 24 Apr 2020 13:25:56 +0200
-
-calligra (1:3.1.90+dfsg-1) experimental; urgency=medium
-
-  * Team upload.
-  * New upstream development release (3.2.0 beta 1).
-  * Update the patches:
-    - upstream_Fix-build-with-Qt-5.11-missing-headers.patch: drop, backported
-      from upstream
-    - upstream_Fix-compilation-with-Qt-5.11-missing-include.patch: drop,
-      backported from upstream
-    - upstream_Fix-build-with-poppler-0.69.patch: drop, backported from upstream
-    - upstream_Fix-build-with-poppler-0.64.patch: drop, backported from upstream
-    - upstream_Mark-the-functions-as-override.patch: drop, backported from
-      upstream
-    - upstream_GBool-bool.patch: drop, backported from upstream
-    - upstream_Fix-build-with-poppler-0.64-take-2.patch: drop, backported from
-      upstream
-    - upstream_Fix-build-with-poppler-0.71.patch: drop, backported from upstream
-    - upstream_Guchar-unsigned-char.patch: drop, backported from upstream
-    - upstream_Fix-GooString-not-having-getCString-anymore.patch: drop,
-      backported from upstream
-    - upstream_Fix-the-way-poppler-headers-are-included.patch: drop, backported
-      from upstream
-    - upstream_Fix-compilation-with-Qt-5.13-missing-include.patch: drop,
-      backported from upstream
-  * Update the build dependencies according to the upstream build system:
-    - remove no more used: libkf5akonadicontact-dev, libkf5holidays-dev, and
-      libqt5webkit5-dev
-  * Update install files.
-  * Switch the watch file to the unstable releases for now.
-  * Point Vcs-Git to the experimental packaging branch.
-  * Drop the removal of files that are no more shipped.
-  * Update lintian overrides.
-
- -- Pino Toscano <pino at debian.org>  Fri, 10 Apr 2020 09:45:00 +0200
-
-calligra (1:3.1.0+dfsg-6) unstable; urgency=medium
-
-  * Team upload.
-  * Replace the monolithic patch poppler-0.71.patch with all the upstream
-    commit, including the support for poppler 0.72+:
-    - commit 56bd4bab320b0c0a893751caee9a15a2241e3ef8; patch
-      upstream_Fix-build-with-poppler-0.69.patch
-    - commit 3760bb3012456261024324e15598d1aefc611665; patch
-      upstream_Fix-build-with-poppler-0.64.patch
-    - commit fa4c2961b8280456d4c1484565b973d312e0bd1c; patch
-      upstream_Mark-the-functions-as-override.patch
-    - commit 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e; patch
-      upstream_GBool-bool.patch
-    - commit 45559a470604bd9494d0832589411fc5b683b316; patch
-      upstream_Fix-build-with-poppler-0.64-take-2.patch
-    - commit f099b8e143bbeb1de3c7e89f4764006c3de61ae4; patch
-      upstream_Fix-build-with-poppler-0.71.patch
-    - commit a1ddd91e6c354e8f0dda40f8a522053c3fa19c39; patch
-      upstream_Guchar-unsigned-char.patch
-    - commit 4bf0add22d3945b90bee7d90432f5db59e06f928; patch
-      upstream_Fix-GooString-not-having-getCString-anymore.patch
-    - commit 464824279827b5188abd969ee754609c22f4e393; patch
-      upstream_Fix-the-way-poppler-headers-are-included.patch
-  * Replace the transitional libfreetype6-dev build dependency with
-    libfreetype-dev.
-  * Bump Standards-Version to 4.4.1, no changes required.
-  * Drop the migration from calligra-dbg, no more needed after two Debian
-    stable releases.
-  * Backport upstream commit 0c5430697bdcf41a45046107b28014e40c49a11a to build
-    with newer KF; patch
-    upstream_Fix-compilation-with-Qt-5.13-missing-include.patch.
-  * Bump the debhelper compatibility to 12:
-    - switch the debhelper build dependency to debhelper-compat 12
-    - remove debian/compat
-    - stop passing --list-missing to dh_missing, as it is the default
-  * Update lintian overrides.
-
- -- Pino Toscano <pino at debian.org>  Sat, 16 Nov 2019 12:09:11 +0100
-
-calligra (1:3.1.0+dfsg-5) unstable; urgency=medium
-
-  [ Gianfranco Costamagna ]
-  * Team upload
+calligra (1:3.0.0.1-0neon) xenial; urgency=medium
 
-  [ Rik Mills <rikmills at kubuntu.org> ]
-  * debian/patches: Replace poppler-0.69.patch with poppler-0.71.patch
-
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 10 Jan 2019 13:40:11 +0100
-
-calligra (1:3.1.0+dfsg-4) unstable; urgency=medium
-
-  * Team upload.
-  * Fix build with new poppler 0.69.0-1 (Closes: #910873, Closes: #911502)
-
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 22 Oct 2018 10:28:51 +0200
-
-calligra (1:3.1.0+dfsg-3) unstable; urgency=medium
-
-  * Team upload.
-  * Update Vcs-* fields.
-  * Bump Standards-Version to 4.2.1, no changes required.
-  * Update few things in README.source.
-  * Backport upstream commits a7ebecb9fbee2190e649c44ed53f1299013baa30, and
-    ee83e0f2c251072e47a2799619cdc79efe67e651 to fix build with Qt >= 5.11;
-    patches upstream_Fix-build-with-Qt-5.11-missing-headers.patch, and
-    upstream_Fix-compilation-with-Qt-5.11-missing-include.patch.
-    (Closes: #907013)
-
- -- Pino Toscano <pino at debian.org>  Wed, 05 Sep 2018 08:39:20 +0200
-
-calligra (1:3.1.0+dfsg-2) unstable; urgency=medium
-
-  * Team upload.
-  * Upload to unstable.
-  * Switch Vcs-* fields to salsa.debian.org.
-  * Bump the debhelper compatibility to 11:
-    - bump the debhelper build dependency to 11~
-    - bump compat to 11
-    - remove --parallel for dh, as now done by default
-  * Switch from dh_install to dh_missing for --list-missing.
-  * Bump the libkproperty3-dev, and libkreport3-dev build dependencies to
-    >= 3.1.0~, to make sure to build against the newer versions of them.
-
- -- Pino Toscano <pino at debian.org>  Fri, 09 Mar 2018 09:37:57 +0100
-
-calligra (1:3.1.0+dfsg-1) experimental; urgency=medium
-
-  * Team upload.
-  * New upstream release.
-  * Update the build dependencies:
-    - bump extra-cmake-modules to >= 5.19.0
-    - add libgit2-dev, libkf5holidays-dev: used by the new release
-    - add libkf5archive-dev, libx11-dev: already used, but installed by some
-      other package
-    - remove libkgantt-dev, and libpoppler-qt5-dev: no more used
-  * Drop the braindump binary, since it is disabled upstream
-    - do not ship its translations
-  * Drop the calligraplan binary, since a newer version of it is going to be
-    provided by a separate calligraplan source.
-  * Drop from debian/tmp the stuff belonging to the unported calligraflow
-    (they are not shipped, anyway).
-  * Change priority of calligra-reports-web-element to optional (even if
-    it is a transitional package), according to Policy §2.5.
-  * Bump Standards-Version to 4.1.3, no changes required.
-  * Small updates to copyright.
-  * Update the Homepage fields across all the packages:
-    - use https for all the links
-    - avoid duplicated calligra.org field
-    - make sure calligrastage-data has the same Homepage as calligrastage
-  * Minor updates to the watch file.
-  * Update install files.
-  * Bring back the calligra-gemini, and calligra-gemini-data packages.
-  * Bring back the okular-backend-odp, and okular-backend-odt packages, as
-    a KF5 version of Okular is available
-    - uncomment the okular-dev build dependency, with the right version
-    - ship again their translations
-  * Move the translations to their own packages:
-    - turn the calligra-l10n-* binaries into empty dummy packages
-    - add proper breaks/replaces
-    - remove calligra_shape_comment.mo, and calligra_shape_template.mo, as
-      these shapes are not shipped
-  * Update lintian overrides.
-  * Fix a typo in the man page of calligrasheets.
-  * Small changes in the man pages.
-  * Regenerate the man pages from the rst sources.
-  * Split calligrasheets-data out of calligrasheets.
-  * Remove the khelpcenter in calligrawords, as there is no documentation.
-
- -- Pino Toscano <pino at debian.org>  Tue, 06 Feb 2018 22:04:06 +0100
-
-calligra (1:3.0.1+dfsg-2) unstable; urgency=medium
-
-  * Team upload.
-  * Limit dh_gencontrol calls for l10n packages only when they are built.
-  * Update lintian overrides.
-  * Explicitly add the gettext build dependency.
-  * Bump Standards-Version to 4.1.0, no changes required.
-  * Upload to unstable.
-
- -- Pino Toscano <pino at debian.org>  Wed, 06 Sep 2017 08:10:36 +0200
-
-calligra (1:3.0.1+dfsg-1) experimental; urgency=medium
-
-  * Team upload.
-  * New upstream release:
-    - switches from Qt4 (using QtWebKit) to Frameworks (Closes: #784454)
-  * Cleanup copyright from removed stuff, and other minor changes.
-  * Bring the repack suffix back to "+dfsg".
-  * Update the patches:
-    - upstream_fix-arm-FTBFS.patch: drop, obsolete
-    - upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch:
-      drop, backported from upstream
-    - libwps-0.4.patch: drop, applied upstream
-    - no-planconvert-jar.patch: drop, obsolete
-  * Update the build dependencies following the port to Frameworks:
-    - remove kdelibs5-dev, kdepimlibs5-dev, libattica-dev,
-      libphononexperimental-dev, libpoppler-qt4-dev, libqca2-dev, libqt4-dev,
-      libqt4-opengl-dev, and libqtwebkit-dev
-    - add extra-cmake-modules, qtbase5-dev, libqt5opengl5-dev, libqt5svg5-dev,
-      libqt5webkit5-dev, libqt5x11extras5-dev, libphonon4qt5-dev,
-      libphonon4qt5experimental-dev, libkf5activities-dev, libkf5akonadi-dev,
-      libkf5akonadicontact-dev, libkf5attica-dev, libkf5calendarcore-dev,
-      libkf5codecs-dev, libkf5completion-dev, libkf5config-dev,
-      libkf5configwidgets-dev, libkf5contacts-dev, libkf5coreaddons-dev,
-      libkf5dbusaddons-dev, libkf5doctools-dev, libkf5guiaddons-dev,
-      libkf5i18n-dev, libkf5iconthemes-dev, libkf5itemviews-dev,
-      libkf5jobwidgets-dev, libkf5kcmutils-dev, libkf5kdelibs4support-dev,
-      libkf5khtml-dev, libkf5kio-dev, libkf5notifications-dev,
-      libkf5notifyconfig-dev, libkf5parts-dev, libkf5sonnet-dev,
-      libkf5textwidgets-dev, libkf5wallet-dev, libkf5widgetsaddons-dev,
-      libkf5windowsystem-dev, libkf5xmlgui-dev, kross-dev, libkchart-dev,
-      libkgantt-dev, libkproperty3-dev,  libkreport3-dev,  libpoppler-qt5-dev,
-      and libqca-qt5-2-dev
-  * Drop the calligraflow, calligraflow-data, calligraactive,
-    calligra-semanticitems, calligraauthor, calligra-gemini, and
-    calligra-gemini-data binaries, since all refer to unported/dropped
-    stuff
-    - remove symlinking done in calligra-gemini
-  * Turn the calligra-reports-web-element package into a transitional package
-    for libkreport3-plugin-web, which provides the equivalent component.
-  * Disable the okular-backend-odp, and okular-backend-odt binaries, since
-    there is no KF5 version of Okular in Debian currently
-    - comment out the okular-dev build dependency
-  * Use the right dh addon:
-    - switch from kde to kf5 dh addon
-    - bump the pkg-kde-tools build dependency to >= 0.15.16
-  * Switch QT_SELECT to 5 in rules.
-  * Update the flags passed to cmake:
-    - replace -DKDE4_BUILD_TESTS=OFF with -DBUILD_TESTING=OFF, since it is the
-      flag exported by ECM
-    - remove -DBUILD_krita=OFF, and -DBUILD_kexi=OFF, as both the applications
-      were removed upstream
-    - add -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON, since for now we want to
-      get also what upstream considers unmaintained; maybe this should be
-      revised in the future
-  * Update/rewrite the install files.
-  * Adapt the job in override_dh_auto_install:
-    - stop removing headers and cmake files, no more installed
-    - adapt path (even if not installed currently) to the font (cmex10.ttf)
-      to remove
-  * Update lintian overrides.
-  * calligraplan has no more Java parts, so:
-    - drop the default-jdk build dependency
-    - drop the default-jre, and libapache-poi-java recommends
-    - drop the README.Debian for calligraplan
-    - remove note about that in README.source
-  * Replace the libqca2-plugins recommend with libqca-qt5-2-plugins.
-  * Stop excluding kde-runtime, and kdepim-runtime from the shlibdeps of
-    calligra-libs, as they are no more injected.
-  * Remove x-test fake translations, to avoid accidentally pulling them
-    anywhere.
-  * Drop unneeded build dependencies:
-    - libgit2-dev, libicu-dev, libpng-dev, libsoprano-dev, and libsqlite3-dev
-  * Import the calligra-l10n-* binaries from src:calligra-l10n, along with the
-    common package substvars
-    - rename the substvars from ${calligra:foo} to ${l10n:foo}
-    - this only covers the languages already shipped by calligra 2.9, that is
-      29 languages out of 76; other languages will come in a later upload
-    - add install files for all the binaries
-    - remove mo files for stuff which is not shipped
-  * Few more changes to README.source.
-
- -- Pino Toscano <pino at debian.org>  Sun, 20 Aug 2017 18:54:14 +0200
-
-calligra (1:2.9.11+dfsg1-1) unstable; urgency=low
-
-  * Team upload.
-  * Drop kexi entirely from this source, since a newer version of it is going
-    to be provided by a separate kexi source:
-    - bump version to +dfsg1
-    - add the whole "kexi" subdirectory to the Excluded-Files, so it is
-      removed from the repacked tarball (making it slightly smaller)
-    - pass -DBUILD_kexi=OFF to cmake, to make sure it is not used
-    - drop the kexi, kexi-data, kexi-calligrasheets-driver, kexi-mysql-driver,
-      kexi-postgresql-driver, kexi-xbase-driver, kexi-sybase-driver, and
-      kexi-web-form-widget binaries
-    - comment out the kexi dependency in the calligra metapackage for now
-    - drop the local kexi man pages
-    - drop kexi bits from copyright
-    - drop kexi bits from README.source
-    - update install files
-    - update the patches accordingly:
-      - upstream_cmake-find-PostgreSQL-9.6.patch: drop, no more needed
-      - add_keywords_to_desktop_files.patch: drop kexi bit
-      - cmake-xbase64.patch: drop, no more needed
-  * Drop unneeded build dependencies:
-    - default-libmysqlclient-dev, freetds-dev, libpq-dev, libpqxx-dev,
-      libxbase64-dev, postgresql-server-dev-all: used by kexi
-    - libjpeg-dev: no more needed because of previous changes
-  * Drop all the koffice & pre-Jessie conflicts/replaces/breaks.
-  * Update watch file.
-  * Disable the build of developer tools, which were not installed already
-    in any binary package anyway:
-    - pass -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF to cmake
-    - remove from debian/not-installed files now disappeared
-  * Instead of ignoring the lyx fonts, and listing it in debian/not-installed,
-    remove it from debian/tmp.
-  * Drop TODO.Debian, all its content is obsolete.
-  * Drop the transitional krita-gemini, already in Stretch.
-  * Drop patch add_keywords_to_desktop_files.patch: it was never upstreamed,
-    and some of the changes do not look correct to me.  If needed, the changes
-    ought to be done upstream, so they can be properly reviewed, and
-    translated too.
-  * Update lintian overrides.
-  * Bump Standards-Version to 4.0.1, no changes required.
-  * Minor changes to copyright: use https for the specification URL, and refer
-    to the MPL-2.0 in common-licenses.
+  * New release
 
- -- Pino Toscano <pino at debian.org>  Sat, 19 Aug 2017 14:18:39 +0200
+ -- Neon CI <neon at kde.org>  Wed, 04 Jan 2017 10:41:09 +0000
 
 calligra (1:2.9.11+dfsg-4) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
index c86a8a7..19f7a27 100644
--- a/debian/control
+++ b/debian/control
@@ -2,87 +2,82 @@ Source: calligra
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Pino Toscano <pino at debian.org>,
-Build-Depends: cmake (>= 3.16~),
-               debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.19.0),
-               gettext,
-               kross-dev (>= 5.7.0),
+Uploaders: Adrien Grellier <perso at adrieng.fr>,
+           Raúl Sánchez Siles <rasasi78 at gmail.com>,
+           Maximiliano Curia <maxy at debian.org>
+Build-Depends: cauchy-dev,
+               cmake,
+               debhelper (>= 9),
+               extra-cmake-modules,
+               kross-dev,
                libboost-dev,
                libboost-system-dev,
                libeigen3-dev,
                libetonyek-dev,
-               libfontconfig-dev,
-               libfreetype-dev,
+               libfontconfig1-dev,
+               libfreetype6-dev,
                libgit2-dev,
                libgsl-dev,
-               libkchart-dev (>= 2.7.0~),
-               libkf5activities-dev (>= 5.7.0),
-               libkf5archive-dev (>= 5.7.0),
+               libicu-dev,
+               libjpeg-dev,
+               libkchart-dev,
+               libkf5activities-dev,
                libkf5akonadi-dev,
-               libkf5attica-dev,
+               libkf5akonadicontact-dev,
                libkf5calendarcore-dev,
-               libkf5codecs-dev (>= 5.7.0),
-               libkf5completion-dev (>= 5.7.0),
-               libkf5config-dev (>= 5.7.0),
-               libkf5configwidgets-dev (>= 5.7.0),
                libkf5contacts-dev,
-               libkf5coreaddons-dev (>= 5.7.0),
-               libkf5dbusaddons-dev (>= 5.7.0),
-               libkf5doctools-dev (>= 5.7.0),
-               libkf5guiaddons-dev (>= 5.7.0),
-               libkf5i18n-dev (>= 5.7.0),
-               libkf5iconthemes-dev (>= 5.7.0),
-               libkf5itemviews-dev (>= 5.7.0),
-               libkf5jobwidgets-dev (>= 5.7.0),
-               libkf5kcmutils-dev (>= 5.7.0),
-               libkf5kdelibs4support-dev (>= 5.7.0),
-               libkf5khtml-dev (>= 5.7.0),
-               libkf5kio-dev (>= 5.7.0),
-               libkf5notifications-dev (>= 5.7.0),
-               libkf5notifyconfig-dev (>= 5.7.0),
-               libkf5parts-dev (>= 5.7.0),
-               libkf5sonnet-dev (>= 5.7.0),
-               libkf5textwidgets-dev (>= 5.7.0),
-               libkf5wallet-dev (>= 5.7.0),
-               libkf5widgetsaddons-dev (>= 5.7.0),
-               libkf5windowsystem-dev (>= 5.7.0),
-               libkf5xmlgui-dev (>= 5.7.0),
-               libkproperty3-dev (>= 3.1.0~),
-               libkreport3-dev (>= 3.1.0~),
+               libkf5coreaddons-dev,
+               libkf5dbusaddons-dev,
+               libkf5doctools-dev,
+               libkf5holidays-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5itemviews-dev,
+               libkf5kcmutils-dev,
+               libkf5kdelibs4support-dev,
+               libkf5kio-dev,
+               libkf5notifyconfig-dev,
+               libkf5parts-dev,
+               libkf5sonnet-dev,
+               libkf5texteditor-dev,
+               libkf5textwidgets-dev,
+               libkf5threadweaver-dev,
+               libkf5wallet-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               libkf5xmlgui-dev,
+               libkgantt-dev,
+               libkproperty3-dev,
+               libkreport3-dev,
                liblcms2-dev (>= 2.4),
                libmarble-dev,
                libodfgen-dev,
                libopenexr-dev,
+               libopenjpeg-dev | libopenjp2-7-dev,
                libphonon4qt5-dev,
                libphonon4qt5experimental-dev,
-               libpoppler-private-dev (>= 0.83.0~),
-               libpoppler-qt5-dev (>= 0.83.0~),
+               libpng-dev,
                libqca-qt5-2-dev,
-               libqt5opengl5-dev (>= 5.3.0),
-               libqt5svg5-dev (>= 5.3.0),
-               libqt5x11extras5-dev (>= 5.3.0),
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
                libspnav-dev,
                libvisio-dev (>= 0.1),
                libwpd-dev (>= 0.10),
                libwpg-dev (>= 0.3),
                libwps-dev (>= 0.4),
-               libx11-dev,
+               libxbase64-dev,
                libxml2-dev,
-               okular-dev (>= 4:17.08),
                pkg-config,
-               pkg-kde-tools (>= 0.15.16),
+               pkg-kde-tools,
                pstoedit,
-               qtbase5-dev (>= 5.3.0),
-               qtdeclarative5-dev (>= 5.3.0),
+               qtdeclarative5-dev,
                shared-mime-info,
                vc-dev [!armhf !arm64],
                zlib1g-dev
-Standards-Version: 4.6.1
-Homepage: https://www.calligra.org/
-Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/calligra.git
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/calligra
-Rules-Requires-Root: no
+Standards-Version: 3.9.8
+Homepage: http://www.calligra.org/
+Vcs-Git: https://anonscm.debian.org/git/pkg-kde/calligra/calligra.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/calligra/calligra.git
 
 Package: calligra
 Architecture: all
@@ -91,6 +86,7 @@ Depends: calligrasheets (>= ${source:Version}),
          calligrawords (>= ${source:Version}),
          karbon (>= ${source:Version}),
          ${misc:Depends}
+Homepage: http://www.calligra.org
 Description: extensive productivity and creative suite
  Calligra Suite is a set of applications written to help you to accomplish
  your work. It includes office applications such as a word processor,
@@ -106,7 +102,13 @@ Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: pstoedit
-Homepage: https://www.calligra.org/karbon/
+Breaks: calligra-data (<< 1:2.4.3-2),
+        calligraflow (<< ${source:Version}~ciBuild),
+        koffice-data (<< 1:2.4)
+Replaces: calligra-data (<< 1:2.4.3-2),
+          calligraflow (<< ${source:Version}~ciBuild),
+          koffice-data (<< 1:2.4)
+Homepage: http://www.calligra.org/karbon/
 Description: vector graphics application for the Calligra Suite
  Karbon is a vector drawing application with an user interface that is easy to
  use, highly customizable and extensible. That makes Karbon a great application
@@ -141,12 +143,17 @@ Description: vector graphics application for the Calligra Suite
 Package: calligrasheets
 Architecture: any
 Section: math
+Replaces: calligra-data (<< 1:2.4.3-2),
+          koffice-data (<< 1:2.4),
+          kspread (<< 1:2.4)
+Breaks: calligra-data (<< 1:2.4.3-2),
+        koffice-data (<< 1:2.4),
+        kspread (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
-         calligrasheets-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: khelpcenter, python, ruby
-Homepage: https://www.calligra.org/sheets/
+Suggests: khelpcenter
+Homepage: http://www.calligra.org/sheets/
 Description: spreadsheet for the Calligra Suite
  Tables is a powerful spreadsheet application.  It is scriptable and
  provides both table-oriented sheets and support for complex mathematical
@@ -154,27 +161,24 @@ Description: spreadsheet for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-Package: calligrasheets-data
-Architecture: all
-Section: math
-Depends: ${misc:Depends}
-Homepage: https://www.calligra.org/sheets/
-Description: data files for Sheets spreadsheet
- This package contains architecture-independent data files for Sheets,
- the spreadsheet shipped with the Calligra Suite.
- .
- See the calligrasheets package for further information.
- .
- This package is part of the Calligra Suite.
+Package: calligraflow
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: empty dummy package
+ This is a dummy package as the Flow app has been removed.
 
 Package: calligrawords
 Architecture: any
 Section: text
+Replaces: kword (<< 1:2.4)
+Breaks: kword (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          calligrawords-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Homepage: https://www.calligra.org/words/
+Suggests: khelpcenter
+Recommends: okular-backend-odt
+Homepage: http://www.calligra.org/words/
 Description: word processor for the Calligra Suite
  Words is a FrameMaker-like word processing and desktop publishing
  application. It is capable of creating polished and professional
@@ -187,7 +191,10 @@ Package: calligrawords-data
 Architecture: all
 Section: text
 Depends: ${misc:Depends}
-Homepage: https://www.calligra.org/words/
+Conflicts: koffice-data
+Breaks: calligra-data (<< 1:2.4.3-2)
+Replaces: calligra-data (<< 1:2.4.3-2), koffice-data
+Homepage: http://www.calligra.org/words/
 Description: data files for Words word processor
  This package contains architecture-independent data files for Words,
  the word processor shipped with the Calligra Suite.
@@ -198,12 +205,19 @@ Description: data files for Words word processor
 
 Package: calligrastage
 Architecture: any
+Replaces: calligra-data (<< 1:2.4.3-2),
+          koffice-data (<< 1:2.4),
+          kpresenter (<< 1:2.4)
+Breaks: calligra-data (<< 1:2.4.3-2),
+        koffice-data (<< 1:2.4),
+        kpresenter (<< 1:2.4)
 Depends: calligra-libs (= ${binary:Version}),
          calligrastage-data (>=${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: khelpcenter
-Homepage: https://www.calligra.org/stage/
+Recommends: okular-backend-odp
+Homepage: http://www.calligra.org/stage/
 Description: presentation program for the Calligra Suite
  Stage is an easy to use yet still flexible presentation application. You can
  easily create presentations containing a rich variety of elements, from
@@ -223,7 +237,8 @@ Description: presentation program for the Calligra Suite
 Package: calligrastage-data
 Architecture: all
 Depends: ${misc:Depends}
-Homepage: https://www.calligra.org/stage/
+Breaks: calligrastage (<< 1:2.6.3-1~)
+Replaces: calligrastage (<< 1:2.6.3-1~)
 Description: data files for Calligra Stage
  This package contains architecture-independent data files for Stage,
  the presentation program shipped with the Calligra Suite.
@@ -235,10 +250,13 @@ Description: data files for Calligra Stage
 Package: calligra-libs
 Section: libs
 Architecture: any
+Replaces: kexi (<< 1:2.6.1), kformula, koffice-libs
+Conflicts: kformula, koffice-libs
+Breaks: kexi (<< 1:2.6.1)
 Depends: calligra-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: fonts-lyx, libqca-qt5-2-plugins
+Recommends: fonts-lyx, libqca2-plugins, python, ruby
 Suggests: texlive, wordnet
 Description: common libraries and binaries for the Calligra Suite
  This package provides the libraries and binaries that are shared amongst
@@ -250,6 +268,9 @@ Package: calligra-data
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}
+Replaces: kexi (<< 1:2.6.1), kformula, koffice-data
+Conflicts: kformula, koffice-data
+Breaks: kexi (<< 1:2.6.1)
 Suggests: khelpcenter
 Description: common shared data for the Calligra Suite
  This package provides the architecture-independent data that is shared
@@ -257,38 +278,10 @@ Description: common shared data for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-Package: okular-backend-odp
-Architecture: any
-Section: graphics
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: okular
-Enhances: okular
-Description: Okular backend for ODP documents
- This package provides a backend for Okular to view OpenDocument Presentation
- (ODP) documents, but also PowerPoint and PPTX documents.
- .
- This package is part of the Calligra Suite.
-
-Package: okular-backend-odt
-Architecture: any
-Section: graphics
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: okular
-Enhances: okular
-Description: Okular backend for ODT documents
- This package provides a backend for Okular to view OpenDocument Text
- (ODT) documents, but also DOC, DOCX, RTF and WPD documents.
- .
- This package is part of the Calligra Suite.
-
 Package: calligra-gemini
 Architecture: any
 Depends: calligra-libs (= ${binary:Version}),
-         calligra-gemini-data (>= ${source:Version}),
+         qml-module-qtwebengine,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: calligragemini (<< ${source:Version}~ciBuild)
diff --git a/debian/copyright b/debian/copyright
index d4aa3fc..e68d29f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,17 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Calligra
 Source: http://www.calligra-suite.org/get-calligra/
 Files-Excluded:
  filters/libmso/generated/mso.jar
+ filters/plan/mpxj/planconvert/jar/PlanConvert.jar
+ 3rdparty/google-breakpad
+ krita
  windows
  winquirks
 Comment:
- * 'windows', and 'winquirks' are dropped, as containing only material for
-    Windows
+ * 'krita' is removed, as built from the separate src:krita
+ * 'google-breakpad', 'windows', and 'winquirks' are dropped, as containing
+   only material for Windows
 
 Files: *
 Copyright:
@@ -563,18 +567,26 @@ Copyright:
     2003      Bitstream, Inc
 License: Bitstream-Vera
 
+Files: kexi/main/status/*.png
+Copyright: Mark James
+License: CC-BY-3.0
+Comment: http://www.famfamfam.com/lab/icons/silk
+
 Files:
-    braindump/data/org.kde.braindump.appdata.xml
-    flow/part/org.kde.calligraflow.appdata.xml
-    karbon/data/org.kde.karbon.appdata.xml
-    sheets/org.kde.calligrasheets.appdata.xml
-    stage/app/org.kde.calligrastage.appdata.xml
-    words/app/org.kde.calligrawords.appdata.xml
+    braindump/data/braindump.appdata.xml
+    flow/part/flow.appdata.xml
+    karbon/data/karbon.appdata.xml
+    kexi/kexi.appdata.xml
+    plan/plan.appdata.xml
+    sheets/sheets.appdata.xml
+    stage/app/stage.appdata.xml
+    words/app/words.appdata.xml
 Copyright:
     Not-Applicable
 License: CC0-1.0
 
 Files:
+    kexi/tests/widgets/kexidbdrivercombotest.cpp
     sheets/3rdparty/mdds/*
     sheets/plugins/calendar/CalendarToolWidget.cpp
     sheets/plugins/calendar/CalendarToolWidget.h
@@ -594,6 +606,7 @@ Copyright:
     2005      Anne-Marie.Mahfouf
     2000      Frederik Fouvry
     2006      Gary Cramblitt
+    2002-2012 The Kexi Team
     1999-2000 Krishna Tateneni
     2000-2002 Neil Lucock
     1998-2000 Reginald Stadlbauer
@@ -603,13 +616,24 @@ Comment:
  COPYING.DOC
 
 Files:
-    pics/hicolor/sc-actions-table.svgz
+    libs/kotext/kohyphen/hyphdicts/README_hyph_nl_NL.txt
+    pics/oxygen/oxsc-actions-table.svgz
+    plan/plugins/schedulers/tj/taskjuggler/*
     stage/part/tests/ModelTest.cpp
     stage/part/tests/ModelTest.h
 Copyright:
+    2001-2007 Chris Schlaeger <cs at kde.org>
+    2011      Dag Andersen <danders at get2net.dk>
     2007      Trolltech ASA
 License: GPL-2
 
+Files:
+    3rdparty/kdchart/*
+    3rdparty/kdchartpatches/*
+Copyright:
+    2001-2011 Klaralvdalens Datakonsult AB
+License: GPL-2 or GPL-3
+
 Files:
     gemini/CloudAccountsModel.cpp
     gemini/CloudAccountsModel.h
@@ -637,6 +661,25 @@ Copyright:
     2013-2014 Dan Leinir Turthra Jensen <admin at leinir.dk>
 License: GPL-2 or GPL-3+KDE
 
+Files:
+    3rdparty/kdgantt/*
+    3rdparty/kdganttpatches/*
+Copyright:
+    2001-2006 Klarälvdalens Datakonsult AB
+License: GPL-2 or GPL-3+KDGantt
+Comment:
+ Alternatively you may (at your option) use any later version of the GNU
+ General Public License if such license has been publicly approved by
+ Klarälvdalens Datakonsult AB (or its successors, if any).
+
+Files:
+    3rdparty/kdgantt/kdgantttimescalezoomdialog.cpp
+    3rdparty/kdgantt/kdgantttimescalezoomdialog.h
+Copyright: 2008 Dag Andersen <kplato at kde.org>
+License: LGPL-2+
+Comment:
+ part of the Calligra project.
+
 Files:
     plugins/textediting/thesaurus/extract.pl
 Copyright:
@@ -647,6 +690,8 @@ License: GPL-2+ and WordNet
 Files:
     gemini/cloud/dropbox/3rdparty/json.cc
     gemini/cloud/dropbox/3rdparty/json.h
+    libs/db/parser/sqlparser.cpp
+    libs/db/parser/sqlparser.h
     plugins/formulashape/3rdparty/itexToMML/y.tab.c
     plugins/formulashape/3rdparty/itexToMML/y.tab.h
 Copyright:
@@ -728,6 +773,20 @@ Files:
     interfaces/KoChartInterface.h
     interfaces/KoChartModel.h
     interfaces/SimpleTextShapeInterface.h
+    kexi/formeditor/resizehandle.cpp
+    kexi/formeditor/resizehandle.h
+    kexi/migration/AlterSchemaTableModel.cpp
+    kexi/migration/AlterSchemaTableModel.h
+    kexi/migration/AlterSchemaWidget.cpp
+    kexi/migration/AlterSchemaWidget.h
+    kexi/migration/importtablewizard.cpp
+    kexi/migration/importtablewizard.h
+    kexi/widget/KexiPasswordWidget.cpp
+    kexi/widget/KexiPasswordWidget.h
+    kexi/widget/navigator/KexiProjectItemDelegate.h
+    kexi/widget/navigator/KexiProjectModel.cpp
+    kexi/widget/navigator/KexiProjectModel.h
+    kexi/widget/navigator/KexiProjectModelItem.h
     libs/main/KoApplicationAdaptor.cpp
     libs/main/KoApplicationAdaptor.h
     libs/main/KoPartAdaptor.cpp
@@ -769,6 +828,12 @@ Files:
     libs/widgets/KoZoomWidget.h
     libs/widgetutils/KoGroupButton.cpp
     libs/widgetutils/KoGroupButton.h
+    libs/widgetutils/kowidgetutils_export.h
+    plan/libs/kernel/kpteffortcostmap.cpp
+    plan/libs/kernel/kpteffortcostmap.h
+    plan/libs/kernel/kptmap.h
+    plan/libs/kernel/kptxmlloaderobject.h
+    plan/libs/ui/kmessagebox_copy.cpp
     plugins/formulashape/tests/TestCursor.cpp
     plugins/formulashape/tests/TestCursor.h
     plugins/formulashape/tests/TestLayout.cpp
@@ -993,12 +1058,26 @@ Copyright:
     2001-2003 Werner Trobin <trobin at kde.org>
 License: LGPL-2 or LGPL-3+KDE
 
+Files:
+    libs/kotext/kohyphen/hnjalloc.c
+    libs/kotext/kohyphen/hnjalloc.h
+    libs/kotext/kohyphen/hyphen.c
+    libs/kotext/kohyphen/hyphen.h
+Copyright:
+    2001      ALTLinux, Moscow
+    2001      ALTLinux, Moscow (http://www.alt-linux.org)
+    2001      Peter Novodvorsky <nidd at cs.msu.su>
+    1998      Raph Levien
+License: LGPL-2+ or MPL-1.0
+
 Files:
     sheets/plugins/scripting/scripts/consoledocker.py
     sheets/plugins/scripting/scripts/csvexport.py
     sheets/plugins/scripting/scripts/csvimport.py
     sheets/plugins/scripting/scripts/functions.py
     sheets/plugins/scripting/scripts/htmlexport.py
+    sheets/plugins/scripting/scripts/kexidbexport.py
+    sheets/plugins/scripting/scripts/kexidbimport.py
     sheets/plugins/scripting/scripts/odfpyexport.py
     sheets/plugins/scripting/scripts/vcardimport.py
     words/plugins/scripting/scripts/ooimport.py
@@ -1007,6 +1086,15 @@ Copyright:
     2006-2007 Sebastian Sauer <mail at dipe.org>
 License: LGPL-2+ or BSD-3-Clause
 
+Files:
+    kexi/kexiutils/completer/KexiCompleter.cpp
+    kexi/kexiutils/completer/KexiCompleter.h
+    kexi/kexiutils/completer/KexiCompleter_p.h
+    kexi/kexiutils/completer/private/*
+Copyright:
+    2011      Nokia Corporation and/or its subsidiary(-ies)
+License: LGPL-2.1 and exception-LGPL-Nokia-QT-1.1
+
 Files:
     filters/outputhelper/OutputFileHelper.cxx
     filters/outputhelper/OutputFileHelper.hxx
@@ -1027,12 +1115,20 @@ Files:
     devtools/scripts/OpenDocument-strict-schema-v1.1.rng
     devtools/scripts/OpenDocument-v1.2-cs01-manifest-schema.rng
     devtools/scripts/OpenDocument-v1.2-cs01-schema-calligra.rng
-    libs/text/styles/tests/specs/*
+    libs/kotext/styles/tests/specs/*
 Copyright:
     2002-2011 OASIS Open
     1999-2007 Sun Microsystems, Inc
 License: OASIS
 
+Files:
+    kexi/kexidb/sqlitedump/shell.c
+    libs/db/drivers/sqlite/icu/icu.c
+    libs/db/drivers/sqlite/icu/sqliteicu.h
+Copyright:
+    Not-Applicable
+License: Public-Domain-SQLite
+
 Files:
     words/templates/Wordprocessing/colorful.png
     words/templates/Wordprocessing/fax.png
@@ -1333,10 +1429,449 @@ License: Bitstream-Vera
     “sans”, “serif” and “monospace”.  Other software (e.g., the XFree86
     core server) has other mechanisms for font substitution.
 
+License: CC-BY-3.0
+ Creative Commons Legal Code
+ ․
+ Attribution 3.0 Unported
+ ․
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+ ․
+ License
+ ․
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ ․
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ ․
+ 1. Definitions
+ ․
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+    other pre-existing works, such as a translation, adaptation,
+    derivative work, arrangement of music or other alterations of a
+    literary or artistic work, or phonogram or performance and includes
+    cinematographic adaptations or any other form in which the Work may be
+    recast, transformed, or adapted including in any form recognizably
+    derived from the original, except that a work that constitutes a
+    Collection will not be considered an Adaptation for the purpose of
+    this License. For the avoidance of doubt, where the Work is a musical
+    work, performance or phonogram, the synchronization of the Work in
+    timed-relation with a moving image ("synching") will be considered an
+    Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+    encyclopedias and anthologies, or performances, phonograms or
+    broadcasts, or other works or subject matter other than works listed
+    in Section 1(f) below, which, by reason of the selection and
+    arrangement of their contents, constitute intellectual creations, in
+    which the Work is included in its entirety in unmodified form along
+    with one or more other contributions, each constituting separate and
+    independent works in themselves, which together are assembled into a
+    collective whole. A work that constitutes a Collection will not be
+    considered an Adaptation (as defined above) for the purposes of this
+    License.
+ c. "Distribute" means to make available to the public the original and
+    copies of the Work or Adaptation, as appropriate, through sale or
+    other transfer of ownership.
+ d. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+ e. "Original Author" means, in the case of a literary or artistic work,
+    the individual, individuals, entity or entities who created the Work
+    or if no individual or entity can be identified, the publisher; and in
+    addition (i) in the case of a performance the actors, singers,
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
+    play in, interpret or otherwise perform literary or artistic works or
+    expressions of folklore; (ii) in the case of a phonogram the producer
+    being the person or legal entity who first fixes the sounds of a
+    performance or other sounds; and, (iii) in the case of broadcasts, the
+    organization that transmits the broadcast.
+ f. "Work" means the literary and/or artistic work offered under the terms
+    of this License including without limitation any production in the
+    literary, scientific and artistic domain, whatever may be the mode or
+    form of its expression including digital form, such as a book,
+    pamphlet and other writing; a lecture, address, sermon or other work
+    of the same nature; a dramatic or dramatico-musical work; a
+    choreographic work or entertainment in dumb show; a musical
+    composition with or without words; a cinematographic work to which are
+    assimilated works expressed by a process analogous to cinematography;
+    a work of drawing, painting, architecture, sculpture, engraving or
+    lithography; a photographic work to which are assimilated works
+    expressed by a process analogous to photography; a work of applied
+    art; an illustration, map, plan, sketch or three-dimensional work
+    relative to geography, topography, architecture or science; a
+    performance; a broadcast; a phonogram; a compilation of data to the
+    extent it is protected as a copyrightable work; or a work performed by
+    a variety or circus performer to the extent it is not otherwise
+    considered a literary or artistic work.
+ g. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ h. "Publicly Perform" means to perform public recitations of the Work and
+    to communicate to the public those public recitations, by any means or
+    process, including by wire or wireless means or public digital
+    performances; to make available to the public Works in such a way that
+    members of the public may access these Works from a place and at a
+    place individually chosen by them; to perform the Work to the public
+    by any means or process and the communication to the public of the
+    performances of the Work, including by public digital performance; to
+    broadcast and rebroadcast the Work by any means including signs,
+    sounds or images.
+ i. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of
+    fixation and reproducing fixations of the Work, including storage of a
+    protected performance or phonogram in digital form or other electronic
+    medium.
+ ․
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable laws.
+ ․
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ ․
+ a. to Reproduce the Work, to incorporate the Work into one or more
+    Collections, and to Reproduce the Work as incorporated in the
+    Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+    including any translation in any medium, takes reasonable steps to
+    clearly label, demarcate or otherwise identify that changes were made
+    to the original Work. For example, a translation could be marked "The
+    original work was translated from English to Spanish," or a
+    modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+    in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+ ․
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme cannot be waived, the Licensor
+        reserves the exclusive right to collect such royalties for any
+        exercise by You of the rights granted under this License;
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme can be waived, the Licensor waives the
+        exclusive right to collect such royalties for any exercise by You
+        of the rights granted under this License; and,
+   iii. Voluntary License Schemes. The Licensor waives the right to
+        collect royalties, whether individually or, in the event that the
+        Licensor is a member of a collecting society that administers
+        voluntary licensing schemes, via that society, from any exercise
+        by You of the rights granted under this License.
+ ․
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights in
+ other media and formats. Subject to Section 8(f), all rights not expressly
+ granted by Licensor are hereby reserved.
+ ․
+ 4. Restrictions. The license granted in Section 3 above is expressly made
+ subject to and limited by the following restrictions:
+ ․
+ a. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms
+    on the Work that restrict the terms of this License or the ability of
+    the recipient of the Work to exercise the rights granted to that
+    recipient under the terms of the License. You may not sublicense the
+    Work. You must keep intact all notices that refer to this License and
+    to the disclaimer of warranties with every copy of the Work You
+    Distribute or Publicly Perform. When You Distribute or Publicly
+    Perform the Work, You may not impose any effective technological
+    measures on the Work that restrict the ability of a recipient of the
+    Work from You to exercise the rights granted to that recipient under
+    the terms of the License. This Section 4(a) applies to the Work as
+    incorporated in a Collection, but this does not require the Collection
+    apart from the Work itself to be made subject to the terms of this
+    License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit
+    as required by Section 4(b), as requested. If You create an
+    Adaptation, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Adaptation any credit as required by
+    Section 4(b), as requested.
+ b. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to
+    Section 4(a), keep intact all copyright notices for the Work and
+    provide, reasonable to the medium or means You are utilizing: (i) the
+    name of the Original Author (or pseudonym, if applicable) if supplied,
+    and/or if the Original Author and/or Licensor designate another party
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
+    attribution ("Attribution Parties") in Licensor's copyright notice,
+    terms of service or by other reasonable means, the name of such party
+    or parties; (ii) the title of the Work if supplied; (iii) to the
+    extent reasonably practicable, the URI, if any, that Licensor
+    specifies to be associated with the Work, unless such URI does not
+    refer to the copyright notice or licensing information for the Work;
+    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
+    a credit identifying the use of the Work in the Adaptation (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). The credit required by
+    this Section 4 (b) may be implemented in any reasonable manner;
+    provided, however, that in the case of a Adaptation or Collection, at
+    a minimum such credit will appear, if a credit for all contributing
+    authors of the Adaptation or Collection appears, then as part of these
+    credits and in a manner at least as prominent as the credits for the
+    other contributing authors. For the avoidance of doubt, You may only
+    use the credit required by this Section for the purpose of attribution
+    in the manner set out above and, by exercising Your rights under this
+    License, You may not implicitly or explicitly assert or imply any
+    connection with, sponsorship or endorsement by the Original Author,
+    Licensor and/or Attribution Parties, as appropriate, of You or Your
+    use of the Work, without the separate, express prior written
+    permission of the Original Author, Licensor and/or Attribution
+    Parties.
+ c. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any
+    Adaptations or Collections, You must not distort, mutilate, modify or
+    take other derogatory action in relation to the Work which would be
+    prejudicial to the Original Author's honor or reputation. Licensor
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
+    of the right granted in Section 3(b) of this License (the right to
+    make Adaptations) would be deemed to be a distortion, mutilation,
+    modification or other derogatory action prejudicial to the Original
+    Author's honor and reputation, the Licensor will waive or not assert,
+    as appropriate, this Section, to the fullest extent permitted by the
+    applicable national law, to enable You to reasonably exercise Your
+    right under Section 3(b) of this License (right to make Adaptations)
+    but not otherwise.
+ ․
+ 5. Representations, Warranties and Disclaimer
+ ․
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+ WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+ OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ ․
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ ․
+ 7. Termination
+ ․
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Adaptations or Collections
+    from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+ ․
+ 8. Miscellaneous
+ ․
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+    the Licensor offers to the recipient a license to the Work on the same
+    terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+    offers to the recipient a license to the original Work on the same
+    terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+    License were drafted utilizing the terminology of the Berne Convention
+    for the Protection of Literary and Artistic Works (as amended on
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+    and the Universal Copyright Convention (as revised on July 24, 1971).
+    These rights and subject matter take effect in the relevant
+    jurisdiction in which the License terms are sought to be enforced
+    according to the corresponding provisions of the implementation of
+    those treaty provisions in the applicable national law. If the
+    standard suite of rights granted under applicable copyright law
+    includes additional rights not granted under this License, such
+    additional rights are deemed to be included in the License; this
+    License is not intended to restrict the license of any rights under
+    applicable law.
+ ․
+ ․
+ Creative Commons Notice
+ ․
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+ ․
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, Creative Commons does not authorize
+    the use by either party of the trademark "Creative Commons" or any
+    related trademark or logo of Creative Commons without the prior
+    written consent of Creative Commons. Any permitted use will be in
+    compliance with Creative Commons' then-current trademark usage
+    guidelines, as may be published on its website or otherwise made
+    available upon request from time to time. For the avoidance of doubt,
+    this trademark restriction does not form part of this License.
+ ․
+    Creative Commons may be contacted at https://creativecommons.org/.
+
 License: CC0-1.0
- On Debian systems, the complete text of the Creative Commons CC0 1.0
- Universal license (CC0-1.0) can be found in
- "/usr/share/common-licenses/CC0-1.0".
+ Creative Commons Legal Code
+ ․
+ CC0 1.0 Universal
+ ․
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+ ․
+ Statement of Purpose
+ ․
+ The laws of most jurisdictions throughout the world automatically confer
+ exclusive Copyright and Related Rights (defined below) upon the creator
+ and subsequent owner(s) (each and all, an "owner") of an original work of
+ authorship and/or a database (each, a "Work").
+ ․
+ Certain owners wish to permanently relinquish those rights to a Work for
+ the purpose of contributing to a commons of creative, cultural and
+ scientific works ("Commons") that the public can reliably and without fear
+ of later claims of infringement build upon, modify, incorporate in other
+ works, reuse and redistribute as freely as possible in any form whatsoever
+ and for any purposes, including without limitation commercial purposes.
+ These owners may contribute to the Commons to promote the ideal of a free
+ culture and the further production of creative, cultural and scientific
+ works, or to gain reputation or greater distribution for their Work in
+ part through the use and efforts of others.
+ ․
+ For these and/or other purposes and motivations, and without any
+ expectation of additional consideration or compensation, the person
+ associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+ is an owner of Copyright and Related Rights in the Work, voluntarily
+ elects to apply CC0 to the Work and publicly distribute the Work under its
+ terms, with knowledge of his or her Copyright and Related Rights in the
+ Work and the meaning and intended legal effect of CC0 on those rights.
+ ․
+ 1. Copyright and Related Rights. A Work made available under CC0 may be
+ protected by copyright and related or neighboring rights ("Copyright and
+ Related Rights"). Copyright and Related Rights include, but are not
+ limited to, the following:
+ ․
+   i. the right to reproduce, adapt, distribute, perform, display,
+      communicate, and translate a Work;
+  ii. moral rights retained by the original author(s) and/or performer(s);
+ iii. publicity and privacy rights pertaining to a person's image or
+      likeness depicted in a Work;
+  iv. rights protecting against unfair competition in regards to a Work,
+      subject to the limitations in paragraph 4(a), below;
+   v. rights protecting the extraction, dissemination, use and reuse of data
+      in a Work;
+  vi. database rights (such as those arising under Directive 96/9/EC of the
+      European Parliament and of the Council of 11 March 1996 on the legal
+      protection of databases, and under any national implementation
+      thereof, including any amended or successor version of such
+      directive); and
+ vii. other similar, equivalent or corresponding rights throughout the
+      world based on applicable law or treaty, and any national
+      implementations thereof.
+ ․
+ 2. Waiver. To the greatest extent permitted by, but not in contravention
+ of, applicable law, Affirmer hereby overtly, fully, permanently,
+ irrevocably and unconditionally waives, abandons, and surrenders all of
+ Affirmer's Copyright and Related Rights and associated claims and causes
+ of action, whether now known or unknown (including existing as well as
+ future claims and causes of action), in the Work (i) in all territories
+ worldwide, (ii) for the maximum duration provided by applicable law or
+ treaty (including future time extensions), (iii) in any current or future
+ medium and for any number of copies, and (iv) for any purpose whatsoever,
+ including without limitation commercial, advertising or promotional
+ purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+ member of the public at large and to the detriment of Affirmer's heirs and
+ successors, fully intending that such Waiver shall not be subject to
+ revocation, rescission, cancellation, termination, or any other legal or
+ equitable action to disrupt the quiet enjoyment of the Work by the public
+ as contemplated by Affirmer's express Statement of Purpose.
+ ․
+ 3. Public License Fallback. Should any part of the Waiver for any reason
+ be judged legally invalid or ineffective under applicable law, then the
+ Waiver shall be preserved to the maximum extent permitted taking into
+ account Affirmer's express Statement of Purpose. In addition, to the
+ extent the Waiver is so judged Affirmer hereby grants to each affected
+ person a royalty-free, non transferable, non sublicensable, non exclusive,
+ irrevocable and unconditional license to exercise Affirmer's Copyright and
+ Related Rights in the Work (i) in all territories worldwide, (ii) for the
+ maximum duration provided by applicable law or treaty (including future
+ time extensions), (iii) in any current or future medium and for any number
+ of copies, and (iv) for any purpose whatsoever, including without
+ limitation commercial, advertising or promotional purposes (the
+ "License"). The License shall be deemed effective as of the date CC0 was
+ applied by Affirmer to the Work. Should any part of the License for any
+ reason be judged legally invalid or ineffective under applicable law, such
+ partial invalidity or ineffectiveness shall not invalidate the remainder
+ of the License, and in such case Affirmer hereby affirms that he or she
+ will not (i) exercise any of his or her remaining Copyright and Related
+ Rights in the Work or (ii) assert any associated claims and causes of
+ action with respect to the Work, in either case contrary to Affirmer's
+ express Statement of Purpose.
+ ․
+ 4. Limitations and Disclaimers.
+ ․
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1395,6 +1930,23 @@ License: GPL-3+KDE
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
+License: GPL-3+KDGantt
+ This file may be used under the terms of the GNU General Public
+ License versions 2.0 or 3.0 as published by the Free Software
+ Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+ included in the packaging of this file.  Alternatively you may (at
+ your option) use any later version of the GNU General Public
+ License if such license has been publicly approved by
+ Klarälvdalens Datakonsult AB (or its successors, if any).
+ ․
+ This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+ INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE. Klarälvdalens Datakonsult AB reserves all rights
+ not expressly granted herein.
+ ․
+ This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -1409,6 +1961,19 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General Public
  License Version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ ․
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ ․
+ On Debian systems, the complete text of the GNU General Public
+ License Version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -1491,9 +2056,749 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General Public
  License Version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
 
+License: MPL-1.0
+ MOZILLA PUBLIC LICENSE
+ Version 1.0
+ ․
+ 1. Definitions.
+ ․
+    1.1. ``Contributor'' means each entity that creates or contributes to
+    the creation of Modifications.
+ ․
+    1.2. ``Contributor Version'' means the combination of the Original
+    Code, prior Modifications used by a Contributor, and the Modifications
+    made by that particular Contributor.
+ ․
+    1.3. ``Covered Code'' means the Original Code or Modifications or the
+    combination of the Original Code and Modifications, in each case
+    including portions thereof.
+ ․
+    1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+    accepted in the software development community for the electronic
+    transfer of data.
+ ․
+    1.5. ``Executable'' means Covered Code in any form other than Source
+    Code.
+ ․
+    1.6. ``Initial Developer'' means the individual or entity identified as
+    the Initial Developer in the Source Code notice required by Exhibit A.
+ ․
+    1.7. ``Larger Work'' means a work which combines Covered Code or
+    portions thereof with code not governed by the terms of this License.
+ ․
+    1.8. ``License'' means this document.
+ ․
+    1.9. ``Modifications'' means any addition to or deletion from the
+    substance or structure of either the Original Code or any previous
+    Modifications. When Covered Code is released as a series of files, a
+    Modification is:
+ ․
+        A. Any addition to or deletion from the contents of a file
+        containing Original Code or previous Modifications.
+ ․
+        B. Any new file that contains any part of the Original Code or
+        previous Modifications.
+ ․
+    1.10. ``Original Code'' means Source Code of computer software code
+    which is described in the Source Code notice required by Exhibit A as
+    Original Code, and which, at the time of its release under this License
+    is not already Covered Code governed by this License.
+ ․
+    1.11. ``Source Code'' means the preferred form of the Covered Code for
+    making modifications to it, including all modules it contains, plus any
+    associated interface definition files, scripts used to control
+    compilation and installation of an Executable, or a list of source code
+    differential comparisons against either the Original Code or another
+    well known, available Covered Code of the Contributor's choice. The
+    Source Code can be in a compressed or archival form, provided the
+    appropriate decompression or de-archiving software is widely available
+    for no charge.
+ ․
+    1.12. ``You'' means an individual or a legal entity exercising rights
+    under, and complying with all of the terms of, this License or a future
+    version of this License issued under Section 6.1. For legal entities,
+    ``You'' includes any entity which controls, is controlled by, or is
+    under common control with You. For purposes of this definition,
+    ``control'' means (a) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (b) ownership of fifty percent (50%) or more of the
+    outstanding shares or beneficial ownership of such entity.
+ ․
+ 2. Source Code License.
+ ․
+    2.1. The Initial Developer Grant.
+    The Initial Developer hereby grants You a world-wide, royalty-free,
+    non-exclusive license, subject to third party intellectual property
+    claims:
+ ․
+        (a) to use, reproduce, modify, display, perform, sublicense and
+        distribute the Original Code (or portions thereof) with or without
+        Modifications, or as part of a Larger Work; and
+ ․
+        (b) under patents now or hereafter owned or controlled by Initial
+    Developer, to make, have made, use and sell (``Utilize'') the
+    Original Code (or portions thereof), but solely to the extent that
+    any such patent is reasonably necessary to enable You to Utilize
+    the Original Code (or portions thereof) and not to any greater
+    extent that may be necessary to Utilize further Modifications or
+    combinations.
+ ․
+    2.2. Contributor Grant.
+    Each Contributor hereby grants You a world-wide, royalty-free,
+    non-exclusive license, subject to third party intellectual property
+    claims:
+ ․
+        (a) to use, reproduce, modify, display, perform, sublicense and
+        distribute the Modifications created by such Contributor (or
+        portions thereof) either on an unmodified basis, with other
+        Modifications, as Covered Code or as part of a Larger Work; and
+ ․
+        (b) under patents now or hereafter owned or controlled by
+        Contributor, to Utilize the Contributor Version (or portions
+        thereof), but solely to the extent that any such patent is
+        reasonably necessary to enable You to Utilize the Contributor
+        Version (or portions thereof), and not to any greater extent that
+        may be necessary to Utilize further Modifications or combinations.
+ ․
+ ․
+ ․
+ 3. Distribution Obligations.
+ ․
+    3.1. Application of License.
+    The Modifications which You create or to which You contribute are
+    governed by the terms of this License, including without limitation
+    Section 2.2. The Source Code version of Covered Code may be distributed
+    only under the terms of this License or a future version of this
+    License released under Section 6.1, and You must include a copy of this
+    License with every copy of the Source Code You distribute. You may not
+    offer or impose any terms on any Source Code version that alters or
+    restricts the applicable version of this License or the recipients'
+    rights hereunder. However, You may include an additional document
+    offering the additional rights described in Section 3.5.
+ ․
+    3.2. Availability of Source Code.
+    Any Modification which You create or to which You contribute must be
+    made available in Source Code form under the terms of this License
+    either on the same media as an Executable version or via an accepted
+    Electronic Distribution Mechanism to anyone to whom you made an
+    Executable version available; and if made available via Electronic
+    Distribution Mechanism, must remain available for at least twelve (12)
+    months after the date it initially became available, or at least six
+    (6) months after a subsequent version of that particular Modification
+    has been made available to such recipients. You are responsible for
+    ensuring that the Source Code version remains available even if the
+    Electronic Distribution Mechanism is maintained by a third party.
+ ․
+    3.3. Description of Modifications.
+    You must cause all Covered Code to which you contribute to contain a
+    file documenting the changes You made to create that Covered Code and
+    the date of any change. You must include a prominent statement that the
+    Modification is derived, directly or indirectly, from Original Code
+    provided by the Initial Developer and including the name of the Initial
+    Developer in (a) the Source Code, and (b) in any notice in an
+    Executable version or related documentation in which You describe the
+    origin or ownership of the Covered Code.
+ ․
+    3.4. Intellectual Property Matters
+ ․
+        (a) Third Party Claims.
+        If You have knowledge that a party claims an intellectual property
+        right in particular functionality or code (or its utilization under
+        this License), you must include a text file with the source code
+        distribution titled ``LEGAL'' which describes the claim and the
+        party making the claim in sufficient detail that a recipient will
+        know whom to contact. If you obtain such knowledge after You make
+        Your Modification available as described in Section 3.2, You shall
+        promptly modify the LEGAL file in all copies You make available
+        thereafter and shall take other steps (such as notifying
+        appropriate mailing lists or newsgroups) reasonably calculated to
+        inform those who received the Covered Code that new knowledge has
+        been obtained.
+ ․
+        (b) Contributor APIs.
+        If Your Modification is an application programming interface and
+        You own or control patents which are reasonably necessary to
+        implement that API, you must also include this information in the
+        LEGAL file.
+ ․
+    3.5. Required Notices.
+    You must duplicate the notice in Exhibit A in each file of the Source
+    Code, and this License in any documentation for the Source Code, where
+    You describe recipients' rights relating to Covered Code. If You
+    created one or more Modification(s), You may add your name as a
+    Contributor to the notice described in Exhibit A. If it is not possible
+    to put such notice in a particular Source Code file due to its
+    structure, then you must include such notice in a location (such as a
+    relevant directory file) where a user would be likely to look for such
+    a notice. You may choose to offer, and to charge a fee for, warranty,
+    support, indemnity or liability obligations to one or more recipients
+    of Covered Code. However, You may do so only on Your own behalf, and
+    not on behalf of the Initial Developer or any Contributor. You must
+    make it absolutely clear than any such warranty, support, indemnity or
+    liability obligation is offered by You alone, and You hereby agree to
+    indemnify the Initial Developer and every Contributor for any liability
+    incurred by the Initial Developer or such Contributor as a result of
+    warranty, support, indemnity or liability terms You offer.
+ ․
+    3.6. Distribution of Executable Versions.
+    You may distribute Covered Code in Executable form only if the
+    requirements of Section 3.1-3.5 have been met for that Covered Code,
+    and if You include a notice stating that the Source Code version of the
+    Covered Code is available under the terms of this License, including a
+    description of how and where You have fulfilled the obligations of
+    Section 3.2. The notice must be conspicuously included in any notice in
+    an Executable version, related documentation or collateral in which You
+    describe recipients' rights relating to the Covered Code. You may
+    distribute the Executable version of Covered Code under a license of
+    Your choice, which may contain terms different from this License,
+    provided that You are in compliance with the terms of this License and
+    that the license for the Executable version does not attempt to limit
+    or alter the recipient's rights in the Source Code version from the
+    rights set forth in this License. If You distribute the Executable
+    version under a different license You must make it absolutely clear
+    that any terms which differ from this License are offered by You alone,
+    not by the Initial Developer or any Contributor. You hereby agree to
+    indemnify the Initial Developer and every Contributor for any liability
+    incurred by the Initial Developer or such Contributor as a result of
+    any such terms You offer.
+ ․
+    3.7. Larger Works.
+    You may create a Larger Work by combining Covered Code with other code
+    not governed by the terms of this License and distribute the Larger
+    Work as a single product. In such a case, You must make sure the
+    requirements of this License are fulfilled for the Covered Code.
+ ․
+ ․
+ ․
+ ․
+ ․
+ 4. Inability to Comply Due to Statute or Regulation.
+ ․
+    If it is impossible for You to comply with any of the terms of this
+    License with respect to some or all of the Covered Code due to statute
+    or regulation then You must: (a) comply with the terms of this License
+    to the maximum extent possible; and (b) describe the limitations and
+    the code they affect. Such description must be included in the LEGAL
+    file described in Section 3.4 and must be included with all
+    distributions of the Source Code. Except to the extent prohibited by
+    statute or regulation, such description must be sufficiently detailed
+    for a recipient of ordinary skill to be able to understand it.
+ ․
+ 5. Application of this License.
+ ․
+    This License applies to code to which the Initial Developer has
+    attached the notice in Exhibit A, and to related Covered Code.
+ ․
+ 6. Versions of the License.
+ ․
+    6.1. New Versions.
+    Netscape Communications Corporation (``Netscape'') may publish revised
+    and/or new versions of the License from time to time. Each version will
+    be given a distinguishing version number.
+ ․
+    6.2. Effect of New Versions.
+    Once Covered Code has been published under a particular version of the
+    License, You may always continue to use it under the terms of that
+    version. You may also choose to use such Covered Code under the terms
+    of any subsequent version of the License published by Netscape. No one
+    other than Netscape has the right to modify the terms applicable to
+    Covered Code created under this License.
+ ․
+    6.3. Derivative Works.
+    If you create or use a modified version of this License (which you may
+    only do in order to apply it to code which is not already Covered Code
+    governed by this License), you must (a) rename Your license so that the
+    phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+    any confusingly similar phrase do not appear anywhere in your license
+    and (b) otherwise make it clear that your version of the license
+    contains terms which differ from the Mozilla Public License and
+    Netscape Public License. (Filling in the name of the Initial Developer,
+    Original Code or Contributor in the notice described in Exhibit A shall
+    not of themselves be deemed to be modifications of this License.)
+ ․
+ ․
+ 7. DISCLAIMER OF WARRANTY.
+ ․
+    COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+    WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+    DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+    THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+    IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+    YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+    COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+    ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ ․
+ 8. TERMINATION.
+ ․
+    This License and the rights granted hereunder will terminate
+    automatically if You fail to comply with terms herein and fail to cure
+    such breach within 30 days of becoming aware of the breach. All
+    sublicenses to the Covered Code which are properly granted shall
+    survive any termination of this License. Provisions which, by their
+    nature, must remain in effect beyond the termination of this License
+    shall survive.
+ ․
+ 9. LIMITATION OF LIABILITY.
+ ․
+    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
+    DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+    OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+    PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+    OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+    GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+    ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+    BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+    LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+    RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+    PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+    EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+    EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+ ․
+ 10. U.S. GOVERNMENT END USERS.
+ ․
+    The Covered Code is a ``commercial item,'' as that term is defined in
+    48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
+    software'' and ``commercial computer software documentation,'' as such
+    terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+    C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+    all U.S. Government End Users acquire Covered Code with only those
+    rights set forth herein.
+ ․
+ 11. MISCELLANEOUS.
+ ․
+    This License represents the complete agreement concerning subject
+    matter hereof. If any provision of this License is held to be
+    unenforceable, such provision shall be reformed only to the extent
+    necessary to make it enforceable. This License shall be governed by
+    California law provisions (except to the extent applicable law, if any,
+    provides otherwise), excluding its conflict-of-law provisions. With
+    respect to disputes in which at least one party is a citizen of, or an
+    entity chartered or registered to do business in, the United States of
+    America: (a) unless otherwise agreed in writing, all disputes relating
+    to this License (excepting any dispute relating to intellectual
+    property rights) shall be subject to final and binding arbitration,
+    with the losing party paying all costs of arbitration; (b) any
+    arbitration relating to this Agreement shall be held in Santa Clara
+    County, California, under the auspices of JAMS/EndDispute; and (c) any
+    litigation relating to this Agreement shall be subject to the
+    jurisdiction of the Federal Courts of the Northern District of
+    California, with venue lying in Santa Clara County, California, with
+    the losing party responsible for costs, including without limitation,
+    court costs and reasonable attorneys fees and expenses. The application
+    of the United Nations Convention on Contracts for the International
+    Sale of Goods is expressly excluded. Any law or regulation which
+    provides that the language of a contract shall be construed against the
+    drafter shall not apply to this License.
+ ․
+ 12. RESPONSIBILITY FOR CLAIMS.
+ ․
+    Except in cases where another Contributor has failed to comply with
+    Section 3.4, You are responsible for damages arising, directly or
+    indirectly, out of Your utilization of rights under this License, based
+    on the number of copies of Covered Code you made available, the
+    revenues you received from utilizing such rights, and other relevant
+    factors. You agree to work with affected parties to distribute
+    responsibility on an equitable basis.
+ ․
+ EXHIBIT A.
+ ․
+    ``The contents of this file are subject to the Mozilla Public License
+    Version 1.0 (the "License"); you may not use this file except in
+    compliance with the License. You may obtain a copy of the License at
+    http://www.mozilla.org/MPL/
+ ․
+    Software distributed under the License is distributed on an "AS IS"
+    basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+    License for the specific language governing rights and limitations
+    under the License.
+ ․
+    The Original Code is ______________________________________.
+ ․
+    The Initial Developer of the Original Code is ________________________.
+    Portions created by ______________________
+      are Copyright (C) ______ _______________________.
+    All Rights Reserved.
+ ․
+    Contributor(s): ______________________________________.''
+ ․
+
 License: MPL-2.0
- On Debian systems, the complete text of the Mozilla Public License
- Version 2.0 can be found in "/usr/share/common-licenses/MPL-2.0".
+ Mozilla Public License Version 2.0
+ ==================================
+ ․
+ 1. Definitions
+ --------------
+ ․
+ 1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+ ․
+ 1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+ ․
+ 1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+ ․
+ 1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+ ․
+ 1.5. "Incompatible With Secondary Licenses"
+    means
+ ․
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+ ․
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+ ․
+ 1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+ ․
+ 1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+ ․
+ 1.8. "License"
+    means this document.
+ ․
+ 1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+ ․
+ 1.10. "Modifications"
+    means any of the following:
+ ․
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+ ․
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+ ․
+ 1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+ ․
+ 1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+ ․
+ 1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+ ․
+ 1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+ ․
+ 2. License Grants and Conditions
+ --------------------------------
+ ․
+ 2.1. Grants
+ ․
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+ ․
+ (a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+ ․
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+ ․
+ 2.2. Effective Date
+ ․
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+ ․
+ 2.3. Limitations on Grant Scope
+ ․
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+ ․
+ (a) for any code that a Contributor has removed from Covered Software;
+    or
+ ․
+ (b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+ ․
+ (c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+ ․
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+ ․
+ 2.4. Subsequent Licenses
+ ․
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+ ․
+ 2.5. Representation
+ ․
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+ ․
+ 2.6. Fair Use
+ ․
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+ ․
+ 2.7. Conditions
+ ․
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+ ․
+ 3. Responsibilities
+ -------------------
+ ․
+ 3.1. Distribution of Source Form
+ ․
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+ ․
+ 3.2. Distribution of Executable Form
+ ․
+ If You distribute Covered Software in Executable Form then:
+ ․
+ (a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+ ․
+ (b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+ ․
+ 3.3. Distribution of a Larger Work
+ ․
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+ ․
+ 3.4. Notices
+ ․
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+ ․
+ 3.5. Application of Additional Terms
+ ․
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+ ․
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+ ․
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+ ․
+ 5. Termination
+ --------------
+ ․
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+ ․
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+ ․
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+ ․
+ ************************************************************************
+ *                                                                      *
+ *  6. Disclaimer of Warranty                                           *
+ *  -------------------------                                           *
+ *                                                                      *
+ *  Covered Software is provided under this License on an "as is"       *
+ *  basis, without warranty of any kind, either expressed, implied, or  *
+ *  statutory, including, without limitation, warranties that the       *
+ *  Covered Software is free of defects, merchantable, fit for a        *
+ *  particular purpose or non-infringing. The entire risk as to the     *
+ *  quality and performance of the Covered Software is with You.        *
+ *  Should any Covered Software prove defective in any respect, You     *
+ *  (not any Contributor) assume the cost of any necessary servicing,   *
+ *  repair, or correction. This disclaimer of warranty constitutes an   *
+ *  essential part of this License. No use of any Covered Software is   *
+ *  authorized under this License except under this disclaimer.         *
+ *                                                                      *
+ ************************************************************************
+ ․
+ ************************************************************************
+ *                                                                      *
+ *  7. Limitation of Liability                                          *
+ *  --------------------------                                          *
+ *                                                                      *
+ *  Under no circumstances and under no legal theory, whether tort      *
+ *  (including negligence), contract, or otherwise, shall any           *
+ *  Contributor, or anyone who distributes Covered Software as          *
+ *  permitted above, be liable to You for any direct, indirect,         *
+ *  special, incidental, or consequential damages of any character      *
+ *  including, without limitation, damages for lost profits, loss of    *
+ *  goodwill, work stoppage, computer failure or malfunction, or any    *
+ *  and all other commercial damages or losses, even if such party      *
+ *  shall have been informed of the possibility of such damages. This   *
+ *  limitation of liability shall not apply to liability for death or   *
+ *  personal injury resulting from such party's negligence to the       *
+ *  extent applicable law prohibits such limitation. Some               *
+ *  jurisdictions do not allow the exclusion or limitation of           *
+ *  incidental or consequential damages, so this exclusion and          *
+ *  limitation may not apply to You.                                    *
+ *                                                                      *
+ ************************************************************************
+ ․
+ 8. Litigation
+ -------------
+ ․
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+ ․
+ 9. Miscellaneous
+ ----------------
+ ․
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+ ․
+ 10. Versions of the License
+ ---------------------------
+ ․
+ 10.1. New Versions
+ ․
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+ ․
+ 10.2. Effect of New Versions
+ ․
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+ ․
+ 10.3. Modified Versions
+ ․
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+ ․
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+ ․
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+ ․
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+ ․
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ ․
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+ ․
+ You may add additional accurate notices of copyright ownership.
+ ․
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+ ․
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
 
 License: OASIS
  All capitalized terms in the following text have the meanings assigned to them
@@ -1521,6 +2826,14 @@ License: OASIS
  INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
  FITNESS FOR A PARTICULAR PURPOSE.
 
+License: Public-Domain-SQLite
+ The author disclaims copyright to this source code. In place of
+ a legal notice, here is a blessing:
+ ․
+    May you do good and not evil.
+    May you find forgiveness for yourself and forgive others.
+    May you share freely, never taking more than you give.
+
 License: Public-Domain
  No copyright is claimed.
  This code is in the public domain; do with it what you wish.
diff --git a/debian/karbon.install b/debian/karbon.install
index 4bebe21..c8c8464 100644
--- a/debian/karbon.install
+++ b/debian/karbon.install
@@ -4,13 +4,13 @@ usr/lib/*/libkarboncommon.so.1*
 usr/lib/*/libkarbonui.so.1*
 usr/lib/*/libkdeinit5_karbon.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_eps2svgai.so
+usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_eps2svgai.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_karbon1x2karbon.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_karbon2image.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_karbon2svg.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_karbon2wmf.so
-usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_pdf2odg.so
-usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_pdf2svg.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_svg2karbon.so
+usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_vsdx2odg.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wmf2svg.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wpg2svg.so
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wps2odt.so
@@ -34,9 +34,6 @@ usr/share/kservices5/karbon_wpg_thumbnail.desktop
 usr/share/kservices5/karbon_xfig_thumbnail.desktop
 usr/share/kxmlgui5/karbon/karbon.rc
 usr/share/kxmlgui5/karbon/karbon_readonly.rc
-usr/share/locale/*/LC_MESSAGES/KarbonFilterEffects.mo
-usr/share/locale/*/LC_MESSAGES/KarbonTools.mo
-usr/share/locale/*/LC_MESSAGES/karbon.mo
 usr/share/metainfo/org.kde.karbon.appdata.xml
 usr/share/templates/.source/Illustration.odg
 usr/share/templates/Illustration.desktop
diff --git a/debian/karbon.lintian-overrides b/debian/karbon.lintian-overrides
index 2d7a723..0293554 100644
--- a/debian/karbon.lintian-overrides
+++ b/debian/karbon.lintian-overrides
@@ -1,5 +1,2 @@
-# private library
 no-symbols-control-file *
-# private library
 package-name-doesnt-match-sonames *
-shared-library-lacks-version usr/lib/*/libkdeinit5_karbon.so libkdeinit5_karbon.so
diff --git a/debian/karbon.manpages b/debian/karbon.manpages
new file mode 100644
index 0000000..e5f7901
--- /dev/null
+++ b/debian/karbon.manpages
@@ -0,0 +1 @@
+debian/man/karbon.1
diff --git a/debian/man/braindump.1 b/debian/man/braindump.1
new file mode 100644
index 0000000..d9863ea
--- /dev/null
+++ b/debian/man/braindump.1
@@ -0,0 +1,83 @@
+.\" Man page generated from reStructeredText.
+.
+.TH BRAINDUMP 1 "11 septembre 2011" "" "office"
+.SH NAME
+Braindump \- Directly from your brain to the computer
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+braindump [Qt\-options] [KDE\-options]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+BrainDump is a tool to help to organize the ideas from your brain to your computer.
+.SH OPTIONS
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/braindump\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/braindump\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/braindump.rst b/debian/man/braindump.rst
new file mode 100644
index 0000000..d6850a3
--- /dev/null
+++ b/debian/man/braindump.rst
@@ -0,0 +1,45 @@
+=========
+Braindump 
+=========
+
+-----------------------------------------
+Directly from your brain to the computer
+-----------------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  braindump [Qt-options] [KDE-options]
+
+Description
+===========
+
+BrainDump is a tool to help to organize the ideas from your brain to your computer.
+
+Options
+=======
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/braindump** (either enter this URL into Konqueror, or run **khelpcenter** *help:/braindump*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligra.1 b/debian/man/calligra.1
new file mode 100644
index 0000000..f14515b
--- /dev/null
+++ b/debian/man/calligra.1
@@ -0,0 +1,94 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRA 1 "11 septembre 2011" "" "office"
+.SH NAME
+Calligra \- Calligra Document Opener
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+calligra [Qt\-options] [KDE\-options] [options] FILES
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Calligra is an integrated office suite for KDE. It offers a word processor,
+a spreadsheet, a presentation program, graphics tools, and more.
+.SH OPTIONS
+.sp
+\fBfile\fP  File to open
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.sp
+Options:
+.INDENT 0.0
+.TP
+.B \-\-apps
+.
+Lists names of all available Calligra applications
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligra\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligra\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligra.rst b/debian/man/calligra.rst
new file mode 100644
index 0000000..69b39bf
--- /dev/null
+++ b/debian/man/calligra.rst
@@ -0,0 +1,53 @@
+=========
+Calligra 
+=========
+
+------------------------
+Calligra Document Opener
+------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligra [Qt-options] [KDE-options] [options] FILES
+
+Description
+===========
+
+Calligra is an integrated office suite for KDE. It offers a word processor,
+a spreadsheet, a presentation program, graphics tools, and more.
+
+
+Options
+=======
+
+**file**  File to open
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+Options:
+
+--apps                    Lists names of all available Calligra applications
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligra** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligra*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraactive.1 b/debian/man/calligraactive.1
new file mode 100644
index 0000000..a6acaee
--- /dev/null
+++ b/debian/man/calligraactive.1
@@ -0,0 +1,78 @@
+.\" Man page generated from reStructuredText.
+.
+.TH CALLIGRAACTIVE 1 "13 juillet 2013" "" "office"
+.SH NAME
+CalligraActive \- Bring Calligra to the smarphones and Tablets
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+calligraactive [Qt\-options] [KDE\-options] [file]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Calligra Active aims to port the Calligra Office suite to the tablets and smartphones, using the QML technology.
+.SH OPTIONS
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v,  \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.UNINDENT
+.sp
+Arguments:
+.sp
+file                      File to open
+.SH SEE ALSO
+.sp
+More detailed user documentation is available on the website \fI\%http://calligra.org\fP.
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.
diff --git a/debian/man/calligraactive.rst b/debian/man/calligraactive.rst
new file mode 100644
index 0000000..fb370c8
--- /dev/null
+++ b/debian/man/calligraactive.rst
@@ -0,0 +1,48 @@
+===============
+CalligraActive 
+===============
+
+---------------------------------------------
+Bring Calligra to the smarphones and Tablets
+---------------------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligraactive [Qt-options] [KDE-options] [file]
+
+Description
+===========
+
+Calligra Active aims to port the Calligra Office suite to the tablets and smartphones, using the QML technology.
+
+Options
+=======
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+Arguments:
+
+file                      File to open
+
+SEE ALSO
+=========
+
+More detailed user documentation is available on the website http://calligra.org.
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraauthor.1 b/debian/man/calligraauthor.1
new file mode 100644
index 0000000..4562a6a
--- /dev/null
+++ b/debian/man/calligraauthor.1
@@ -0,0 +1,81 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRAWORDS 1 "13 mai 2013" "" "office"
+.SH NAME
+CalligraWords \- Calligra Word Processor
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+calligrawords [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.SH DESCRIPTION
+.sp
+Calligra Author is a specialized tool for serious writers aiming to become what
+Krita is for painters. The application will support a writer in the process of
+creating an eBook from concept to publication.
+.SH OPTIONS
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-calligra
+Show Calligra specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v,  \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.UNINDENT
+.sp
+Arguments:
+.sp
+\fBfile\fP                  File to open
+.SH SEE ALSO
+.sp
+More detailed user documentation is available at \fI\%http://www.calligra.org/news/calligra\-announces\-author/\fP
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligraauthor.rst b/debian/man/calligraauthor.rst
new file mode 100644
index 0000000..8a64aa5
--- /dev/null
+++ b/debian/man/calligraauthor.rst
@@ -0,0 +1,52 @@
+=============
+CalligraWords
+=============
+
+------------------------
+Calligra Word Processor
+------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+calligrawords [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+Calligra Author is a specialized tool for serious writers aiming to become what
+Krita is for painters. The application will support a writer in the process of 
+creating an eBook from concept to publication.
+
+Options
+=======
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-calligra           Show Calligra specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+Arguments:
+
+**file**                  File to open
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available at http://www.calligra.org/news/calligra-announces-author/
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraconverter.1 b/debian/man/calligraconverter.1
new file mode 100644
index 0000000..7fbe906
--- /dev/null
+++ b/debian/man/calligraconverter.1
@@ -0,0 +1,102 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRACONVERTER 1 "13 mai 2013" "" "office"
+.SH NAME
+CalligraConverter \- Calligra Document Converter
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+calligraconverter [Qt\-options] [KDE\-options] in out
+.SH DESCRIPTION
+.sp
+Legacy integer arithmetics implementation
+.SH OPTIONS
+.sp
+Arguments:
+.sp
+\fBin\fP                        Input file
+\fBout\fP                       Output file
+.sp
+Options:
+.INDENT 0.0
+.TP
+.B \-\-backup
+Make a backup of the destination file
+.TP
+.B \-\-batch
+Batch mode: do not show dialogs
+.TP
+.B \-\-interactive
+Interactive mode: show dialogs (default)
+.TP
+.BI \-\-mimetype \ <mime>
+Mimetype of the output file
+.TP
+.BI \-\-print\-orientation \ <name>
+The print orientation. This could be either Portrait or Landscape.
+.TP
+.BI \-\-print\-papersize \ <name>
+The paper size. A4, Legal, Letter, ...
+.TP
+.BI \-\-print\-margin \ <size>
+The size of the paper margin. By default this is 0.2.
+.UNINDENT
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v,  \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligra\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligra\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligraconverter.rst b/debian/man/calligraconverter.rst
new file mode 100644
index 0000000..c44d05c
--- /dev/null
+++ b/debian/man/calligraconverter.rst
@@ -0,0 +1,59 @@
+==================
+CalligraConverter
+==================
+
+----------------------------
+Calligra Document Converter
+----------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+Synopsis
+========
+
+calligraconverter [Qt-options] [KDE-options] in out 
+
+Description
+===========
+
+Legacy integer arithmetics implementation 
+
+Options
+=======
+
+Arguments:
+
+**in**                        Input file
+**out**                       Output file
+
+Options:
+
+--backup                    Make a backup of the destination file
+--batch                     Batch mode: do not show dialogs
+--interactive               Interactive mode: show dialogs (default)
+--mimetype <mime>           Mimetype of the output file
+--print-orientation <name>  The print orientation. This could be either Portrait or Landscape.
+--print-papersize <name>    The paper size. A4, Legal, Letter, ...
+--print-margin <size>       The size of the paper margin. By default this is 0.2.
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligra** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligra*).
+
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraflow.1 b/debian/man/calligraflow.1
new file mode 100644
index 0000000..fa09d04
--- /dev/null
+++ b/debian/man/calligraflow.1
@@ -0,0 +1,87 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRAFLOW 1 "11 septembre 2011" "" "office"
+.SH NAME
+CalligraFlow \- Calligra Flowchart And Diagram Tool
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+calligraflow [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Flow is a flowcharting program that offers basic flowcharting abilities,
+but with a twist.  Objects are scriptable, and a backend plugin system
+offers the ability to make objects do just about anything.
+.SH OPTIONS
+.sp
+\fBfile\fP  File to open
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligraflow\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligraflow\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligraflow.rst b/debian/man/calligraflow.rst
new file mode 100644
index 0000000..27214b2
--- /dev/null
+++ b/debian/man/calligraflow.rst
@@ -0,0 +1,49 @@
+=============
+CalligraFlow 
+=============
+
+-----------------------------------
+Calligra Flowchart And Diagram Tool
+-----------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligraflow [Qt-options] [KDE-options] [Calligra-options] [file] 
+
+Description
+===========
+
+Flow is a flowcharting program that offers basic flowcharting abilities,
+but with a twist.  Objects are scriptable, and a backend plugin system
+offers the ability to make objects do just about anything.
+
+Options
+=======
+
+**file**  File to open
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligraflow** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligraflow*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraplan.1 b/debian/man/calligraplan.1
new file mode 100644
index 0000000..24f1c87
--- /dev/null
+++ b/debian/man/calligraplan.1
@@ -0,0 +1,86 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRAPLAN 1 "11 septembre 2011" "" "office"
+.SH NAME
+CalligraPlan \- KDE Project Planning and Management Tool
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+calligraplan [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Plan is a project management application, allowing for the planning and
+scheduling of projects. It is the successor of KPlato.
+.SH OPTIONS
+.sp
+\fBfile\fP  File to open
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligraplan\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligraplan\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligraplan.rst b/debian/man/calligraplan.rst
new file mode 100644
index 0000000..8debde6
--- /dev/null
+++ b/debian/man/calligraplan.rst
@@ -0,0 +1,48 @@
+============
+CalligraPlan 
+============
+
+----------------------------------------
+KDE Project Planning and Management Tool
+----------------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligraplan [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+Plan is a project management application, allowing for the planning and
+scheduling of projects. It is the successor of KPlato.
+
+Options
+=======
+
+**file**  File to open
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligraplan** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligraplan*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraplanwork.1 b/debian/man/calligraplanwork.1
new file mode 100644
index 0000000..c52508d
--- /dev/null
+++ b/debian/man/calligraplanwork.1
@@ -0,0 +1,85 @@
+.\" Man page generated from reStructeredText.
+.
+.TH PLANWORK 1 "11 septembre 2011" "" "office"
+.SH NAME
+PlanWork \- Work Package handler for the Plan Project Planning Tool
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+calligraplanwork [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+PlanWork is part of calligraplan.
+.SH OPTIONS
+.sp
+\fBfile\fP  File to open
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligraplan\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligraplan\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligraplanwork.rst b/debian/man/calligraplanwork.rst
new file mode 100644
index 0000000..5c59a22
--- /dev/null
+++ b/debian/man/calligraplanwork.rst
@@ -0,0 +1,47 @@
+========
+PlanWork 
+========
+
+-------------------------------------------------------
+Work Package handler for the Plan Project Planning Tool
+-------------------------------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligraplanwork [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+PlanWork is part of calligraplan.
+
+Options
+=======
+
+**file**  File to open
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligraplan** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligraplan*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligrasheets.1 b/debian/man/calligrasheets.1
new file mode 100644
index 0000000..6506dc1
--- /dev/null
+++ b/debian/man/calligrasheets.1
@@ -0,0 +1,87 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRATABLES 1 "11 septembre 2011" "" "office"
+.SH NAME
+CalligraTables \- Calligra Spreadsheet Application
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+calligrasheets [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Tables is a powerful spreadsheet application.  It is scriptable and
+provides both table\-oriented sheets and support for complex mathematical
+formulae and statistics. It is the sucessor of KSpread.
+.SH OPTIONS
+.sp
+\fBfile\fP  File to open
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligrasheets\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligrasheets\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligrasheets.rst b/debian/man/calligrasheets.rst
new file mode 100644
index 0000000..e3787c2
--- /dev/null
+++ b/debian/man/calligrasheets.rst
@@ -0,0 +1,49 @@
+==============
+CalligraTables
+==============
+
+--------------------------------
+Calligra Spreadsheet Application
+--------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligrasheets [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+Tables is a powerful spreadsheet application.  It is scriptable and
+provides both table-oriented sheets and support for complex mathematical
+formulae and statistics. It is the sucessor of KSpread.
+
+Options
+=======
+
+**file**  File to open
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligrasheets** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligrasheets*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligrastage.1 b/debian/man/calligrastage.1
new file mode 100644
index 0000000..7dfcda8
--- /dev/null
+++ b/debian/man/calligrastage.1
@@ -0,0 +1,89 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRASTAGE 1 "11 septembre 2011" "" "office"
+.SH NAME
+CalligraStage \- Calligra Presentation Tool
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.INDENT 0.0
+.INDENT 3.5
+.sp
+calligrastage [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.UNINDENT
+.UNINDENT
+.SH DESCRIPTION
+.sp
+Stage is an easy to use yet still flexible presentation application. You can
+easily create presentations containing a rich variety of elements, from
+graphics to text, from charts to images. Stage is extensible through a
+plugin system, so it is easy to add new effects, new content elements or even
+new ways of managing your presentation.
+.SH OPTIONS
+.sp
+\fBfile\fP  File to open
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligrastage\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligrastage\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligrastage.rst b/debian/man/calligrastage.rst
new file mode 100644
index 0000000..04aaf4c
--- /dev/null
+++ b/debian/man/calligrastage.rst
@@ -0,0 +1,51 @@
+==============
+CalligraStage
+==============
+
+--------------------------
+Calligra Presentation Tool
+--------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+  calligrastage [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+Stage is an easy to use yet still flexible presentation application. You can
+easily create presentations containing a rich variety of elements, from
+graphics to text, from charts to images. Stage is extensible through a
+plugin system, so it is easy to add new effects, new content elements or even
+new ways of managing your presentation.
+
+Options
+=======
+
+**file**  File to open
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligrastage** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligrastage*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/calligrawords.1 b/debian/man/calligrawords.1
new file mode 100644
index 0000000..e2c0e5e
--- /dev/null
+++ b/debian/man/calligrawords.1
@@ -0,0 +1,90 @@
+.\" Man page generated from reStructeredText.
+.
+.TH CALLIGRAWORDS 1 "11 septembre 2011" "" "office"
+.SH NAME
+CalligraWords \- Calligra Word Processor
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+calligrawords [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.SH DESCRIPTION
+.sp
+Words is a FrameMaker\-like word processing and desktop publishing
+application.  It is capable of creating demanding and professional
+looking documents.  It can be used for desktop publishing, but also for
+"normal" word processing, like writing letters, reports and so on.
+.SH OPTIONS
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-calligra
+.
+Show Calligra specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.sp
+Arguments:
+.sp
+\fBfile\fP                  File to open
+.SH SEE ALSO
+.sp
+More detailed user documentation is available at \fI\%http://userbase.kde.org/Words\fP.
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/calligrawords.rst b/debian/man/calligrawords.rst
new file mode 100644
index 0000000..6e7ab82
--- /dev/null
+++ b/debian/man/calligrawords.rst
@@ -0,0 +1,53 @@
+=============
+CalligraWords
+=============
+
+------------------------
+Calligra Word Processor
+------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+calligrawords [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+Words is a FrameMaker-like word processing and desktop publishing
+application.  It is capable of creating demanding and professional
+looking documents.  It can be used for desktop publishing, but also for
+"normal" word processing, like writing letters, reports and so on.
+
+Options
+=======
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-calligra           Show Calligra specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+Arguments:
+
+**file**                  File to open
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available at http://userbase.kde.org/Words. 
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/karbon.1 b/debian/man/karbon.1
new file mode 100644
index 0000000..81e875a
--- /dev/null
+++ b/debian/man/karbon.1
@@ -0,0 +1,90 @@
+.\" Man page generated from reStructeredText.
+.
+.TH KARBON 1 "11 septembre 2011" "" "office"
+.SH NAME
+Karbon \- A Vector Graphics Drawing Application.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+karbon [Qt\-options] [KDE\-options] [Calligra\-options] [file]
+.SH DESCRIPTION
+.sp
+Karbon is a vector drawing application with an user interface that is easy to
+use, highly customizable and extensible. That makes Karbon a great application
+for users starting to explore the world of vector graphics as well as for
+artists wanting to create breathtaking vector art.
+.SH OPTIONS
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-calligra
+.
+Show Calligra specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.sp
+Arguments:
+.sp
+\fBfile\fP                  File to open
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/karbon\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/karbon\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/karbon.rst b/debian/man/karbon.rst
new file mode 100644
index 0000000..f990a99
--- /dev/null
+++ b/debian/man/karbon.rst
@@ -0,0 +1,53 @@
+=======
+Karbon
+=======
+
+--------------------------------------
+A Vector Graphics Drawing Application.
+--------------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+karbon [Qt-options] [KDE-options] [Calligra-options] [file]
+
+Description
+===========
+
+Karbon is a vector drawing application with an user interface that is easy to
+use, highly customizable and extensible. That makes Karbon a great application
+for users starting to explore the world of vector graphics as well as for
+artists wanting to create breathtaking vector art.
+
+Options
+=======
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-calligra           Show Calligra specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+Arguments:
+
+**file**                  File to open
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/karbon** (either enter this URL into Konqueror, or run **khelpcenter** *help:/karbon*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/kexi.1 b/debian/man/kexi.1
new file mode 100644
index 0000000..118308e
--- /dev/null
+++ b/debian/man/kexi.1
@@ -0,0 +1,263 @@
+.\" Man page generated from reStructeredText.
+.
+.TH KEXI 1 "11 septembre 2011" "" "office"
+.SH NAME
+Kexi \- Database creation for everyone
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+kexi [Qt\-options] [KDE\-options] [options] [project\-name]
+.SH DESCRIPTION
+.sp
+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.
+.SH OPTIONS
+.sp
+Generic options:
+.INDENT 0.0
+.TP
+.B \-\-help
+.
+Show help about options
+.TP
+.B \-\-help\-qt
+.
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+.
+Show KDE specific options
+.TP
+.B \-\-help\-all
+.
+Show all options
+.TP
+.B \-\-author
+.
+Show author information
+.TP
+.B \-v,  \-\-version
+.
+Show version information
+.TP
+.B \-\-license
+.
+Show license information
+.UNINDENT
+.sp
+Options related to entire projects:
+.INDENT 0.0
+.TP
+.B \-\-createdb
+.
+Create a new, blank project using specified
+database driver and database name
+and exit immediately.
+You will be asked for confirmation
+if overwriting is needed.
+.TP
+.B \-\-create\-opendb
+.
+Like \-\-createdb, but also open newly
+created database.
+.TP
+.B \-\-dropdb
+.
+Drop (remove) a project using specified
+database driver and database name.
+You will be asked for confirmation.
+.TP
+.BI \-\-drv,  \-\-dbdriver \ <name>
+.
+Database driver to be used
+for connecting to a database project
+(SQLite by default).
+Ignored if a shortcut filename
+is provided.
+.TP
+.BI \-t,  \-\-type \ <name>
+.
+Specify the type of file provided as an argument.
+This option is only useful if the filename does
+not have a valid extension set and its type
+cannot be determined unambiguously by examining
+its contents.
+This option is ignored if no file is specified as
+an argument.
+Available file types are:
+\- "project" for a project file (the default)
+\- "shortcut" for a shortcut file pointing to a project.
+\- "connection" for database connection data.
+.TP
+.BI \-\-conn,  \-\-connection \ <shortcut_filename>
+.
+Specify a database connection shortcut .kexic
+file containing connection data.
+Can be used with \-\-createdb or \-\-create\-opendb
+for convenience instead of using options like
+\-\-user, \-\-host or \-\-port.
+Note: Options like \-\-user, \-\-host have
+precedence over settings defined in the shortcut
+file.
+.TP
+.B \-\-readonly
+.
+Specify that any database connections will
+be performed without write support. This option
+is ignored when "createdb" option is present,
+otherwise the database could not be created.
+.TP
+.B \-\-user\-mode
+.
+Start project in User Mode, regardless
+of the project settings.
+.TP
+.B \-\-design\-mode
+.
+Start project in Design Mode, regardless
+of the project settings.
+.TP
+.B \-\-show\-navigator
+.
+Show the Project Navigator side pane even
+if Kexi runs in User Mode.
+.TP
+.B \-\-hide\-menu
+.
+Hide the main menu (the tabbed toolbar)
+completely. A number of commands from the main
+menu is always visible. This option is useful
+in User Mode.
+.TP
+.B \-\-skip\-startup\-dialog
+.
+Skip displaying startup dialog window.
+If there is no project name specified to open,
+an empty application window will appear.
+.UNINDENT
+.sp
+Options related to opening objects within a project:
+.INDENT 0.0
+.TP
+.B \-\-open [<object_type>:]<object_name>
+.
+Open object of type \(aqobject_type\(aq
+and name \(aqobject_name\(aq from specified project
+on application start.
+\(aqobject_type\(aq is optional, if omitted \- table
+type is assumed.
+Other object types can be query, report, form,
+script (may be more or less, depending on your
+plugins installed).
+Use "" chars to specify names containing spaces.
+Examples: \-\-open MyTable,
+\-\-open query:"My very big query"
+.TP
+.B \-\-design [<object_type>:]<object_name>
+.
+Like \-\-open, but the object will
+be opened in Design Mode, if one is available.
+.TP
+.B \-\-edittext [<object_type>:]<object_name>
+.
+Like \-\-open, but the object will
+be opened in Text Mode, if one is available.
+.TP
+.B \-\-exec, \-\-execute [<object_type>:]<object_name>
+.
+Start execution of object of type \(aqobject_type\(aq
+and name \(aqobject_name\(aq on application start.
+\(aqobject_type\(aq is optional, if omitted \- macro
+type is assumed.
+Other object types can be script (may be more
+or less, depending on your plugins installed).
+Use "" chars to specify names containing spaces.
+.UNINDENT
+.INDENT 0.0
+.TP
+.BI \-\-new \ <object_type>
+.
+Start new object design of type \(aqobject_type\(aq.
+.UNINDENT
+.sp
+Options related to database servers:
+.INDENT 0.0
+.TP
+.BI \-u,  \-\-user \ <name>
+.
+User name to be used
+for connecting to a database project.
+Ignored if a shortcut filename
+is provided.
+.TP
+.BI \-h,  \-\-host \ <name>
+.
+Server (host) name to be used
+for connecting to a database project.
+Ignored if a shortcut filename
+is provided.
+.TP
+.BI \-\-port \ <number>
+.
+Server\(aqs port number to be used
+for connecting to a database project.
+Ignored if a shortcut filename
+is provided.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-local\-socket <filename> Server\(aqs local socket filename
+.
+to be used for connecting to a database
+project. Ignored if a shortcut filename
+is provided.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-skip\-conn\-dialog
+.
+Skip displaying connection dialog window
+and connect directly. Available when
+opening .kexic or .kexis shortcut files.
+.UNINDENT
+.sp
+Arguments:
+.sp
+\fBproject\-name\fP   Kexi database project filename, Kexi shortcut filename or name of a Kexi database project on a server to open.
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/kexi\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/kexi\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/kexi.rst b/debian/man/kexi.rst
new file mode 100644
index 0000000..80d97a4
--- /dev/null
+++ b/debian/man/kexi.rst
@@ -0,0 +1,166 @@
+====
+Kexi
+====
+
+-------------------------------
+Database creation for everyone
+-------------------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+
+Synopsis
+========
+
+kexi [Qt-options] [KDE-options] [options] [project-name]
+
+Description
+===========
+
+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.
+
+Options
+=======
+
+Generic options:
+
+--help                    Show help about options
+--help-qt                 Show Qt specific options
+--help-kde                Show KDE specific options
+--help-all                Show all options
+--author                  Show author information
+-v, --version             Show version information
+--license                 Show license information
+
+Options related to entire projects:
+
+--createdb                Create a new, blank project using specified
+                          database driver and database name
+                          and exit immediately.
+                          You will be asked for confirmation
+                          if overwriting is needed.
+--create-opendb           Like --createdb, but also open newly
+                          created database.
+                          
+--dropdb                  Drop (remove) a project using specified
+                          database driver and database name.
+                          You will be asked for confirmation.
+--drv, --dbdriver <name>  Database driver to be used
+                          for connecting to a database project
+                          (SQLite by default).
+                          Ignored if a shortcut filename
+                          is provided.
+-t, --type <name>         Specify the type of file provided as an argument.
+                          This option is only useful if the filename does
+                          not have a valid extension set and its type
+                          cannot be determined unambiguously by examining
+                          its contents.
+                          This option is ignored if no file is specified as                                                                                                                              
+                          an argument.                                                                                                                                                                   
+                          Available file types are:
+                          - "project" for a project file (the default)                                                                                                                                   
+                          - "shortcut" for a shortcut file pointing to a project.
+                          - "connection" for database connection data.                                                                                                                                   
+                                                                                                                                                                                                         
+--conn, --connection <shortcut_filename>                                                                                                                                                                 
+                          Specify a database connection shortcut .kexic                                                                                                                                  
+                          file containing connection data.                                                                                                                                               
+                          Can be used with --createdb or --create-opendb                                                                                                                                 
+                          for convenience instead of using options like                                                                                                                                  
+                          --user, --host or --port.                                                                                                                                                      
+                          Note: Options like --user, --host have                                                                                                                                         
+                          precedence over settings defined in the shortcut                                                                                                                               
+                          file.
+--readonly                Specify that any database connections will
+                          be performed without write support. This option
+                          is ignored when "createdb" option is present,
+                          otherwise the database could not be created.
+--user-mode               Start project in User Mode, regardless 
+                          of the project settings.
+--design-mode             Start project in Design Mode, regardless 
+                          of the project settings.
+--show-navigator          Show the Project Navigator side pane even
+                          if Kexi runs in User Mode.
+--hide-menu               Hide the main menu (the tabbed toolbar)
+                          completely. A number of commands from the main
+                          menu is always visible. This option is useful
+                          in User Mode.
+--skip-startup-dialog     Skip displaying startup dialog window.
+                          If there is no project name specified to open,
+                          an empty application window will appear.
+
+Options related to opening objects within a project:
+
+--open [<object_type>:]<object_name> 
+                          Open object of type 'object_type'
+                          and name 'object_name' from specified project
+                          on application start.
+                          'object_type' is optional, if omitted - table
+                          type is assumed.
+                          Other object types can be query, report, form,
+                          script (may be more or less, depending on your
+                          plugins installed).
+                          Use "" chars to specify names containing spaces.
+                          Examples: --open MyTable,
+                          --open query:"My very big query"
+--design [<object_type>:]<object_name> 
+                          Like --open, but the object will
+                          be opened in Design Mode, if one is available.
+--edittext [<object_type>:]<object_name> 
+                          Like --open, but the object will
+                          be opened in Text Mode, if one is available.
+--exec, --execute [<object_type>:]<object_name> 
+                          Start execution of object of type 'object_type'
+                          and name 'object_name' on application start.
+                          'object_type' is optional, if omitted - macro
+                          type is assumed.
+                          Other object types can be script (may be more
+                          or less, depending on your plugins installed).
+                          Use "" chars to specify names containing spaces.
+
+--new <object_type>       Start new object design of type 'object_type'.
+
+
+Options related to database servers:
+
+-u, --user <name>         User name to be used
+                          for connecting to a database project.
+                          Ignored if a shortcut filename
+                          is provided.
+-h, --host <name>         Server (host) name to be used
+                          for connecting to a database project.
+                          Ignored if a shortcut filename
+                          is provided.
+--port <number>           Server's port number to be used
+                          for connecting to a database project.
+                          Ignored if a shortcut filename
+                          is provided.
+
+--local-socket <filename> Server's local socket filename
+                          to be used for connecting to a database
+                          project. Ignored if a shortcut filename
+                          is provided.
+
+--skip-conn-dialog        Skip displaying connection dialog window
+                          and connect directly. Available when
+                          opening .kexic or .kexis shortcut files.
+
+Arguments:
+
+**project-name**   Kexi database project filename, Kexi shortcut filename or name of a Kexi database project on a server to open.
+
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/kexi** (either enter this URL into Konqueror, or run **khelpcenter** *help:/kexi*).
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/man/kexi_sqlite3_dump.1 b/debian/man/kexi_sqlite3_dump.1
new file mode 100644
index 0000000..5cf0df7
--- /dev/null
+++ b/debian/man/kexi_sqlite3_dump.1
@@ -0,0 +1,47 @@
+.\" Man page generated from reStructeredText.
+.
+.TH KEXI_SQLITE3_DUMP 1 "13 mai 2013" "" "office"
+.SH NAME
+kexi_sqlite3_dump \- kexi_sqlite3_dump
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+kexi_sqlite3_dump <database>
+.SH DESCRIPTION
+.sp
+A tool for executing DUMP command on SQLite 3 databases.
+.SH OPTIONS
+.SH SEE ALSO
+.sp
+More detailed user documentation is available from \fBhelp:/calligra\fP (either enter this URL into Konqueror, or run \fBkhelpcenter\fP \fIhelp:/calligra\fP).
+.SH AUTHOR
+This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+.\" Generated by docutils manpage writer.
+.\" 
+.
diff --git a/debian/man/kexi_sqlite3_dump.rst b/debian/man/kexi_sqlite3_dump.rst
new file mode 100644
index 0000000..31dd81a
--- /dev/null
+++ b/debian/man/kexi_sqlite3_dump.rst
@@ -0,0 +1,34 @@
+==================
+kexi_sqlite3_dump
+==================
+
+------------------
+kexi_sqlite3_dump
+------------------
+
+:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
+:Date: |date|
+:Manual section: 1
+:Manual group: office
+
+Synopsis
+=========
+
+kexi_sqlite3_dump <database>
+
+Description
+============
+
+A tool for executing DUMP command on SQLite 3 databases.
+
+Options
+========
+
+SEE ALSO
+=========
+
+More detailed user documentation is available from **help:/calligra** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligra*).
+
+
+
+.. |date| date:: %y %B %Y
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..37677a9
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,9 @@
+usr/share/kservices5/flow_wpg_thumbnail.desktop
+usr/share/kservices5/flow_vsdx_thumbnail.desktop
+usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_vsdx2odg.so
+usr/bin/cstrunner
+usr/bin/cstester
+usr/bin/visualimagecompare
+
+# fonts already in fonts-lyx package
+usr/share/kde4/apps/formulashape/fonts/cmex10.ttf
diff --git a/debian/okular-backend-odp.install b/debian/okular-backend-odp.install
index e13a1b2..cf8c69f 100644
--- a/debian/okular-backend-odp.install
+++ b/debian/okular-backend-odp.install
@@ -1,4 +1,4 @@
-usr/lib/*/libkookularGenerator_odp.so.*
+usr/lib/*/libkookularGenerator_odp.so.1*
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_odp_calligra.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_powerpoint_calligra.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_pptx_calligra.so
@@ -8,4 +8,3 @@ usr/share/applications/okularApplication_pptx_calligra.desktop
 usr/share/kservices5/okularOdp_calligra.desktop
 usr/share/kservices5/okularPowerpoint_calligra.desktop
 usr/share/kservices5/okularPptx_calligra.desktop
-usr/share/locale/*/LC_MESSAGES/okularGenerator_odp.mo
diff --git a/debian/okular-backend-odp.lintian-overrides b/debian/okular-backend-odp.lintian-overrides
deleted file mode 100644
index 2702cc1..0000000
--- a/debian/okular-backend-odp.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# private library
-okular-backend-odp: package-name-doesnt-match-sonames libkookularGenerator-odp*
-# private library
-okular-backend-odp: no-symbols-control-file
-# okular is recommended already
-okular-backend-odp: desktop-command-not-in-package okular [usr/share/applications/okularApplication_*_calligra.desktop]
diff --git a/debian/okular-backend-odt.install b/debian/okular-backend-odt.install
index eff5ec6..c75c7a4 100644
--- a/debian/okular-backend-odt.install
+++ b/debian/okular-backend-odt.install
@@ -1,17 +1,13 @@
-usr/lib/*/libkookularGenerator_odt.so.*
+usr/lib/*/libkookularGenerator_odt.so.1*
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_doc_calligra.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_docx_calligra.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_odt_calligra.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_rtf_calligra.so
 usr/lib/*/qt5/plugins/okular/generators/okularGenerator_wpd_calligra.so
 usr/share/applications/okularApplication_doc_calligra.desktop
 usr/share/applications/okularApplication_docx_calligra.desktop
 usr/share/applications/okularApplication_odt_calligra.desktop
-usr/share/applications/okularApplication_rtf_calligra.desktop
 usr/share/applications/okularApplication_wpd_calligra.desktop
 usr/share/kservices5/okularDoc_calligra.desktop
 usr/share/kservices5/okularDocx_calligra.desktop
 usr/share/kservices5/okularOdt_calligra.desktop
-usr/share/kservices5/okularRtf_calligra.desktop
 usr/share/kservices5/okularWpd_calligra.desktop
-usr/share/locale/*/LC_MESSAGES/okularGenerator_odt.mo
diff --git a/debian/okular-backend-odt.lintian-overrides b/debian/okular-backend-odt.lintian-overrides
deleted file mode 100644
index ce451ce..0000000
--- a/debian/okular-backend-odt.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# private library
-okular-backend-odt: package-name-doesnt-match-sonames libkookularGenerator-odt*
-# private library
-okular-backend-odt: no-symbols-control-file
-# okular is recommended already
-okular-backend-odt: desktop-command-not-in-package okular [usr/share/applications/okularApplication_*_calligra.desktop]
diff --git a/debian/patches/series b/debian/patches/series
index fe091ae..1dd8fdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1 @@
-upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
-upstream_Fix-some-more-warnings.patch
-upstream_Small-CMake-modernization.patch
-upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch
-upstream_Remove-old-std-c-11-setting-for-Vc.patch
-upstream_Fix-compile-with-newer-versions-of-poppler.patch
-upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
-upstream_PdfImport-Fix-compile-with-newer-poppler.patch
-upstream_PdfImport-Fix-compile-with-newer-poppler_2.patch
-upstream_SvgOutputDev-Fix-ifdef-version-for-getFont-API-chang.patch
+fontconfig-link.diff
diff --git a/debian/patches/upstream_Fix-compile-with-newer-versions-of-poppler.patch b/debian/patches/upstream_Fix-compile-with-newer-versions-of-poppler.patch
deleted file mode 100644
index 7074bfc..0000000
--- a/debian/patches/upstream_Fix-compile-with-newer-versions-of-poppler.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2f220c6d1418ce7fa509e0dc598a67e66908cbd3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta at gmail.com>
-Date: Fri, 25 Feb 2022 15:52:31 +0000
-Subject: [PATCH] Fix compile with newer versions of poppler
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -149,6 +149,10 @@ calligra_set_productset(${PRODUCTSET})
- set(REQUIRED_KF5_VERSION "5.7.0")
- set(REQUIRED_QT_VERSION "5.3.0")
- 
-+set(CMAKE_CXX_STANDARD 17)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-+
- find_package(ECM 5.19 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
diff --git a/debian/patches/upstream_Fix-some-more-warnings.patch b/debian/patches/upstream_Fix-some-more-warnings.patch
deleted file mode 100644
index 0b878b3..0000000
--- a/debian/patches/upstream_Fix-some-more-warnings.patch
+++ /dev/null
@@ -1,443 +0,0 @@
-From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001
-From: Pierre Ducroquet <pinaraf at pinaraf.info>
-Date: Sun, 28 Feb 2021 23:23:02 +0100
-Subject: [PATCH] Fix some more warnings
-
----
- filters/libmsooxml/MsooXmlDiagramReader_p.cpp        |  1 +
- filters/sheets/csv/csvimport.cc                      |  2 +-
- filters/sheets/excel/sidewinder/excel.cpp            |  1 +
- filters/sheets/excel/sidewinder/formulas.cpp         |  2 +-
- filters/sheets/gnumeric/gnumericexport.cc            |  5 ++---
- filters/sheets/html/htmlexport.cc                    |  2 --
- filters/sheets/latex/export/latexexport.cc           |  1 -
- filters/sheets/latex/export/table.cc                 |  1 +
- filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp       |  1 -
- filters/stage/pptx/PptxXmlDocumentReader.cpp         |  2 +-
- filters/words/msword-odf/texthandler.cpp             |  2 ++
- filters/words/msword-odf/wv2/src/parser9x.cpp        |  4 +++-
- filters/words/msword-odf/wv2/src/styles.cpp          |  4 +---
- filters/words/msword-odf/wv2/src/styles.h            | 11 ++++++++---
- gemini/lib/GeminiMainWindow.cpp                      |  2 ++
- libs/pageapp/KoPAOdfPageSaveHelper.cpp               |  2 +-
- plugins/spacenavigator/SpaceNavigatorDevice.h        |  6 ++----
- plugins/spacenavigator/SpaceNavigatorEvent.h         |  2 +-
- plugins/spacenavigator/SpaceNavigatorPollingThread.h |  3 +--
- plugins/vectorshape/VectorShape.cpp                  |  1 +
- sheets/functions/datetime.cpp                        |  1 +
- sheets/part/Digest.cpp                               |  8 ++++----
- sheets/shape/TableToolFactory.h                      |  2 +-
- sheets/tests/TestSort.cpp                            |  4 ++--
- 24 files changed, 38 insertions(+), 32 deletions(-)
-
-diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
-index 14b08531262..14fc6ab9a71 100644
---- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
-+++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
-@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) {
-         case AlgorithmAtom::UnknownAlg:
-             warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm.";
-             // fall through and use the composite-algorithm
-+        // fall through
-         case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break;
-         case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break;
-         case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break;
-diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc
-index 89fb7162e00..1008d186f18 100644
---- a/filters/sheets/csv/csvimport.cc
-+++ b/filters/sheets/csv/csvimport.cc
-@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt
-         return KoFilter::FileNotFound;
-     }
- 
--    QString csv_delimiter;
-     // ###### FIXME: disabled for now
-+    //QString csv_delimiter;
-     //if (!config.isNull())
-     //    csv_delimiter = config[0];
- 
-diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp
-index ab592225ca6..7fa5633d433 100644
---- a/filters/sheets/excel/sidewinder/excel.cpp
-+++ b/filters/sheets/excel/sidewinder/excel.cpp
-@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename)
-               } else {
-                 bytes_read = combObjStream->read( buffer, markerOrLength );
-                 QString ansiString = readByteString(buffer, markerOrLength);
-+                Q_UNUSED(ansiString);
-                 //TODO...
-                 //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() );
-               }
-diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp
-index 62747469a49..0132d39e024 100644
---- a/filters/sheets/excel/sidewinder/formulas.cpp
-+++ b/filters/sheets/excel/sidewinder/formulas.cpp
-@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg
-     if (!stack) return;
-     if (stack->size() < count) return;
- 
--    QString s1, s2;
-+    QString s1;
- 
-     while (count) {
-         count--;
-diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc
-index 1256c68bc74..2468548edb3 100644
---- a/filters/sheets/gnumeric/gnumericexport.cc
-+++ b/filters/sheets/gnumeric/gnumericexport.cc
-@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const
-                 i = 0;
-             }
- 
--            QString line;
-             for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) {
-                 QDomElement cell_contents;
-                 Cell cell(table, currentcolumn, currentrow);
- 
--                QString text, style;
-+                QString text;
-                 QDomDocument domLink;
-                 QDomElement domRoot;
--                QDomNode domNode;
-                 QDomNodeList childNodes;
- 
-                 if (!cell.isDefault() && !cell.isEmpty()) {
-@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const
-                         text = domNode.toElement().text();
- 
-                         while (!domNode.isNull()) {
-+                            QString style;
-                             style = domNode.toElement().tagName();
- 
-                             if (style == "b")
-diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc
-index 2d116e0608c..bf41a6f743e 100644
---- a/filters/sheets/html/htmlexport.cc
-+++ b/filters/sheets/html/htmlexport.cc
-@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i
-             i = 0;
-         }
- 
--        QString separators;
-         QString line;
-         unsigned int nonempty_cells = 0;
- 
-@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns)
-         int iUsedColumn = 0;
-         for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) {
-             cell = Cell(sheet, currentcolumn, currentrow);
--            QString text;
-             if (!cell.isDefault() && !cell.isEmpty()) {
-                 iUsedColumn = currentcolumn;
-             }
-diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc
-index 8d0698a3420..4f8caf235d9 100644
---- a/filters/sheets/latex/export/latexexport.cc
-+++ b/filters/sheets/latex/export/latexexport.cc
-@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) :
- 
- KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to)
- {
--    QString config;
- 
-     if (to != "text/x-tex" || from != "application/x-kspread")
-         return KoFilter::NotImplemented;
-diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc
-index 8d8b6701a39..e58827dfbc7 100644
---- a/filters/sheets/latex/export/table.cc
-+++ b/filters/sheets/latex/export/table.cc
-@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node)
- 
-     /* borders */
-     QDomNode border = getChild(node, "borders");
-+    Q_UNUSED(border);
-     setBorderRight(getAttr(node, "right").toLong());
-     setBorderLeft(getAttr(node, "left").toLong());
-     setBorderBottom(getAttr(node, "bottom").toLong());
-diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
-index 782a5914729..eda8ffc6b47 100644
---- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
-+++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
-@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting()
-     while (index < m_conditionalIndices.size()) {
-         QString conditionalArea;
-         Condition examinedCondition = m_conditionalIndices.at(index);
--        QString sqrefOriginal = sqref;
-         int areaIndex = 0;
-         Condition previousCond;
- 
-diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp
-index 4cf86aea8c8..11b5ad266b9 100644
---- a/filters/stage/pptx/PptxXmlDocumentReader.cpp
-+++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp
-@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId()
- 
-     QString slideMasterPath, slideMasterFile;
-     MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile);
--    const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster");
-+    // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster");
- 
-     // Delay the reading of a tableStyle until we find a table as we need the
-     // clrMap from the master slide
-diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp
-index e167d86e028..89ef678961a 100644
---- a/filters/words/msword-odf/texthandler.cpp
-+++ b/filters/words/msword-odf/texthandler.cpp
-@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data,
-         }
-         case msonfcUCLetter:
-             letter = 'A';
-+            // fall through
-         case msonfcLCLetter:
-         {
-             while (noteNumber / 25 > 0) {
-@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtr<cons
-         break;
-     case UNSUPPORTED:
-         warnMsDoc << "Warning: Fld data missing, ignoring!";
-+        // fall through
-     default:
-         warnMsDoc << "Warning: unrecognized field type, ignoring!";
-         m_fld->m_type = UNSUPPORTED;
-diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp
-index 9a6d1606ce9..e5d7d14691c 100644
---- a/filters/words/msword-odf/wv2/src/parser9x.cpp
-+++ b/filters/words/msword-odf/wv2/src/parser9x.cpp
-@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position&
-         // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1
-         case CELL_MARK:
-             m_cellMarkFound = true;
--            // Fall-through intended. A row/cell end is also a paragraph end.
-+            // A row/cell end is also a paragraph end.
-+            // fall through
-         case PARAGRAPH_MARK:
-         {
-             // No "index - start + 1" here, as we don't want to copy the
-@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtr<co
-             if (m_subDocument == Main) {
-                 emitAnnotation( UString(character), globalCP, chp );
-             }
-+            break;
-         }
-     case TextHandler::FieldEscapeChar:
-         wvlog << "Found an escape character ++++++++++++++++++++?" << endl;
-diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
-index f47c3dd8d51..d2c96e3d92b 100644
---- a/filters/words/msword-odf/wv2/src/styles.cpp
-+++ b/filters/words/msword-odf/wv2/src/styles.cpp
-@@ -42,7 +42,6 @@ STD::STD()
- }
- 
- STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
--throw(InvalidFormatException)
- {
-     clearInternal();
-     if (!read( baseSize, totalSize, stream, preservePos )) {
-@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
- }
- 
- bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
--throw(InvalidFormatException)
- {
-     U16 shifterU16;
-     S32 startOffset=stream->tell();  // address where the STD starts
-@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version )
- }
- 
- 
--StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
-+StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
-     : m_udsNum(0)
- {
-     WordVersion version = Word8;
-diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h
-index ba02def6845..41c8278dd21 100644
---- a/filters/words/msword-odf/wv2/src/styles.h
-+++ b/filters/words/msword-odf/wv2/src/styles.h
-@@ -58,8 +58,9 @@ struct STD
-     STD();
-     /**
-      * Simply calls read(...)
-+     * @throw InvalidFormatException
-      */
--    STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
-+    STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
-     /**
-      * Attention: This struct allocates memory on the heap
-      */
-@@ -74,8 +75,9 @@ struct STD
-      * false the state of stream will be changed!
-      *
-      * @return true - success, false - failed
-+     * @throw InvalidFormatException
-      */
--    bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
-+    bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
- 
-     /**
-      * Same as reading :)
-@@ -365,7 +367,10 @@ private:
- class WV2_EXPORT StyleSheet
- {
- public:
--    StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
-+    /**
-+     * @throw InvalidFormatException
-+     */
-+    StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
-     ~StyleSheet();
- 
-     /**
-diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp
-index 3d05f6461e0..eb5f120c0f7 100644
---- a/gemini/lib/GeminiMainWindow.cpp
-+++ b/gemini/lib/GeminiMainWindow.cpp
-@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState)
- }
- 
- 
-+
- void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState)
- {
-+    Q_UNUSED(lockNewState);
-     d->syncObject = new GeminiModeSynchronisationObject;
- 
-     if(centralWidget()) {
-diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp
-index 92c6dfd4cb4..068501c8af1 100644
---- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp
-+++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp
-@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList<KoPAPage
-             KoPAPage * p = static_cast<KoPAPage *>( page );
-             masterPages.insert( p->masterPage() );
-         }
--        m_masterPages = masterPages.toList();
-+        m_masterPages = masterPages.values();
-     }
- }
- 
-diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h
-index b9056ac98c1..ecd696e415f 100644
---- a/plugins/spacenavigator/SpaceNavigatorDevice.h
-+++ b/plugins/spacenavigator/SpaceNavigatorDevice.h
-@@ -31,10 +31,8 @@ public:
-     explicit SpaceNavigatorDevice(QObject *parent);
-     virtual ~SpaceNavigatorDevice();
- 
--    /// reimplemented from KoInputDeviceHandler
--    virtual bool start();
--    /// reimplemented from KoInputDeviceHandler
--    virtual bool stop();
-+    virtual bool start() override;
-+    virtual bool stop() override;
- private Q_SLOTS:
-     void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons );
-     void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type );
-diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h
-index 73751ec88ff..76ee8e2f880 100644
---- a/plugins/spacenavigator/SpaceNavigatorEvent.h
-+++ b/plugins/spacenavigator/SpaceNavigatorEvent.h
-@@ -33,7 +33,7 @@ public:
-     void setPosition( int x, int y, int z );
-     void setRotation( int rx, int ry, int rz );
- 
--    virtual KoPointerEvent * pointerEvent();
-+    virtual KoPointerEvent * pointerEvent() override;
- 
- private:
-     int m_x, m_y, m_z;
-diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h
-index 62c4de8ab73..67d59177021 100644
---- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h
-+++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h
-@@ -39,8 +39,7 @@ Q_SIGNALS:
- 
- protected:
- 
--    /// reimplemented from QThread
--    virtual void run();
-+    virtual void run() override;
- 
- private:
-     bool m_stopped;
-diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp
-index a25ab3fc561..9acbd251c94 100644
---- a/plugins/vectorshape/VectorShape.cpp
-+++ b/plugins/vectorshape/VectorShape.cpp
-@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const
-         break;
-     case VectorTypeSvg:
-         mimeType = "image/svg+xml";
-+        break;
-     default:
-         // FIXME: What here?
-         mimeType = "application/x-what";
-diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp
-index 9f59fe2cf75..6157b0996c1 100644
---- a/sheets/functions/datetime.cpp
-+++ b/sheets/functions/datetime.cpp
-@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *)
- // Function: CURRENTTIME
- Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *)
- {
-+    Q_UNUSED(calc);
-     return Value(QTime::currentTime());
- }
- 
-diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp
-index 8cd972db989..e9246ce6e7d 100644
---- a/sheets/part/Digest.cpp
-+++ b/sheets/part/Digest.cpp
-@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx)
-     }
- 
-     switch (ctx->m_nDatLen & 0x03) {
--    case 0: X[i]  = ((sal_uInt32)(*(p++))) <<  0L;
--    case 1: X[i] |= ((sal_uInt32)(*(p++))) <<  8L;
--    case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
--    case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
-+    case 0: X[i]  = ((sal_uInt32)(*(p++))) <<  0L; /* fall through */
-+    case 1: X[i] |= ((sal_uInt32)(*(p++))) <<  8L; /* fall through */
-+    case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */
-+    case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */
-     }
- 
-     __rtl_digest_swapLong(X, i + 1);
-diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h
-index 679bfe14b8e..9412d8ffdc5 100644
---- a/sheets/shape/TableToolFactory.h
-+++ b/sheets/shape/TableToolFactory.h
-@@ -34,7 +34,7 @@ public:
-     TableToolFactory();
-     ~TableToolFactory();
- 
--    KoToolBase* createTool(KoCanvasBase* canvas);
-+    KoToolBase* createTool(KoCanvasBase* canvas) override;
- };
- 
- } // namespace Sheets
-diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp
-index b3f1e35169d..6354d79abc5 100644
---- a/sheets/tests/TestSort.cpp
-+++ b/sheets/tests/TestSort.cpp
-@@ -68,7 +68,7 @@ void TestSort::AscendingOrder()
-     command->setSheet(sheet);
- 
-     // Parameters.
--    command->setSortRows(Qt::Vertical);
-+    command->setSortRows(true);
-     command->setSkipFirst(false);
-     command->setCopyFormat(false);
- 
-@@ -121,7 +121,7 @@ void TestSort::DescendingOrder()
-     command->setSheet(sheet);
- 
-     // Parameters.
--    command->setSortRows(Qt::Vertical);
-+    command->setSortRows(true);
-     command->setSkipFirst(false);
-     command->setCopyFormat(false);
- 
--- 
-2.35.1
-
diff --git a/debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
deleted file mode 100644
index 3715f31..0000000
--- a/debian/patches/upstream_Partial-update-of-Commit-62f51070-to-make-it-compile.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta at gmail.com>
-Date: Tue, 8 Jun 2021 05:13:23 +0000
-Subject: [PATCH] Partial update of Commit 62f51070 to make it compileable
- again
-
-Cmake to 3.16
-Fix Fontconfig's FOUND variable
-Fix Fontconfig's include_dirs variable
-Use Correct Target to link FontConfig and Freetype
----
- CMakeLists.txt           | 14 +++++---------
- libs/text/CMakeLists.txt |  4 ++--
- 2 files changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ce210ebe01..71272ffef2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.16)
- 
- project(calligra)
- 
-@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET})
- ## Look for ECM, Qt, KF5 ##
- ###########################
- ##########################
-+set(REQUIRED_KF5_VERSION "5.7.0")
-+set(REQUIRED_QT_VERSION "5.3.0")
- 
- find_package(ECM 5.19 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage)
- include(MacroEnsureVersion)
- include(MacroDesktopToJson)
- 
--
--set(REQUIRED_KF5_VERSION "5.7.0")
--
- find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-     COMPONENTS
-     Archive
-@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0")
-     set(CALLIGRA_OLD_PLUGIN_METADATA TRUE)
- endif()
- 
--
--set(REQUIRED_QT_VERSION "5.3.0")
--
- find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
-     COMPONENTS
-     Core
-@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE)
- 	)
- endif()
- 
--if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
--    set(FONTCONFIG_INCLUDE_DIR "")
-+if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND)
-+    set(Fontconfig_INCLUDE_DIRS "")
-     set(FREETYPE_INCLUDE_DIRS "")
- else()
-     add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
-diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
-index 16d7e066fa2..429afe79704 100644
---- a/libs/text/CMakeLists.txt
-+++ b/libs/text/CMakeLists.txt
-@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF )
- endif()
- 
- if( FONTCONFIG_FOUND )
--    target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
-+    target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
- endif()
- 
- if( FREETYPE_FOUND )
--    target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
-+    target_link_libraries(kotext PRIVATE Freetype::Freetype)
- endif()
- 
- 
--- 
-2.33.0
-
diff --git a/debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler.patch b/debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler.patch
deleted file mode 100644
index ba27196..0000000
--- a/debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Wed, 13 Apr 2022 01:25:44 +0200
-Subject: [PATCH] PdfImport: Fix compile with newer poppler
-
-Brings a dependency on poppler-qt5 to be able to include the version
-header, honestly it's not strictly needed, one could do a
-check_cxx_source_compiles, but I don't care about Calligra enough to
-spend more time making it compile while it's using poppler the wrong
-way.
----
- CMakeLists.txt                    | 1 +
- filters/karbon/pdf/CMakeLists.txt | 2 +-
- filters/karbon/pdf/PdfImport.cpp  | 9 +++++++++
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 51f1d65b8e6..06bbad5c24c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG
- calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
-     NOT_WIN "not supported on Windows"
-     PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
-+    Poppler_FOUND "poppler qt5 headers not found"
-     )
- 
- calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS
-diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
-index 8fddf1ad757..b71c92cbf04 100644
---- a/filters/karbon/pdf/CMakeLists.txt
-+++ b/filters/karbon/pdf/CMakeLists.txt
-@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
- add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
- calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop)
- 
--target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core)
-+target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5)
- 
- install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
- 
-diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
-index abbe681b4e8..e97974fc133 100644
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -17,6 +17,10 @@
- 
- #include <kpluginfactory.h>
- 
-+#include <poppler-version.h>
-+
-+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
-+
- // Don't show this warning: it's an issue in poppler
- #ifdef __GNUC__
- #pragma GCC diagnostic ignored "-Wunused-parameter"
-@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
-     if (! globalParams)
-         return KoFilter::NotImplemented;
- 
-+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
-     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
-     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-+#else
-+    std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
-+    PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
-+#endif
-     if (! pdfDoc) {
-         globalParams.reset();
-         return KoFilter::StupidError;
--- 
-2.35.1
-
diff --git a/debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler_2.patch b/debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler_2.patch
deleted file mode 100644
index f972b60..0000000
--- a/debian/patches/upstream_PdfImport-Fix-compile-with-newer-poppler_2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001
-From: Dag Andersen <dag.andersen at kdemail.net>
-Date: Wed, 13 Apr 2022 14:45:33 +0200
-Subject: [PATCH] PdfImport: Fix compile with newer poppler
-
-Also fixes odg2pdf filter.
-
-Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
-by accid at kde.org.
----
- filters/karbon/pdf/CMakeLists.txt    | 2 +-
- filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++
- filters/karbon/pdf/SvgOutputDev.cpp  | 9 +++++++++
- 3 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
-index b71c92cbf04..4ce138ccdd6 100644
---- a/filters/karbon/pdf/CMakeLists.txt
-+++ b/filters/karbon/pdf/CMakeLists.txt
-@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp)
- add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS})
- calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop)
- 
--target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core)
-+target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5)
- 
- install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
-diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
-index 934e31dd5aa..a21eac97a77 100644
---- a/filters/karbon/pdf/Pdf2OdgImport.cpp
-+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
-@@ -27,6 +27,8 @@
- 
- #include <kpluginfactory.h>
- 
-+#include <poppler-version.h>
-+
- // Don't show this warning: it's an issue in poppler
- #ifdef __GNUC__
- #pragma GCC diagnostic ignored "-Wunused-parameter"
-@@ -36,6 +38,8 @@
- #include <PDFDoc.h>
- #include <GlobalParams.h>
- 
-+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
-+
- K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json",
-                            registerPlugin<Pdf2OdgImport>();)
- 
-@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const
-     if (! globalParams)
-         return KoFilter::NotImplemented;
- 
-+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
-     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
-     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-+#else
-+    std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
-+    PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
-+#endif
-     if (! pdfDoc) {
-         globalParams.reset();
-         return KoFilter::StupidError;
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 0e6e5a934ca..7caec15175a 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -22,6 +22,10 @@
- #include <QPen>
- #include <QImage>
- 
-+#include <poppler-version.h>
-+
-+#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
-+
- class SvgOutputDev::Private
- {
- public:
-@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
-     if (s->getLength() == 0)
-         return;
- 
-+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
-     GfxFont * font = state->getFont();
-+#else
-+    std::shared_ptr<GfxFont> font = state->getFont();
-+#endif
-+
- 
-     QString str;
- 
--- 
-2.35.1
-
diff --git a/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch b/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
deleted file mode 100644
index 2b457b7..0000000
--- a/debian/patches/upstream_Raise-minimum-poppler-version-to-0.83.0-cleaning-up-.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 2bbbeb09f9d50f1952fd7f4020ca77a0c932d23b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm at gentoo.org>
-Date: Mon, 20 Dec 2021 10:33:08 +0100
-Subject: [PATCH] Raise minimum poppler version to 0.83.0, cleaning up ifdefs
-
-Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>
----
- CMakeLists.txt                       |  2 +-
- filters/karbon/pdf/CMakeLists.txt    | 16 -----------
- filters/karbon/pdf/Pdf2OdgImport.cpp | 19 -------------
- filters/karbon/pdf/PdfImport.cpp     | 21 ---------------
- filters/karbon/pdf/SvgOutputDev.cpp  | 40 +---------------------------
- filters/karbon/pdf/SvgOutputDev.h    | 14 ----------
- 6 files changed, 2 insertions(+), 110 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -725,7 +725,7 @@ set_package_properties(LibEtonyek PROPER
- ##
- ## Test for qt-poppler
- ##
--macro_optional_find_package(Poppler COMPONENTS Qt5)
-+macro_optional_find_package(Poppler 0.83.0 COMPONENTS Qt5)
- set_package_properties(Poppler PROPERTIES
-     DESCRIPTION "A PDF rendering library"
-     URL "http://poppler.freedesktop.org"
---- a/filters/karbon/pdf/CMakeLists.txt
-+++ b/filters/karbon/pdf/CMakeLists.txt
-@@ -1,19 +1,3 @@
--if(Poppler_VERSION VERSION_LESS "0.64.0")
--    add_definitions("-DHAVE_POPPLER_PRE_0_64")
--endif()
--
--if(Poppler_VERSION VERSION_LESS "0.72.0")
--    add_definitions("-DHAVE_POPPLER_PRE_0_72")
--endif()
--
--if(Poppler_VERSION VERSION_LESS "0.82.0")
--    add_definitions("-DHAVE_POPPLER_PRE_0_82")
--endif()
--
--if(Poppler_VERSION VERSION_LESS "0.83.0")
--    add_definitions("-DHAVE_POPPLER_PRE_0_83")
--endif()
--
- set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
- 
- add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
---- a/filters/karbon/pdf/Pdf2OdgImport.cpp
-+++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
-@@ -78,33 +78,19 @@ KoFilter::ConversionStatus Pdf2OdgImport
-     Q_ASSERT(m_document->pages().isEmpty());
- 
-     // read config file
--#ifdef HAVE_POPPLER_PRE_0_83
--    globalParams = new GlobalParams();
--#else
-     globalParams = std::unique_ptr<GlobalParams>(new GlobalParams);
--#endif
-     if (! globalParams)
-         return KoFilter::NotImplemented;
- 
-     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
-     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-     if (! pdfDoc) {
--#ifdef HAVE_POPPLER_PRE_0_83
--        delete globalParams;
--        globalParams = nullptr;
--#else
-         globalParams.reset();
--#endif
-         return KoFilter::StupidError;
-     }
- 
-     if (! pdfDoc->isOk()) {
--#ifdef HAVE_POPPLER_PRE_0_83
--        delete globalParams;
--        globalParams = nullptr;
--#else
-         globalParams.reset();
--#endif
-         delete pdfDoc;
-         return KoFilter::StupidError;
-     }
-@@ -139,12 +125,7 @@ KoFilter::ConversionStatus Pdf2OdgImport
-         delete dev;
-     }
-     delete pdfDoc;
--#ifdef HAVE_POPPLER_PRE_0_83
--    delete globalParams;
--    globalParams = nullptr;
--#else
-     globalParams.reset();
--#endif
-     return status;
- }
- 
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -39,9 +39,7 @@
- #include <PDFDoc.h>
- #include <GlobalParams.h>
- 
--#ifndef HAVE_POPPLER_PRE_0_83
- #include <memory>
--#endif
- 
- K_PLUGIN_FACTORY_WITH_JSON(PdfImportFactory, "calligra_filter_pdf2svg.json",
-                            registerPlugin<PdfImport>();)
-@@ -65,33 +63,19 @@ KoFilter::ConversionStatus PdfImport::co
-     }
- 
-     // read config file
--#ifdef HAVE_POPPLER_PRE_0_83
--    globalParams = new GlobalParams();
--#else
-     globalParams = std::unique_ptr<GlobalParams>(new GlobalParams);
--#endif
-     if (! globalParams)
-         return KoFilter::NotImplemented;
- 
-     GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
-     PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
-     if (! pdfDoc) {
--#ifdef HAVE_POPPLER_PRE_0_83
--        delete globalParams;
--        globalParams = nullptr;
--#else
-         globalParams.reset();
--#endif
-         return KoFilter::StupidError;
-     }
- 
-     if (! pdfDoc->isOk()) {
--#ifdef HAVE_POPPLER_PRE_0_83
--        delete globalParams;
--        globalParams = nullptr;
--#else
-         globalParams.reset();
--#endif
-         delete pdfDoc;
-         return KoFilter::StupidError;
-     }
-@@ -118,12 +102,7 @@ KoFilter::ConversionStatus PdfImport::co
- 
-     delete dev;
-     delete pdfDoc;
--#ifdef HAVE_POPPLER_PRE_0_83
--    delete globalParams;
--    globalParams = nullptr;
--#else
-     globalParams.reset();
--#endif
- 
-     return KoFilter::OK;
- }
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -172,11 +172,7 @@ void SvgOutputDev::eoFill(GfxState *stat
-     *d->body << "/>" << endl;
- }
- 
--#ifdef HAVE_POPPLER_PRE_0_83
--QString SvgOutputDev::convertPath(GfxPath *path)
--#else
- QString SvgOutputDev::convertPath(const GfxPath *path)
--#endif
- {
-     if (! path)
-         return QString();
-@@ -184,11 +180,7 @@ QString SvgOutputDev::convertPath(const
-     QString output;
- 
-     for (int i = 0; i < path->getNumSubpaths(); ++i) {
--#ifdef HAVE_POPPLER_PRE_0_83
--        GfxSubpath * subpath = path->getSubpath(i);
--#else
-         const GfxSubpath * subpath = path->getSubpath(i);
--#endif
-         if (subpath->getNumPoints() > 0) {
-             output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
-             int j = 1;
-@@ -395,11 +387,7 @@ QString SvgOutputDev::printStroke()
-     return stroke;
- }
- 
--#ifdef HAVE_POPPLER_PRE_0_64
--void SvgOutputDev::drawString(GfxState * state, GooString * s)
--#else
- void SvgOutputDev::drawString(GfxState * state, const GooString * s)
--#endif
- {
-     int render = state->getRender();
-     // check for invisible text -- this is used by Acrobat Capture
-@@ -414,22 +402,10 @@ void SvgOutputDev::drawString(GfxState *
- 
-     QString str;
- 
--#ifdef HAVE_POPPLER_PRE_0_64
--    char * p = s->getCString();
--#else
--    #ifdef HAVE_POPPLER_PRE_0_72
--        const char * p = s->getCString();
--    #else
--        const char * p = s->c_str();
--    #endif
--#endif
-+    const char * p = s->c_str();
-     int len = s->getLength();
-     CharCode code;
--#ifdef HAVE_POPPLER_PRE_0_82
--    Unicode *u = nullptr;
--#else
-     const Unicode *u = nullptr;
--#endif
-     int uLen;
-     double dx, dy, originX, originY;
-     while (len > 0) {
-@@ -475,18 +451,10 @@ void SvgOutputDev::drawString(GfxState *
-     *d->body << " y=\"" << y << "px\"";
- 
-     if (font && font->getFamily()) {
--#ifdef HAVE_POPPLER_PRE_0_72
--        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
--#else
-         *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
--#endif
-         //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
-     } else if (font && font->getName()) {
--#ifdef HAVE_POPPLER_PRE_0_72
--        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
--#else
-         *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
--#endif
-         //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
-     }
-     *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
-@@ -506,15 +474,9 @@ void SvgOutputDev::drawString(GfxState *
-     *d->body << "</text>" << endl;
- }
- 
--#ifdef HAVE_POPPLER_PRE_0_82
--void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
--                             int width, int height, GfxImageColorMap *colorMap,
--                             bool interpolate, int *maskColors, bool inlineImg)
--#else
- void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height, GfxImageColorMap *colorMap,
-                              bool interpolate, const int *maskColors, bool inlineImg)
--#endif
- {
-     Q_UNUSED(interpolate)
-     Q_UNUSED(inlineImg)
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -53,22 +53,12 @@ public:
-     void eoFill(GfxState *state) override;
- 
-     // text
--#ifdef HAVE_POPPLER_PRE_0_64
--    void drawString(GfxState * state, GooString * s) override;
--#else
-     void drawString(GfxState * state, const GooString * s) override;
--#endif
- 
-     // images
--#ifdef HAVE_POPPLER_PRE_0_82
--    void drawImage(GfxState *state, Object *ref, Stream *str,
--                           int width, int height, GfxImageColorMap *colorMap,
--                           bool interpolate, int *maskColors, bool inlineImg) override;
--#else
-     void drawImage(GfxState *state, Object *ref, Stream *str,
-                            int width, int height, GfxImageColorMap *colorMap,
-                            bool interpolate, const int *maskColors, bool inlineImg) override;
--#endif
-     // styles
-     void updateAll(GfxState *state) override;
-     void updateFillColor(GfxState *state) override;
-@@ -83,11 +73,7 @@ public:
-     /// Dumps content to svg file
-     void dumpContent();
- private:
--#ifdef HAVE_POPPLER_PRE_0_83
--    QString convertPath(GfxPath *path);
--#else
-     QString convertPath(const GfxPath *path);
--#endif
-     QString convertMatrix(const QMatrix &matrix);
-     QString convertMatrix(const double * matrix);
-     QString printFill();
diff --git a/debian/patches/upstream_Remove-old-std-c-11-setting-for-Vc.patch b/debian/patches/upstream_Remove-old-std-c-11-setting-for-Vc.patch
deleted file mode 100644
index 3ab8279..0000000
--- a/debian/patches/upstream_Remove-old-std-c-11-setting-for-Vc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 19584bed9588860047e3bd04e3fd2cf7e36adc3a Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas at archlinux.org>
-Date: Sat, 8 Jan 2022 11:28:37 +0000
-Subject: [PATCH] Remove old -std=c++11 setting for Vc
-
-This is set by ECM nowadays, and causes issues when a newer standard is needed (eg. for latest poppler)
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a86ec88f7d..9e87b9bda89 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -520,14 +520,6 @@ if (BUILD_VC)
- 	    set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
- 	endif()
- 
--	#Handle Vc master
--	if(Vc_COMPILER_IS_GCC OR Vc_COMPILER_IS_CLANG)
--	    AddCompilerFlag("-std=c++11" _ok)
--	    if(NOT _ok)
--		AddCompilerFlag("-std=c++0x" _ok)
--	    endif()
--	endif()
--
- 	macro(ko_compile_for_all_implementations_no_scalar _objs _src)
- 	    if(PACKAGERS_BUILD)
- 		vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} ONLY SSE2 SSSE3 SSE4_1 AVX AVX2+FMA+BMI2)
--- 
-2.35.1
-
diff --git a/debian/patches/upstream_Small-CMake-modernization.patch b/debian/patches/upstream_Small-CMake-modernization.patch
deleted file mode 100644
index c309a99..0000000
--- a/debian/patches/upstream_Small-CMake-modernization.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 2ac46db52c6ad401f67ae5b5fcd859a5872f0311 Mon Sep 17 00:00:00 2001
-From: Pierre Ducroquet <pinaraf at pinaraf.info>
-Date: Sat, 1 May 2021 15:08:57 +0200
-Subject: [PATCH] Small CMake modernization
-
-Since we are now on CMake 3.2+, we can simplify policies.
-And in order to simplify further, remove our use of
-deprecated features in CMake.
----
- CMakeLists.txt                                | 21 +------------------
- cmake/modules/MacroCalligraAddBenchmark.cmake |  2 +-
- filters/words/msword-odf/wv2/CMakeLists.txt   |  7 +------
- .../wv2/src/generator/CMakeLists.txt          |  7 +------
- .../rtf/import/3rdparty/rtf-qt/CMakeLists.txt |  7 +------
- 5 files changed, 5 insertions(+), 39 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe6502493ed..b237f68fcb6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,24 +4,9 @@ project(calligra)
- 
- message(STATUS "Using CMake version: ${CMAKE_VERSION}")
- 
--if (POLICY CMP0002)
--    cmake_policy(SET CMP0002 OLD)
--endif()
--if (POLICY CMP0017)
--    cmake_policy(SET CMP0017 NEW)
--endif ()
- if (POLICY CMP0022)
-     cmake_policy(SET CMP0022 OLD)
- endif ()
--if (POLICY CMP0026)
--    cmake_policy(SET CMP0026 OLD)
--endif()
--if (POLICY CMP0046)
--    cmake_policy(SET CMP0046 OLD)
--endif ()
--if (POLICY CMP0059)
--    cmake_policy(SET CMP0059 OLD)
--endif()
- if (POLICY CMP0063)
-     cmake_policy(SET CMP0063 NEW)
- endif()
-@@ -105,11 +90,7 @@ endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
- 
- # use CPP-11
--if (CMAKE_VERSION VERSION_LESS "3.1")
--    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--else ()
--    set (CMAKE_CXX_STANDARD 11)
--endif ()
-+set (CMAKE_CXX_STANDARD 11)
- 
- ############
- #############
-diff --git a/cmake/modules/MacroCalligraAddBenchmark.cmake b/cmake/modules/MacroCalligraAddBenchmark.cmake
-index bfd1e1dc938..ad428a8459d 100644
---- a/cmake/modules/MacroCalligraAddBenchmark.cmake
-+++ b/cmake/modules/MacroCalligraAddBenchmark.cmake
-@@ -41,7 +41,7 @@ macro (CALLIGRA_ADD_BENCHMARK _test_NAME)
-         endif()
-     endforeach(_filename)
- 
--    get_target_property( loc ${_test_NAME} LOCATION )
-+    set(loc $<TARGET_FILE:${_test_NAME}>)
-     if(WIN32)
-       if(MSVC_IDE)
-         string(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}" loc "${loc}")
-diff --git a/filters/words/msword-odf/wv2/CMakeLists.txt b/filters/words/msword-odf/wv2/CMakeLists.txt
-index 6f9cddfe018..421c20b60f1 100644
---- a/filters/words/msword-odf/wv2/CMakeLists.txt
-+++ b/filters/words/msword-odf/wv2/CMakeLists.txt
-@@ -1,12 +1,7 @@
--cmake_minimum_required(VERSION 2.8.0)
-+cmake_minimum_required(VERSION 3.2)
- 
- add_definitions(-DUNICODE -D_UNICODE)
- 
--#cmake_policy CMP0017 was introduced in version 2.8.4
--if(${CMAKE_VERSION} VERSION_GREATER 2.8.3)
--    cmake_policy(SET CMP0017 NEW)
--endif()
--
- # wv2 versioning
- set( WV2_MAJOR_VERSION 0 )
- set( WV2_MINOR_VERSION 9 )
-diff --git a/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt b/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt
-index 7d5086a0ebd..10d1c022e9e 100644
---- a/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt
-+++ b/filters/words/msword-odf/wv2/src/generator/CMakeLists.txt
-@@ -1,10 +1,5 @@
- # Generate parsers for some Word structures.
--cmake_minimum_required(VERSION 2.8.0)
--
--#cmake_policy CMP0017 was introduced in version 2.8.4
--if(${CMAKE_VERSION} VERSION_GREATER 2.8.3)
--    cmake_policy(SET CMP0017 NEW)
--endif()
-+cmake_minimum_required(VERSION 3.2.0)
- 
- set( scanner_word95
- 	${CMAKE_CURRENT_BINARY_DIR}/word95_generated.h
-diff --git a/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt b/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt
-index 41e932d5869..cbd6ad9a83e 100644
---- a/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt
-+++ b/filters/words/rtf/import/3rdparty/rtf-qt/CMakeLists.txt
-@@ -1,14 +1,9 @@
- project( RtfReader )
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.2)
- 
- include(GenerateExportHeader)
- 
--#cmake_policy CMP0017 was introduced in version 2.8.4
--if(${CMAKE_VERSION} VERSION_GREATER 2.8.3)
--    cmake_policy(SET CMP0017 NEW)
--endif()
--
- find_package(Qt5 5.2.0 REQUIRED Gui)
- 
- add_subdirectory( src )
--- 
-2.35.1
-
diff --git a/debian/patches/upstream_SvgOutputDev-Fix-ifdef-version-for-getFont-API-chang.patch b/debian/patches/upstream_SvgOutputDev-Fix-ifdef-version-for-getFont-API-chang.patch
deleted file mode 100644
index 44a2e7e..0000000
--- a/debian/patches/upstream_SvgOutputDev-Fix-ifdef-version-for-getFont-API-chang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 59eb4d2235b88408accf452421526b6f281cbab0 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Wed, 13 Apr 2022 21:30:14 +0200
-Subject: [PATCH] SvgOutputDev: Fix ifdef version for getFont API change
-
----
- filters/karbon/pdf/SvgOutputDev.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 7caec15175a..af07c379900 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -390,7 +390,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
-     if (s->getLength() == 0)
-         return;
- 
--#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
-+#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 04, 0)
-     GfxFont * font = state->getFont();
- #else
-     std::shared_ptr<GfxFont> font = state->getFont();
--- 
-2.35.1
-
diff --git a/debian/patches/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch b/debian/patches/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch
deleted file mode 100644
index 5f27188..0000000
--- a/debian/patches/upstream_Update-Cmake-and-deps-Fix-Freetype-and-FontConfig-Li.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta at gmail.com>
-Date: Sun, 6 Jun 2021 08:41:05 +0000
-Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage
-
-Cmake to 3.16
-KF to 5.76
-QT to 5.12
-ECM follow KF's version
-Update CALLIGRA_YEAR to 2021
-Fix Fontconfig's FOUND variable
-Fix Fontconfig's include_dirs variable
-Use Correct Target to link FontConfig and Freetype
----
- CMakeLists.txt           | 20 +++++++-------------
- libs/text/CMakeLists.txt |  4 ++--
- 2 files changed, 9 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b237f68fcb6..cdcc02f0236 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,9 +89,6 @@ if(NOT DEFINED RELEASE_BUILD)
- endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
- 
--# use CPP-11
--set (CMAKE_CXX_STANDARD 11)
--
- ############
- #############
- ## Options ##
- endif()
- 
- 
--- 
-2.35.1
-
diff --git a/debian/rules b/debian/rules
index 69e733f..a6f7aac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,48 @@
 #!/usr/bin/make -f
 
+lib_pkgs := calligra-libs
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# lots of deprecation warnings, so disable them for now
-export DEB_CXXFLAGS_MAINT_APPEND = -Wno-deprecated -Wno-deprecated-declarations
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --with kf5
+	dh $@ --parallel --with kde
 
 override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF -DBUILD_app_cstester=OFF -DBUILD_app_devtools=OFF -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
+	dh_auto_configure -Skde
 
-execute_after_dh_auto_install:
-	# Remove development symlinks of libraries
+override_dh_auto_install:
+	dh_auto_install
+	# Remove development stuff:
+	# - symlinks of libraries
 	find debian/tmp/usr/lib -name '*.so' -type l -print -delete
-	# Remove stuff belonging to unported calligraflow
-	rm -f debian/tmp/usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_vsdx2odg.so
-	rm -f debian/tmp/usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_wpg2odg.so
-	rm -f debian/tmp/usr/share/kservices5/flow_vsdx_thumbnail.desktop
-	rm -f debian/tmp/usr/share/kservices5/flow_wpg_thumbnail.desktop
-	# Remove translations of stuff not shipped
-	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/braindump.mo
-	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/calligra_semanticitem_*.mo
-	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/calligra_shape_comment.mo
-	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/calligra_shape_template.mo
-	# Remove color profiles, which ideally should be shipped somewhere ...
-	rm -rf debian/tmp/usr/share/color/
+	# - headers
+	rm -rfv debian/tmp/usr/include
+	# - cmake configuration files
+	rm -rfv debian/tmp/usr/share/kde4/apps/cmake
+	# Remove mimetypes already provided by shared-mime-info
+	rm -f debian/tmp/usr/share/mime/packages/msooxml-all.xml
+	rm -f debian/tmp/usr/share/mime/packages/x-iwork-keynote-sffkey.xml
+	# remove calligra plan translations now in separated plan source
+	rm -f debian/tmp/usr/share/locale/*/*/*plan*
+
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_link:
+	# the calligra-gemini components are installed in a multi-arch library
+	# directory, but kdelibs 4.x does not support that -- instead,
+	# create a simple symlink to avoid shuffling things too much
+	if [ -d debian/calligra-gemini ]; then \
+	    ln -s $(DEB_HOST_MULTIARCH)/calligra $(CURDIR)/debian/calligra-gemini/usr/lib/calligra; \
+	fi
+	dh_link
+
+override_dh_strip:
+	dh_strip --dbgsym-migration='calligra-dbg (<< 1:2.9.11)'
 
 .PHONY: override_dh_auto_test
diff --git a/debian/watch b/debian/watch
index c7e5a8f..e260ecb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,2 @@
 version=4
-
-opts=\
-repacksuffix=+dfsg,\
-dversionmangle=s/\+dfsg\d*$// \
- https://download.kde.org/Attic/calligra/([\d\.]+)/calligra-([\d\.]+)\.tar\.xz
+opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/Attic/calligra/([\d.]+)/calligra-([\d.]+).tar.xz


More information about the Neon-commits mailing list