From c26061054084aae3296614036e0f9149f6b6c856 Mon Sep 17 00:00:00 2001
From: Markus Brechtel <markus.brechtel+kita-pro@thengo.net>
Date: Thu, 1 Aug 2019 09:49:30 +0200
Subject: [PATCH] reorganize multimedia and desktop packages

---
 defaults/main.yml       |  5 ++---
 tasks/clean.yaml        | 10 ++++++++++
 tasks/desktop_apps.yaml | 10 +---------
 tasks/main.yaml         |  2 ++
 tasks/multimedia.yaml   |  3 +++
 tasks/xfce.yaml         |  1 -
 6 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 tasks/clean.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index d827741..df67d86 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,9 +8,8 @@ application_starters:
   - libreoffice-draw
   - xfce-display-settings
   - xfce4-screenshooter
+  - gthumb
   - simple-scan
-  - fotowall
-  - org.kde.gwenview
 
 application_default_favorites:
   - exo-file-manager
@@ -25,7 +24,7 @@ application_default_favorites:
   - xfce4-screenshooter
   - simple-scan
   - fotowall
-  - org.kde.gwenview
+  - gthumb
 
 install_fotowall: true
 install_cewe_fotobuch: false
diff --git a/tasks/clean.yaml b/tasks/clean.yaml
new file mode 100644
index 0000000..ea35974
--- /dev/null
+++ b/tasks/clean.yaml
@@ -0,0 +1,10 @@
+---
+
+
+- name: ensure old packages are absent
+  apt:
+    pkg:
+      - gwenview
+      - kipi-plugins
+      - kde-l10n-de
+    state: absent
diff --git a/tasks/desktop_apps.yaml b/tasks/desktop_apps.yaml
index 89f93d0..18de9ab 100644
--- a/tasks/desktop_apps.yaml
+++ b/tasks/desktop_apps.yaml
@@ -19,19 +19,11 @@
   apt:
     pkg:
       - simple-scan
-      - gwenview
-      - kipi-plugins
-      - kde-l10n-de
+      - gthumb
       - krita
       - krita-l10n
       - gimp
       - gimp-help-de
-      - vlc
-      - vlc-l10n
-      - libdvdread4
-      - libdvd-pkg
       - audacity
-      - openshot
-      - openshot-doc
       - gnome-search-tool
       - notify-osd
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 61a2e1c..714b071 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -18,6 +18,8 @@
 
 - import_tasks: network.yaml
 
+- import_tasks: clean.yaml
+
 - import_tasks: xfce.yaml
 - import_tasks: backgrounds.yaml
 - import_tasks: fonts.yaml
diff --git a/tasks/multimedia.yaml b/tasks/multimedia.yaml
index 45dde8a..cc421dd 100644
--- a/tasks/multimedia.yaml
+++ b/tasks/multimedia.yaml
@@ -6,3 +6,6 @@
       - vlc
       - vlc-l10n
       - libdvd-pkg
+      - libdvdread4
+      - openshot
+      - openshot-doc
diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml
index 25fd18a..09cbb0c 100644
--- a/tasks/xfce.yaml
+++ b/tasks/xfce.yaml
@@ -8,7 +8,6 @@
       - task-xfce-desktop
       - task-german
       - task-german-desktop
-      - eog
       - dmz-cursor-theme
       - gnome-brave-icon-theme
       - gnome-dust-icon-theme