[neon/extras/calligra/Neon/stable] debian: merge unstable insto stable
Carlos De Maine
null at kde.org
Thu Mar 30 09:39:08 BST 2023
Git commit 313355f21265d912d2e3655e60c112bbf38eb290 by Carlos De Maine.
Committed on 30/03/2023 at 08:39.
Pushed by carlosdem into branch 'Neon/stable'.
merge unstable insto stable
M +1 -5 debian/calligra-data.install
M +1 -2 debian/calligra-gemini.install
M +2 -2 debian/calligra-libs.install
M +2 -2 debian/calligra-libs.install.amd64
M +5 -4 debian/calligrasheets.install
M +5 -4 debian/calligrasheets.install.amd64
M +2 -1 debian/calligrastage-data.install
M +0 -1 debian/calligrastage.install
M +0 -2 debian/calligrawords.install
M +24 -0 debian/changelog
M +38 -3 debian/control
M +2 -1 debian/karbon.install
M +0 -1 debian/meta/cmake-ignore
M +3 -0 debian/okular-backend-odt.install
M +4 -4 debian/rules
https://invent.kde.org/neon/extras/calligra/commit/313355f21265d912d2e3655e60c112bbf38eb290
diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index ceab4ae..3b93dec 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -1,6 +1,5 @@
usr/share/applications/calligra.desktop
-usr/share/calligra/autocorrect/autocorrect.xml
-usr/share/calligra/autocorrect/en_US.xml
+usr/share/calligra/autocorrect/*.xml
usr/share/calligra/calligra_shell.rc
usr/share/calligra/cursors/cursor_connect.png
usr/share/calligra/cursors/cursor_rotate.png
@@ -132,14 +131,12 @@ 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/spreadsheetshape.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_cellformatting.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
@@ -173,7 +170,6 @@ 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/spreadsheetshape.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
diff --git a/debian/calligra-gemini.install b/debian/calligra-gemini.install
index 34c6fd2..f542a74 100644
--- a/debian/calligra-gemini.install
+++ b/debian/calligra-gemini.install
@@ -1,7 +1,6 @@
usr/bin/calligragemini
usr/bin/calligrageminithumbnailhelper
-usr/lib/*/libgemini.so.17
-usr/lib/*/libgemini.so.17*
+usr/lib/*/libgemini.so.*
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
diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index aae2b3c..577c09f 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -2,10 +2,10 @@ usr/bin/calligra
usr/bin/calligraconverter
usr/bin/cstester
usr/bin/cstrunner
+usr/lib/*/libautocorrection.so.1*
usr/lib/*/libbasicflakes.so.1*
usr/lib/*/libflake.so.1*
usr/lib/*/libkoformula.so.1*
-usr/lib/*/libkoformula.so.1*
usr/lib/*/libkomain.so.1*
usr/lib/*/libkomsooxml.so.1*
usr/lib/*/libkoodf.so.1*
@@ -45,8 +45,8 @@ usr/lib/*/qt5/plugins/calligra/textediting/calligra_textediting_thesaurus.so
usr/lib/*/qt5/plugins/calligra/textinlineobjects/calligra_textinlineobject_variables.so
usr/lib/*/qt5/plugins/calligra/tools/calligra_tool_basicflakes.so
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/plugins/kf5/propertiesdialog/calligradocinfopropspage.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 4ad5749..066b759 100644
--- a/debian/calligra-libs.install.amd64
+++ b/debian/calligra-libs.install.amd64
@@ -2,10 +2,10 @@ usr/bin/calligra
usr/bin/calligraconverter
usr/bin/cstester
usr/bin/cstrunner
+usr/lib/*/libautocorrection.so.1*
usr/lib/*/libbasicflakes.so.1*
usr/lib/*/libflake.so.1*
usr/lib/*/libkoformula.so.1*
-usr/lib/*/libkoformula.so.1*
usr/lib/*/libkokross.so.1*
usr/lib/*/libkomain.so.1*
usr/lib/*/libkomsooxml.so.1*
@@ -46,8 +46,8 @@ usr/lib/*/qt5/plugins/calligra/textediting/calligra_textediting_thesaurus.so
usr/lib/*/qt5/plugins/calligra/textinlineobjects/calligra_textinlineobject_variables.so
usr/lib/*/qt5/plugins/calligra/tools/calligra_tool_basicflakes.so
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/plugins/kf5/propertiesdialog/calligradocinfopropspage.so
usr/lib/*/qt5/qml/org/kde/calligra/libCalligraComponentsPlugin.so
usr/lib/*/qt5/qml/org/kde/calligra/qmldir
diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index ea039d3..d5e28c9 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -1,8 +1,9 @@
etc/xdg/calligrasheetsrc
usr/bin/calligrasheets
-usr/lib/*/libcalligrasheetscommon.so.1*
-usr/lib/*/libcalligrasheetsodf.so.1*
-usr/lib/*/libkdeinit5_calligrasheets.so
+usr/lib/*/libcalligrasheetscore.so.1*
+usr/lib/*/libcalligrasheetsengine.so.1*
+usr/lib/*/libcalligrasheetspartlib.so.1*
+usr/lib/*/libcalligrasheetsui.so.1*
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_applixspread2kspread.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_csv2sheets.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_dbase2kspread.so
@@ -18,7 +19,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/calligra/shapes/calligra_shape_spreadsheet.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
@@ -37,6 +37,7 @@ 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
diff --git a/debian/calligrasheets.install.amd64 b/debian/calligrasheets.install.amd64
index 17fa137..ca489c3 100644
--- a/debian/calligrasheets.install.amd64
+++ b/debian/calligrasheets.install.amd64
@@ -1,8 +1,9 @@
etc/xdg/calligrasheetsrc
usr/bin/calligrasheets
-usr/lib/*/libcalligrasheetscommon.so.1*
-usr/lib/*/libcalligrasheetsodf.so.1*
-usr/lib/*/libkdeinit5_calligrasheets.so
+usr/lib/*/libcalligrasheetscore.so.1*
+usr/lib/*/libcalligrasheetsengine.so.1*
+usr/lib/*/libcalligrasheetspartlib.so.1*
+usr/lib/*/libcalligrasheetsui.so.1*
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_applixspread2kspread.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_csv2sheets.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_dbase2kspread.so
@@ -18,7 +19,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/calligra/shapes/calligra_shape_spreadsheet.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
@@ -38,6 +38,7 @@ 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
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index bf39bb8..2d64c4b 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -1,5 +1,6 @@
usr/share/calligrastage
-usr/share/doc/HTML/*/calligrastage
+usr/share/doc/HTML/*/calligrastage/
+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
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index ca0d52c..3358484 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -1,7 +1,6 @@
etc/xdg/calligrastagerc
usr/bin/calligrastage
usr/lib/*/libcalligrastageprivate.so.1*
-usr/lib/*/libkdeinit5_calligrastage.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_key2odp.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_kpr2odp.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_ppt2odp.so
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index f69655b..e60d1bb 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -1,7 +1,6 @@
etc/xdg/calligrawordsrc
usr/bin/calligrawords
usr/lib/*/libRtfReader.so.1*
-usr/lib/*/libkdeinit5_calligrawords.so
usr/lib/*/libkoversion.so.1*
usr/lib/*/libkowv2.so.9
usr/lib/*/libkowv2.so.9.0.0
@@ -24,7 +23,6 @@ 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
diff --git a/debian/changelog b/debian/changelog
index c3a3035..260f9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+calligra (1:3.2.1-0neon) jammy; urgency=medium
+
+ * Applied upstream. Remove ki18n patch.
+
+ -- Carlos De Maine <carlosdemaine at gmail.com> Mon, 16 Jan 2023 17:35:26 +1000
+
+calligra (1:3.2.1+dfsg-5neon3) jammy; urgency=medium
+
+ * Applied upstream. Remove ki18n patch.
+
+ -- Scarlett Moore <sgmoore at debian.org> Thu, 06 Oct 2022 09:30:46 -0700
+
+calligra (1:3.2.1+dfsg-5neon2) jammy; urgency=medium
+
+ * Attempt to add patch to add ki18n install po in cmake.
+
+ -- Scarlett Moore <sgmoore at debian.org> Thu, 06 Oct 2022 08:13:13 -0700
+
+calligra (1:3.2.1+dfsg-5neon1) jammy; urgency=medium
+
+ * Update python recommends to python3 as python2 is no more.
+
+ -- Scarlett Moore <sgmoore at debian.org> Wed, 05 Oct 2022 06:43:40 -0700
+
calligra (1:3.2.1+dfsg-5neon) xenial; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 34e8012..801a712 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Build-Depends: cauchy-dev,
libgit2-dev,
libgsl-dev,
libicu-dev,
+ libilmbase-dev,
+ libimath-dev,
libjpeg-dev,
libkchart-dev,
libkf5activities-dev,
@@ -52,11 +54,14 @@ Build-Depends: cauchy-dev,
liblcms2-dev (>= 2.4),
libmarble-dev,
libodfgen-dev,
- libopenexr-dev,
+# libopenexr-dev,
libopenjpeg-dev | libopenjp2-7-dev,
libphonon4qt5-dev,
libphonon4qt5experimental-dev,
libpng-dev,
+ libpoppler-dev,
+ libpoppler-private-dev,
+ libpoppler-qt5-dev,
libqca-qt5-2-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
@@ -67,12 +72,14 @@ Build-Depends: cauchy-dev,
libwps-dev (>= 0.4),
libxbase64-dev,
libxml2-dev,
+ okular-dev,
pkg-config,
pkg-kde-tools,
pstoedit,
+ qtbase5-private-dev,
qtdeclarative5-dev,
shared-mime-info,
- vc-dev [!armhf !arm64],
+ vc-dev,
zlib1g-dev
Standards-Version: 3.9.8
Homepage: http://www.calligra.org/
@@ -256,7 +263,7 @@ Breaks: kexi (<< 1:2.6.1)
Depends: calligra-data (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: fonts-lyx, libqca2-plugins, python, ruby
+Recommends: fonts-lyx, libqca2-plugins, python3, ruby
Suggests: texlive, wordnet
Description: common libraries and binaries for the Calligra Suite
This package provides the libraries and binaries that are shared amongst
@@ -305,3 +312,31 @@ Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: braindump - transitional
Transitional dummy package.
+
+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.
+ .
+ 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 and WPD documents.
+ .
+ This package is part of the Calligra Suite.
diff --git a/debian/karbon.install b/debian/karbon.install
index c8c8464..3200649 100644
--- a/debian/karbon.install
+++ b/debian/karbon.install
@@ -2,13 +2,14 @@ etc/xdg/karbonrc
usr/bin/karbon
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
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
index 4bfad71..91cdce8 100644
--- a/debian/meta/cmake-ignore
+++ b/debian/meta/cmake-ignore
@@ -1,4 +1,3 @@
Libqgit2
-Vc
Qt5OpenGL
Qt5Declarative
diff --git a/debian/okular-backend-odt.install b/debian/okular-backend-odt.install
index c75c7a4..05f6e1a 100644
--- a/debian/okular-backend-odt.install
+++ b/debian/okular-backend-odt.install
@@ -2,12 +2,15 @@ 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
diff --git a/debian/rules b/debian/rules
index 67b14e4..b073a8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,10 @@ 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
+ #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)'
More information about the Neon-commits
mailing list