From 53b387127763f3780215c90371d5de3c01fefe7d Mon Sep 17 00:00:00 2001
From: David O'Trakoun <me@davidosomething.com>
Date: Thu, 10 Nov 2022 20:59:53 -0500
Subject: [PATCH] merge outstanding prs, rename, repack

---
 README.md                |  7 ++++++-
 pack.sh                  |  4 ++--
 package/CMakeLists.txt   |  2 +-
 package/metadata.desktop | 19 -------------------
 package/metadata.json    | 24 ++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 23 deletions(-)
 delete mode 100644 package/metadata.desktop
 create mode 100644 package/metadata.json

diff --git a/README.md b/README.md
index 2ad7fae..de28a81 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
-# plasma-audio-device-switcher
+# plasma-audio-device-switcher (davidosomething fork)
+
+- Merged all the outstanding PRs 2022-11-10
+- Convert metadata.desktop to metadata.json
+- Rename identifiers
+- Repack for installation from local file
 
 Simple widget to change the default audio output device/sink.
diff --git a/pack.sh b/pack.sh
index 8bde0a6..c75ba93 100755
--- a/pack.sh
+++ b/pack.sh
@@ -2,7 +2,7 @@
 
 cd package
 
-version=$(sed -n 's/^X-KDE-PluginInfo-Version=//p' metadata.desktop)
-zip -R "../audio-device-switcher-v$version.plasmoid" '*.qml' '*.desktop' '*.xml'
+version=$(sed -n 's/^X-KDE-PluginInfo-Version=//p' metadata.json)
+zip -R "../audio-device-switcher-v$version.plasmoid" '*.qml' '*.json' '*.xml'
 
 cd ..
diff --git a/package/CMakeLists.txt b/package/CMakeLists.txt
index 7278d8a..eb7d411 100755
--- a/package/CMakeLists.txt
+++ b/package/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_package(. org.kde.plasma.audiodeviceswitcher)
+plasma_install_package(. org.kde.plasma.audiodeviceswitcher-davidosomething)
 
 file(GLOB QML_SRCS contents/ui/*.qml)
 add_custom_target(QmlFiles ALL echo SOURCES ${QML_SRCS})
diff --git a/package/metadata.desktop b/package/metadata.desktop
deleted file mode 100644
index 892770b..0000000
--- a/package/metadata.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=Audio Device Switcher
-Comment=Simple widget to change the default audio output device/sink
-
-Icon=org.kde.plasma.volume
-Type=Service
-X-KDE-ServiceTypes=Plasma/Applet
-
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-
-X-KDE-PluginInfo-Name=org.kde.plasma.audiodeviceswitcher
-X-KDE-PluginInfo-Category=Multimedia
-X-KDE-PluginInfo-Author=Andreas Krutzler
-X-KDE-PluginInfo-Email=andreas.krutzler@gmx.net
-X-KDE-PluginInfo-Version=0.3.0
-X-KDE-PluginInfo-Website=https://github.com/akrutzler/plasma-audio-device-switcher
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/package/metadata.json b/package/metadata.json
new file mode 100644
index 0000000..a9c782b
--- /dev/null
+++ b/package/metadata.json
@@ -0,0 +1,24 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "me@davidosomething.com",
+                "Name": "David O'Trakoun"
+            }
+        ],
+        "Category": "Multimedia",
+        "Description": "Simple widget to change the default audio output device/sink",
+        "EnabledByDefault": true,
+        "Icon": "org.kde.plasma.volume",
+        "Id": "org.kde.plasma.audiodeviceswitcher-davidosomething",
+        "License": "GPL",
+        "Name": "Audio Device Switcher (davidosomething fork)",
+        "ServiceTypes": [
+            "Plasma/Applet"
+        ],
+        "Version": "1.0.0",
+        "Website": "https://github.com/davidosomething/plasma-audio-device-switcher"
+    },
+    "X-Plasma-API": "declarativeappletscript",
+    "X-Plasma-MainScript": "ui/main.qml"
+}