[neon/extras/calligra/Neon/stable] debian: Revert "revert to a build that works for the tar"
Jonathan Riddell
null at kde.org
Mon Mar 4 11:36:34 GMT 2024
Git commit c80c687190dac4df4f74fbcdc879a91968cfcb51 by Jonathan Riddell.
Committed on 04/03/2024 at 11:36.
Pushed by jriddell into branch 'Neon/stable'.
Revert "revert to a build that works for the tar"
This reverts commit 1b0c3bce14aa1674871d80f98f54d56fb0def0bb.
M +1 -6 debian/calligra-data.install
A +1 -0 debian/calligra-data.maintscript
M +1 -2 debian/calligra-gemini.install
M +1 -2 debian/calligra-libs.install
M +2 -3 debian/calligra-libs.install.amd64
M +6 -2 debian/calligrasheets.install
M +10 -3 debian/calligrasheets.install.amd64
M +1 -2 debian/calligrastage-data.install
M +0 -1 debian/calligrawords.install
M +21 -3 debian/changelog
M +57 -27 debian/control
M +0 -1 debian/meta/cmake-ignore
M +1 -10 debian/okular-backend-odp.install
M +1 -13 debian/okular-backend-odt.install
D +0 -20 debian/patches/fontconfig-link.diff
D +0 -1 debian/patches/series
M +6 -6 debian/rules
https://invent.kde.org/neon/extras/calligra/-/commit/c80c687190dac4df4f74fbcdc879a91968cfcb51
diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index 12d4cd0..92e677e 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -1,7 +1,5 @@
-etc/xdg/calligra_stencils.knsrc
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
@@ -197,9 +195,6 @@ 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/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.maintscript b/debian/calligra-data.maintscript
new file mode 100644
index 0000000..175d166
--- /dev/null
+++ b/debian/calligra-data.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/calligra_stencils.knsrc
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 0683ac1..3097510 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -5,7 +5,6 @@ usr/bin/cstrunner
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*
@@ -28,7 +27,6 @@ usr/lib/*/qt5/plugins/calligra/dockers/calligra_docker_defaults.so
usr/lib/*/qt5/plugins/calligra/dockers/calligra_docker_stencils.so
usr/lib/*/qt5/plugins/calligra/pageapptools/kopabackgroundtool.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_artistictext.so
-usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_chart.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_formula.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_music.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_paths.so
@@ -49,3 +47,4 @@ 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
+usr/share/kservices5/calligradocinfopropspage.desktop
diff --git a/debian/calligra-libs.install.amd64 b/debian/calligra-libs.install.amd64
index 4ad5749..efbc318 100644
--- a/debian/calligra-libs.install.amd64
+++ b/debian/calligra-libs.install.amd64
@@ -5,7 +5,6 @@ usr/bin/cstrunner
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*
@@ -29,7 +28,6 @@ usr/lib/*/qt5/plugins/calligra/dockers/calligra_docker_defaults.so
usr/lib/*/qt5/plugins/calligra/dockers/calligra_docker_stencils.so
usr/lib/*/qt5/plugins/calligra/pageapptools/kopabackgroundtool.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_artistictext.so
-usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_chart.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_formula.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_music.so
usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_paths.so
@@ -46,8 +44,9 @@ 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/qml/org/kde/calligra/libCalligraComponentsPlugin.so
usr/lib/*/qt5/qml/org/kde/calligra/qmldir
+usr/lib/*/qt5/plugins/calligradocinfopropspage.so
+usr/share/kservices5/calligradocinfopropspage.desktop
diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index 828f4d6..c306aa5 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -1,7 +1,7 @@
etc/xdg/calligrasheetsrc
usr/bin/calligrasheets
-usr/lib/*/libcalligrasheetscommon.so.1*
-usr/lib/*/libcalligrasheetsodf.so.1*
+usr/lib/*/libcalligrasheetscommon.so.17*
+usr/lib/*/libcalligrasheetsodf.so.17*
usr/lib/*/libkdeinit5_calligrasheets.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_applixspread2kspread.so
usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_csv2sheets.so
@@ -18,6 +18,7 @@ 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
@@ -33,6 +34,9 @@ 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/calligra/icons/hicolor/22x22/actions/spreadsheetshape.png
+usr/share/calligra/icons/hicolor/22x22/actions/tool_cellformatting.png
+usr/share/calligra/icons/hicolor/32x32/actions/spreadsheetshape.png
usr/share/calligrasheets/
usr/share/config.kcfg/calligrasheets.kcfg
usr/share/doc/HTML/*/calligrasheets/
diff --git a/debian/calligrasheets.install.amd64 b/debian/calligrasheets.install.amd64
index 904f4f7..f60366a 100644
--- a/debian/calligrasheets.install.amd64
+++ b/debian/calligrasheets.install.amd64
@@ -1,8 +1,5 @@
etc/xdg/calligrasheetsrc
usr/bin/calligrasheets
-usr/lib/*/libcalligrasheetscommon.so.1*
-usr/lib/*/libcalligrasheetsodf.so.1*
-usr/lib/*/libkdeinit5_calligrasheets.so
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
@@ -49,3 +46,13 @@ 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
+usr/lib/*/libcalligrasheetscommon.so.17*
+usr/lib/*/libcalligrasheetsodf.so.17*
+usr/lib/*/libkdeinit5_calligrasheets.so
+usr/lib/*/qt5/plugins/calligra/shapes/calligra_shape_spreadsheet.so
+usr/share/calligra/icons/hicolor/22x22/actions/spreadsheetshape.png
+usr/share/calligra/icons/hicolor/22x22/actions/tool_cellformatting.png
+usr/share/calligra/icons/hicolor/32x32/actions/spreadsheetshape.png
+usr/share/calligra/icons/hicolor/22x22/actions/spreadsheetshape.png
+usr/share/calligra/icons/hicolor/22x22/actions/tool_cellformatting.png
+usr/share/calligra/icons/hicolor/32x32/actions/spreadsheetshape.png
diff --git a/debian/calligrastage-data.install b/debian/calligrastage-data.install
index e605292..2d64c4b 100644
--- a/debian/calligrastage-data.install
+++ b/debian/calligrastage-data.install
@@ -1,6 +1,5 @@
usr/share/calligrastage
-usr/share/doc/HTML/*/calligrastage
-usr/share/doc/HTML/*/stage/
+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
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index f69655b..dd2d668 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -24,7 +24,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 cc86f49..260f9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
-calligra (1:3.2.1+dfsg-5xneon+22.04+jammy+release+build23) jammy; urgency=medium
+calligra (1:3.2.1-0neon) jammy; urgency=medium
- * Automatic CI Build
+ * Applied upstream. Remove ki18n patch.
- -- Neon CI <neon at kde.org> Thu, 02 Nov 2023 22:17:30 +0000
+ -- 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
diff --git a/debian/control b/debian/control
index f38dafb..2ff73a2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: calligra
Section: kde
Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Adrien Grellier <perso at adrieng.fr>,
Raúl Sánchez Siles <rasasi78 at gmail.com>,
Maximiliano Curia <maxy at debian.org>
@@ -18,8 +19,10 @@ Build-Depends: cauchy-dev,
libgit2-dev,
libgsl-dev,
libicu-dev,
+ libilmbase-dev,
+ libimath-dev,
libjpeg-dev,
- libkchart-dev,
+ libkchart5-dev,
libkf5activities-dev,
libkf5akonadi-dev,
libkf5akonadicontact-dev,
@@ -45,13 +48,12 @@ Build-Depends: cauchy-dev,
libkf5widgetsaddons-dev,
libkf5windowsystem-dev,
libkf5xmlgui-dev,
- libkgantt-dev,
+ libkgantt5-dev,
libkproperty3-dev,
libkreport3-dev,
liblcms2-dev (>= 2.4),
libmarble-dev,
libodfgen-dev,
- libopenexr-dev,
libopenjpeg-dev | libopenjp2-7-dev,
libphonon4qt5-dev,
libphonon4qt5experimental-dev,
@@ -66,18 +68,19 @@ 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/
-Vcs-Git: https://invent.kde.org/neon/extras/calligra.git
-Vcs-Browser: https://invent.kde.org/neon/extras/calligra
-Maintainer: Neon CI <neon at kde.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
@@ -88,10 +91,10 @@ Depends: calligrasheets (>= ${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,
- a spreadsheet, a presentation program, a database application, etc., and
- raster and vector graphics tools.
+ This suite is a set of applications written to help you to accomplish your
+ work. It includes office applications such as a word processor,
+ a spreadsheet, a presentation program, a database application, with raster
+ and vector graphics tools, etc.
.
This metapackage provides all the components of the Calligra Suite.
@@ -110,7 +113,7 @@ Replaces: calligra-data (<< 1:2.4.3-2),
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
+ 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. Features include:
@@ -155,9 +158,9 @@ Depends: calligra-libs (= ${binary:Version}),
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
- formulae and statistics. It is the successor of KSpread.
+ A powerful spreadsheet application. It is scriptable and provides both
+ table-oriented sheets and support for complex mathematical formulae and
+ statistics. It is the successor of KSpread.
.
This package is part of the Calligra Suite.
@@ -180,10 +183,10 @@ 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
- looking documents. It can be used for desktop publishing, but also for
- "normal" word processing, like writing letters, reports and so on.
+ A FrameMaker-like word processing and desktop publishing application.
+ It is capable of creating polished and professional looking documents.
+ It can be used for desktop publishing, but also for "normal" word
+ processing, like writing letters, reports and so on.
.
This package is part of the Calligra Suite.
@@ -212,14 +215,14 @@ 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}),
+ calligrastage-data (>=${source:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: khelpcenter
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
+ 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
@@ -256,7 +259,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
@@ -290,11 +293,10 @@ Depends: calligra-libs (= ${binary:Version}),
Breaks: calligragemini (<< ${source:Version}~ciBuild)
Replaces: calligragemini (<< ${source:Version}~ciBuild)
Description: Calligra Gemini is an office suite designed for 2-in-1 devices
- Calligra Gemini is an office suite which wraps the Calligra suite's
- word processing and presentation components in a user interface which
- can switch between a touch optimised user interface and a traditional
- desktop one, allowing you to keep working and not loose your place in
- your work.
+ An office suite which wraps the Calligra suite's word processing and
+ presentation components in a user interface which can switch between
+ a touch optimised user interface and a traditional desktop one,
+ allowing you to keep working and not loose your place in your work.
.
This package is part of the Calligra Suite.
@@ -309,3 +311,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/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-odp.install b/debian/okular-backend-odp.install
index cf8c69f..8b13789 100644
--- a/debian/okular-backend-odp.install
+++ b/debian/okular-backend-odp.install
@@ -1,10 +1 @@
-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
-usr/share/applications/okularApplication_odp_calligra.desktop
-usr/share/applications/okularApplication_powerpoint_calligra.desktop
-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
+
diff --git a/debian/okular-backend-odt.install b/debian/okular-backend-odt.install
index c75c7a4..8b13789 100644
--- a/debian/okular-backend-odt.install
+++ b/debian/okular-backend-odt.install
@@ -1,13 +1 @@
-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_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_wpd_calligra.desktop
-usr/share/kservices5/okularDoc_calligra.desktop
-usr/share/kservices5/okularDocx_calligra.desktop
-usr/share/kservices5/okularOdt_calligra.desktop
-usr/share/kservices5/okularWpd_calligra.desktop
+
diff --git a/debian/patches/fontconfig-link.diff b/debian/patches/fontconfig-link.diff
deleted file mode 100644
index 5ab9298..0000000
--- a/debian/patches/fontconfig-link.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: calligra-3.2.1/libs/text/CMakeLists.txt
-===================================================================
---- calligra-3.2.1.orig/libs/text/CMakeLists.txt
-+++ calligra-3.2.1/libs/text/CMakeLists.txt
-@@ -151,13 +151,9 @@ if( SHOULD_BUILD_FEATURE_RDF )
- target_link_libraries(kotext PRIVATE ${SOPRANO_LIBRARIES})
- endif()
-
--if( FONTCONFIG_FOUND )
-- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
--endif()
-+ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
-
--if( FREETYPE_FOUND )
-- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
--endif()
-+ target_link_libraries(kotext PRIVATE Freetype::Freetype)
-
-
- set_target_properties(kotext PROPERTIES
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1dd8fdc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fontconfig-link.diff
diff --git a/debian/rules b/debian/rules
index a6f7aac..583c9c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,10 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
- dh $@ --parallel --with kde
+ dh $@ --parallel --with kf5
override_dh_auto_configure:
- dh_auto_configure -Skde
+ dh_auto_configure -Skf5 -- -DCMAKE_CXX_STANDARD=20
override_dh_auto_install:
dh_auto_install
@@ -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