From 15485018df54d817f6a015e627d0e6d712507a65 Mon Sep 17 00:00:00 2001
From: retgal <galante@puzzle.ch>
Date: Sun, 8 Sep 2024 19:22:15 +0200
Subject: [PATCH] Simplify deb build

---
 build.xml                             |  2 --
 pom.xml                               | 11 ++++++-----
 resources/deb/dayon_assistant.desktop | 20 --------------------
 resources/deb/dayon_assisted.desktop  | 20 --------------------
 src/main/deb/postinst                 |  3 ++-
 src/main/deb/postrm                   |  1 +
 6 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 resources/deb/dayon_assistant.desktop
 delete mode 100644 resources/deb/dayon_assisted.desktop

diff --git a/build.xml b/build.xml
index 770bc008..8f152721 100644
--- a/build.xml
+++ b/build.xml
@@ -65,7 +65,6 @@
 		<copy file="${dir.build}/dayon.jar" todir="${dir.dist}"/>
 		<copy todir="${dir.dist}">
 			<fileset dir="${dir.res}">
-				<exclude name="deb/"/>
 				<exclude name="snap/"/>
 				<exclude name="jre/"/>
 				<exclude name="jrex/"/>
@@ -79,7 +78,6 @@
 		<copy file="${dir.build}/dayon.jar" todir="${dir.ppa}"/>
 		<copy todir="${dir.ppa}">
 			<fileset dir="${dir.res}">
-				<exclude name="deb/"/>
 				<exclude name="snap/"/>
 				<exclude name="jre/"/>
 				<exclude name="jrex/"/>
diff --git a/pom.xml b/pom.xml
index 9e7d0bb1..9cef2b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,8 +153,12 @@
                                     <target>dayon_assisted.sh</target>
                                 </fileSet>
                                 <fileSet>
-                                    <source>${basedir}/resources/deb/</source>
-                                    <target>deb</target>
+                                    <source>${basedir}/debian/dayon_assistant.desktop</source>
+                                    <target>dayon_assistant.desktop</target>
+                                </fileSet>
+                                <fileSet>
+                                    <source>${basedir}/debian/dayon_assisted.desktop</source>
+                                    <target>dayon_assisted.desktop</target>
                                 </fileSet>
                             </fileSets>
                         </configuration>
@@ -435,7 +439,6 @@
                                             <directory>resources</directory>
                                             <include>**/*</include>
                                             <excludes>
-                                                <exclude>deb/</exclude>
                                                 <exclude>jrex/</exclude>
                                                 <exclude>snap/</exclude>
                                             </excludes>
@@ -505,7 +508,6 @@
                                             <directory>resources</directory>
                                             <include>**/*</include>
                                             <excludes>
-                                                <exclude>deb/</exclude>
                                                 <exclude>jre/</exclude>
                                                 <exclude>jrex/legal/</exclude>
                                                 <exclude>snap/</exclude>
@@ -575,7 +577,6 @@
                                             <directory>resources</directory>
                                             <include>**/*</include>
                                             <excludes>
-                                                <exclude>deb/</exclude>
                                                 <exclude>jre/</exclude>
                                                 <exclude>jrex/legal/</exclude>
                                                 <exclude>snap/</exclude>
diff --git a/resources/deb/dayon_assistant.desktop b/resources/deb/dayon_assistant.desktop
deleted file mode 100644
index 4024b422..00000000
--- a/resources/deb/dayon_assistant.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Dayon! Assistant
-Version=1.0
-Exec=dayon_assistant
-Comment=Offer remote assistance
-Comment[de]=Remotesupport anbieten
-Comment[es]=Ofrecer asistencia remota
-Comment[fr]=Offrir assistance à distance
-Comment[it]=Offrire assistenza remota
-Comment[ru]=Предлагайте удаленную помощь
-Comment[sv]=Erbjuda distanshjälp
-Comment[tr]=Uzaktan yardım sunun
-Comment[zh]=提供远程协助
-Keywords=remote;support;offer help
-Icon=/usr/bin/dayon/dayon.png
-Type=Application
-Terminal=false
-StartupNotify=true
-Encoding=UTF-8
-Categories=RemoteAccess;Network;
diff --git a/resources/deb/dayon_assisted.desktop b/resources/deb/dayon_assisted.desktop
deleted file mode 100644
index da768b70..00000000
--- a/resources/deb/dayon_assisted.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Dayon! Assisted
-Version=1.0
-Exec=dayon_assisted
-Comment=Request remote assistance
-Comment[de]=Remotesupport erbitten
-Comment[es]=Solicitar asistencia remota
-Comment[fr]=Demander assistance à distance
-Comment[it]=Richiedere assistenza remota
-Comment[ru]=Запросить удаленную помощь
-Comment[sv]=Begär distanshjälp
-Comment[tr]=Uzaktan yardım isteyin
-Comment[zh]=请求远程协助
-Keywords=remote;support;get help
-Icon=/usr/bin/dayon/dayon.png
-Type=Application
-Terminal=false
-StartupNotify=true
-Encoding=UTF-8
-Categories=RemoteAccess;Network;
diff --git a/src/main/deb/postinst b/src/main/deb/postinst
index 87be8a71..7400814e 100644
--- a/src/main/deb/postinst
+++ b/src/main/deb/postinst
@@ -1,4 +1,5 @@
-cp ${config.installDir}/deb/*.desktop /usr/share/applications/
+mv ${config.installDir}/*.desktop /usr/share/applications/
+mv ${config.installDir}/dayon.png usr/share/icons
 chmod +x ${config.installDir}/*.sh
 ln -s ${config.installDir}/dayon_assisted.sh /usr/bin/dayon_assisted
 ln -s ${config.installDir}/dayon_assistant.sh /usr/bin/dayon_assistant
\ No newline at end of file
diff --git a/src/main/deb/postrm b/src/main/deb/postrm
index bcf78848..6d92df10 100644
--- a/src/main/deb/postrm
+++ b/src/main/deb/postrm
@@ -1,4 +1,5 @@
 rm -f /usr/share/applications/dayon_assistant.desktop
 rm -f /usr/share/applications/dayon_assisted.desktop
+rm -f /usr/share/icons/dayon.png
 rm -f /usr/bin/dayon_assisted
 rm -f /usr/bin/dayon_assistant
\ No newline at end of file