[neon/kde/artikulate/Neon/release] /: update

[Jonathan Riddell]

Git commit 31aed58fa4303751880395ad8d7e9de8d93dafa3 by Jonathan Riddell.
Committed on 09/03/2021 at 13:56.
Pushed by jriddell into branch 'Neon/release'.

update

M  +2    -0    debian/control
M  +9    -7    debian/tests/control
M  +5    -16   snapcraft.yaml

https://invent.kde.org/neon/kde/artikulate/commit/31aed58fa4303751880395ad8d7e9de8d93dafa3

diff --git a/debian/control b/debian/control
index e5c4853..07eb436 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,10 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/artikulate.git
 Package: artikulate
 Architecture: any
 Depends: kio,
+         qml-module-org-kde-kirigami2,
          qml-module-org-kde-kquickcontrolsaddons,
          qml-module-qtqml-models2,
+         qml-module-qtquick-shapes,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: ${kde-l10n:all}
diff --git a/debian/tests/control b/debian/tests/control
index fa6e7ea..6e5d0d4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,9 +1,11 @@
 Tests: testsuite
-Depends: @, cmake, libqt5test5, debhelper, build-essential,
-         xvfb, xauth, dbus (>= 1.8), libqt5sql5-sqlite
+Depends: build-essential,
+         cmake,
+         dbus (>= 1.8),
+         debhelper,
+         libqt5sql5-sqlite,
+         libqt5test5,
+         xauth,
+         xvfb,
+         @
 Restrictions: build-needed
-
-# Tests: acc
-# Depends: @,
-#          dh-acc, exuberant-ctags
-# Restrictions: allow-stderr
diff --git a/snapcraft.yaml b/snapcraft.yaml
index d86dc17..a0f9b6a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -46,9 +46,7 @@ parts:
         - kde-frameworks-5-env
         plugin: cmake
         build-packages:
-        - build-essential
         - kdoctools5
-        - qt5-default
         - libqt5gstreamer-dev
         - kirigami2-dev
         stage-packages:
@@ -57,6 +55,10 @@ parts:
         - libqt5gstreamerui-1.0-0
         - libqt5gstreamerutils-1.0-0
         - libslang2
+        - qml-module-qtquick-shapes
+        - qml-module-org-kde-kirigami2
+        - qml-module-org-kde-kquickcontrolsaddons
+        - qml-module-qtqml-models2
         source: http://download.kde.org/stable/release-service/20.12.3/src/artikulate-20.12.3.tar.xz
         cmake-parameters:
         - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
@@ -81,18 +83,5 @@ parts:
         prime:
         - "$exclusion"
     kde-frameworks-5-env:
-        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"
         plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git