[neon/extras/calligra/Neon/stable] /: update .install, remove snapcraft

Jonathan Esk-Riddell null at kde.org
Tue Feb 6 15:20:18 GMT 2024


Git commit dfa7df09b89cc2822e81dd26b76a2d4297cddafc by Jonathan Esk-Riddell.
Committed on 06/02/2024 at 15:20.
Pushed by jriddell into branch 'Neon/stable'.

update .install, remove snapcraft

M  +2    -0    debian/calligra-libs.install
M  +2    -0    debian/calligra-libs.install.amd64
M  +7    -0    debian/calligrasheets.install
M  +4    -0    debian/calligrasheets.install.amd64
M  +1    -0    debian/calligrastage.install
M  +1    -0    debian/calligrawords.install
M  +1    -2    debian/control
M  +1    -0    debian/karbon.install
M  +1    -0    debian/okular-backend-odp.install
M  +1    -0    debian/okular-backend-odt.install
D  +0    -219  snapcraft.yaml

https://invent.kde.org/neon/extras/calligra/-/commit/dfa7df09b89cc2822e81dd26b76a2d4297cddafc

diff --git a/debian/calligra-libs.install b/debian/calligra-libs.install
index 1613bfa..3097510 100644
--- a/debian/calligra-libs.install
+++ b/debian/calligra-libs.install
@@ -42,7 +42,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/share/kservices5/calligradocinfopropspage.desktop
diff --git a/debian/calligra-libs.install.amd64 b/debian/calligra-libs.install.amd64
index 91d8cea..efbc318 100644
--- a/debian/calligra-libs.install.amd64
+++ b/debian/calligra-libs.install.amd64
@@ -48,3 +48,5 @@ 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 317ad84..c306aa5 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -1,5 +1,8 @@
 etc/xdg/calligrasheetsrc
 usr/bin/calligrasheets
+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
 usr/lib/*/qt5/plugins/calligra/formatfilters/calligra_filter_dbase2kspread.so
@@ -15,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
@@ -30,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 5b32a91..bdf022e 100644
--- a/debian/calligrasheets.install.amd64
+++ b/debian/calligrasheets.install.amd64
@@ -46,3 +46,7 @@ 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
diff --git a/debian/calligrastage.install b/debian/calligrastage.install
index 3358484..ca0d52c 100644
--- a/debian/calligrastage.install
+++ b/debian/calligrastage.install
@@ -1,6 +1,7 @@
 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 e60d1bb..dd2d668 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -1,6 +1,7 @@
 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
diff --git a/debian/control b/debian/control
index 8b12db4..0e889c8 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,6 @@ Build-Depends: cauchy-dev,
                liblcms2-dev (>= 2.4),
                libmarble-dev,
                libodfgen-dev,
-#              libopenexr-dev,
                libopenjpeg-dev | libopenjp2-7-dev,
                libphonon4qt5-dev,
                libphonon4qt5experimental-dev,
@@ -285,10 +284,10 @@ Description: common shared data for the Calligra Suite
 Package: calligra-gemini
 Architecture: any
 Depends: calligra-libs (= ${binary:Version}),
-         qml-module-qtwebengine,
          qml-module-org-kde-kirigami2,
          qml-module-qtquick-controls,
          qml-module-qtquick-controls2,
+         qml-module-qtwebengine,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: calligragemini (<< ${source:Version}~ciBuild)
diff --git a/debian/karbon.install b/debian/karbon.install
index 34e6505..c8c8464 100644
--- a/debian/karbon.install
+++ b/debian/karbon.install
@@ -2,6 +2,7 @@ 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
diff --git a/debian/okular-backend-odp.install b/debian/okular-backend-odp.install
index e69de29..8b13789 100644
--- a/debian/okular-backend-odp.install
+++ b/debian/okular-backend-odp.install
@@ -0,0 +1 @@
+
diff --git a/debian/okular-backend-odt.install b/debian/okular-backend-odt.install
index e69de29..8b13789 100644
--- a/debian/okular-backend-odt.install
+++ b/debian/okular-backend-odt.install
@@ -0,0 +1 @@
+
diff --git a/snapcraft.yaml b/snapcraft.yaml
deleted file mode 100644
index 74ea1f4..0000000
--- a/snapcraft.yaml
+++ /dev/null
@@ -1,219 +0,0 @@
----
-name: calligra
-version: 3.2.1
-confinement: strict
-grade: stable
-base: core20
-adopt-info: calligra
-apps:
-  calligra:
-    extensions:
-    - kde-neon
-    command: usr/bin/calligra
-    plugs:
-    - kde-frameworks-5-plug
-    - home
-    - network
-    - network-bind
-    - audio-playback
-    - removable-media
-  calligrawords:
-    extensions:
-    - kde-neon
-    common-id: org.kde.calligrawords.desktop
-    command: usr/bin/calligrawords
-    plugs:
-    - kde-frameworks-5-plug
-    - home
-    - network
-    - network-bind
-    - audio-playback
-    - removable-media
-  calligrastage:
-    extensions:
-    - kde-neon
-    common-id: org.kde.calligrastage.desktop
-    command: usr/bin/calligrastage
-    plugs:
-    - kde-frameworks-5-plug
-    - home
-    - network
-    - network-bind
-    - audio-playback
-    - removable-media
-  calligrasheets:
-    extensions:
-    - kde-neon
-    common-id: org.kde.calligrasheets.desktop
-    command: usr/bin/calligrasheets
-    plugs:
-    - kde-frameworks-5-plug
-    - home
-    - network
-    - network-bind
-    - audio-playback
-    - removable-media
-  karbon:
-    extensions:
-    - kde-neon
-    common-id: org.kde.karbon.desktop
-    command: usr/bin/karbon
-    plugs:
-    - kde-frameworks-5-plug
-    - home
-    - network
-    - network-bind
-    - audio-playback
-    - removable-media
-slots:
-  session-dbus-interface:
-    interface: dbus
-    name: org.kde.calligra
-    bus: session
-parts:
-  calligra:
-    after:
-    - kdelibs4support
-    - kross
-    plugin: cmake
-    build-packages:
-    - libboost-dev
-    - libboost-system-dev
-    - libeigen3-dev
-    - libetonyek-dev
-    - libfontconfig1-dev
-    - libfreetype6-dev
-    - libgit2-dev
-    - libgsl-dev
-    - libicu-dev
-    - libjpeg-dev
-    - libkchart-dev
-    - libkgantt-dev
-    - libkproperty3-dev
-    - libkreport3-dev
-    - liblcms2-dev
-    - libmarble-dev
-    - libodfgen-dev
-    - libopenexr-dev
-    - libopenjp2-7-dev
-    - libphonon4qt5-dev
-    - libphonon4qt5experimental-dev
-    - libpng-dev
-    - libpoppler-private-dev
-    - libpoppler-qt5-dev
-    - libqca-qt5-2-dev
-    - libspnav-dev
-    - libvisio-dev
-    - libwpd-dev
-    - libwpg-dev
-    - libwps-dev
-    - libxbase64-dev
-    - libxml2-dev
-    - pkg-config
-    - pkg-kde-tools
-    - pstoedit
-    - shared-mime-info
-    - zlib1g-dev
-    stage-packages:
-    - libqca-qt5-2
-    - libetonyek-0.1-1
-    - libgsl23
-    - libgslcblas0
-    - libilmbase24
-    - libkchart2
-    - liblangtag1
-    - libodfgen-0.1-1
-    - libphonon4qt5experimental4
-    - librevenge-0.0-0
-    - libspnav0
-    - libvisio-0.1-1
-    - libwpd-0.10-10
-    - libwpg-0.3-3
-    - libwps-0.4-4
-    parse-info:
-    - usr/share/metainfo/org.kde.calligrawords.appdata.xml
-    - usr/share/metainfo/org.kde.calligrasheets.appdata.xml
-    - usr/share/metainfo/org.kde.calligrastage.appdata.xml
-    - usr/share/metainfo/org.kde.karbon.appdata.xml
-    source: https://download.kde.org/stable/calligra/3.2.1/calligra-3.2.1.tar.xz
-    cmake-parameters:
-    - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-    - "-DCMAKE_INSTALL_PREFIX=/usr"
-    - "-DCMAKE_BUILD_TYPE=Release"
-    - "-DENABLE_TESTING=OFF"
-    - "-DBUILD_TESTING=OFF"
-    - "-DKDE_SKIP_TEST_SETTINGS=ON"
-    - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/x86_64-linux-gnu/qt5/plugins/"
-    - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-    filesets:
-        exclusion:
-        - "-usr/lib/*/cmake/*"
-        - "-usr/include/*"
-        - "-usr/share/ECM/*"
-        - "-usr/share/doc/*"
-        - "-usr/share/man/*"
-        - "-usr/share/icons/breeze-dark*"
-        - "-usr/bin/X11"
-        - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-        - "-usr/lib/aspell/*"
-    prime:
-    - "$exclusion"
-  kdelibs4support:
-    plugin: cmake
-    build-packages:
-    - extra-cmake-modules
-    - cmake
-    - kgendesignerplugin
-    - libintl-perl
-    - network-manager-dev
-    - libsm-dev
-    - libnm-dev
-    - libkf5doctools-dev
-    - kded5
-    source: https://download.kde.org/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz
-    cmake-parameters:
-    - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-    - "-DCMAKE_INSTALL_PREFIX=/usr"
-    - "-DCMAKE_BUILD_TYPE=Release"
-    - "-DENABLE_TESTING=OFF"
-    - "-DBUILD_TESTING=OFF"
-    - "-DKDE_SKIP_TEST_SETTINGS=ON"
-    - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-    filesets:
-        exclusion:
-        - "-usr/lib/*/cmake/*"
-        - "-usr/include/*"
-        - "-usr/share/ECM/*"
-        - "-usr/share/doc/*"
-        - "-usr/share/man/*"
-        - "-usr/share/icons/breeze-dark*"
-        - "-usr/bin/X11"
-        - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-        - "-usr/lib/aspell/*"
-    prime:
-    - "$exclusion"
-    - "-usr/lib/*/libexec/kf5/fileshareset"
-  kross:
-    plugin: cmake
-    source: https://download.kde.org/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz
-    cmake-parameters:
-    - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-    - "-DCMAKE_INSTALL_PREFIX=/usr"
-    - "-DCMAKE_BUILD_TYPE=Release"
-    - "-DENABLE_TESTING=OFF"
-    - "-DBUILD_TESTING=OFF"
-    - "-DKDE_SKIP_TEST_SETTINGS=ON"
-    - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-    filesets:
-        exclusion:
-        - "-usr/lib/*/cmake/*"
-        - "-usr/include/*"
-        - "-usr/share/ECM/*"
-        - "-usr/share/doc/*"
-        - "-usr/share/man/*"
-        - "-usr/share/icons/breeze-dark*"
-        - "-usr/bin/X11"
-        - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-        - "-usr/lib/aspell/*"
-    prime:
-    - "$exclusion"


More information about the Neon-commits mailing list