From 9ad3df557bc670e9e6476e3911d3d801eed3a143 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 5 Oct 2020 15:48:11 +0200
Subject: DAW: move the files for custom submenu into new subfolder

Un-clutter needed to prepare for further customization of the DAW ISO.
---
 daw/liveslak-daw.directory            |   6 ------
 daw/liveslak-daw.menu                 |  19 -------------------
 daw/liveslak-daw.png                  | Bin 29903 -> 0 bytes
 make_slackware_live.sh                |   7 ++++---
 media/daw/menu/liveslak-daw.directory |   6 ++++++
 media/daw/menu/liveslak-daw.menu      |  19 +++++++++++++++++++
 media/daw/menu/liveslak-daw.png       | Bin 0 -> 29903 bytes
 7 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 daw/liveslak-daw.directory
 delete mode 100644 daw/liveslak-daw.menu
 delete mode 100644 daw/liveslak-daw.png
 create mode 100644 media/daw/menu/liveslak-daw.directory
 create mode 100644 media/daw/menu/liveslak-daw.menu
 create mode 100644 media/daw/menu/liveslak-daw.png

diff --git a/daw/liveslak-daw.directory b/daw/liveslak-daw.directory
deleted file mode 100644
index 074d67a..0000000
--- a/daw/liveslak-daw.directory
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Slackware Live DAW
-Icon=liveslak-daw
-Type=Directory
-Keywords=audio;sound;jackd;studio;
-Comment=Slackware Digital Audio Workstation
diff --git a/daw/liveslak-daw.menu b/daw/liveslak-daw.menu
deleted file mode 100644
index 27b7341..0000000
--- a/daw/liveslak-daw.menu
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
-<Menu>
-  <Name>Applications</Name>
-  <Menu>
-    <Name>Multimedia</Name>
-    <Move>
-      <Old>X42 Plugins</Old>
-      <New>Slackware Live Daw/X42 Plugins</New>
-    </Move>
-    <Menu>
-      <Name>Slackware Live Daw</Name>
-      <Directory>liveslak-daw.directory</Directory>
-      <Include>
-        <Category>X-DAW</Category>
-      </Include>
-    </Menu>
-  </Menu>
-</Menu>
-
diff --git a/daw/liveslak-daw.png b/daw/liveslak-daw.png
deleted file mode 100644
index 7eea5a2..0000000
Binary files a/daw/liveslak-daw.png and /dev/null differ
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 5043b9e..127647c 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -2166,11 +2166,12 @@ EOT
   # "X-DAW" to decide what goes into the new submenu.
   # Also move the existing X42-Plugins submenu below the new DAW submenu.
   # see https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html
-  install -Dm 644 ${LIVE_TOOLDIR}/${LIVEDE,,}/liveslak-daw.menu \
+  install -Dm 644 ${LIVE_TOOLDIR}/media/${LIVEDE,,}/menu/liveslak-daw.menu \
     -t $LIVE_ROOTDIR/etc/xdg/menus/applications-merged/
-  install -Dm 644 ${LIVE_TOOLDIR}/${LIVEDE,,}/liveslak-daw.directory \
+  install -Dm 644 \
+    ${LIVE_TOOLDIR}/media/${LIVEDE,,}/menu/liveslak-daw.directory \
     -t $LIVE_ROOTDIR/usr/share/desktop-directories/
-  install -Dm 644 ${LIVE_TOOLDIR}/${LIVEDE,,}/liveslak-daw.png \
+  install -Dm 644 ${LIVE_TOOLDIR}/media/${LIVEDE,,}/menu/liveslak-daw.png \
     -t $LIVE_ROOTDIR/usr/share/icons/hicolor/256x256/apps/
 
   # Any menu entry that does not yet have a Category "X-DAW" will now have to
diff --git a/media/daw/menu/liveslak-daw.directory b/media/daw/menu/liveslak-daw.directory
new file mode 100644
index 0000000..074d67a
--- /dev/null
+++ b/media/daw/menu/liveslak-daw.directory
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Slackware Live DAW
+Icon=liveslak-daw
+Type=Directory
+Keywords=audio;sound;jackd;studio;
+Comment=Slackware Digital Audio Workstation
diff --git a/media/daw/menu/liveslak-daw.menu b/media/daw/menu/liveslak-daw.menu
new file mode 100644
index 0000000..27b7341
--- /dev/null
+++ b/media/daw/menu/liveslak-daw.menu
@@ -0,0 +1,19 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Move>
+      <Old>X42 Plugins</Old>
+      <New>Slackware Live Daw/X42 Plugins</New>
+    </Move>
+    <Menu>
+      <Name>Slackware Live Daw</Name>
+      <Directory>liveslak-daw.directory</Directory>
+      <Include>
+        <Category>X-DAW</Category>
+      </Include>
+    </Menu>
+  </Menu>
+</Menu>
+
diff --git a/media/daw/menu/liveslak-daw.png b/media/daw/menu/liveslak-daw.png
new file mode 100644
index 0000000..7eea5a2
Binary files /dev/null and b/media/daw/menu/liveslak-daw.png differ
-- 
cgit v1.2.3