From 1dab29155b97e684e0bb802be0beddf13652723f Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sat, 11 Feb 2017 21:42:09 +0800
Subject: [PATCH] Refactor filebot.desktop

---
 build.xml                                           |   7 ++++---
 installer/deb/FileBot.desktop                       |   4 ++--
 .../icons/{icon-round.png => filebot-round.png}     | Bin
 .../icons/{icon-round.svg => filebot-round.svg}     |   0
 installer/icons/{icon.svg => filebot.svg}           |   0
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename installer/icons/{icon-round.png => filebot-round.png} (100%)
 rename installer/icons/{icon-round.svg => filebot-round.svg} (100%)
 rename installer/icons/{icon.svg => filebot.svg} (100%)

diff --git a/build.xml b/build.xml
index 82beeae9..b210c577 100644
--- a/build.xml
+++ b/build.xml
@@ -570,14 +570,15 @@
 		</copy-replace>
 		<copy todir="${dir.staging}">
 			<fileset dir="${dir.lib}/native/linux-${arch}" />
-			<fileset file="${dir.installer}/icons/icon.svg" />
+			<fileset file="${dir.installer}/icons/${package.name}.svg" />
 		</copy>
 		<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" />
 
 		<jdeb destfile="${dir.dist}/${package.name}_${version}_${deb.arch}.deb" control="${dir.staging}/control" compression="xz" verbose="true">
-			<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
-			<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
+			<tarfileset prefix="/usr/share/${package.name}" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
+			<tarfileset prefix="/usr/share/${package.name}" dir="${dir.staging}" includes="*.jar, *.so" />
 			<tarfileset prefix="/usr/share/applications" dir="${dir.staging}" includes="*.desktop" />
+			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.staging}" includes="*.svg" />
 		</jdeb>
 	</target>
 
diff --git a/installer/deb/FileBot.desktop b/installer/deb/FileBot.desktop
index 38f67c4c..a019cf3f 100644
--- a/installer/deb/FileBot.desktop
+++ b/installer/deb/FileBot.desktop
@@ -2,8 +2,8 @@
 Name=@{application.name}
 Comment=@{package.synopsis}
 Type=Application
-Exec=/usr/share/filebot/filebot.sh
-Icon=/usr/share/filebot/icon.svg
+Exec=@{package.name}
+Icon=@{package.name}
 Terminal=false
 StartupNotify=true
 Categories=@{gnome.application.categories}
diff --git a/installer/icons/icon-round.png b/installer/icons/filebot-round.png
similarity index 100%
rename from installer/icons/icon-round.png
rename to installer/icons/filebot-round.png
diff --git a/installer/icons/icon-round.svg b/installer/icons/filebot-round.svg
similarity index 100%
rename from installer/icons/icon-round.svg
rename to installer/icons/filebot-round.svg
diff --git a/installer/icons/icon.svg b/installer/icons/filebot.svg
similarity index 100%
rename from installer/icons/icon.svg
rename to installer/icons/filebot.svg