From f14ecf0a99897ff00a13a76bcd16b11b485c4dd3 Mon Sep 17 00:00:00 2001
From: JezerM <amyuki4@icloud.com>
Date: Tue, 14 Sep 2021 20:34:29 -0600
Subject: [PATCH] Preparing for 3.1.0 version

---
 build/DEBIAN/control      | 10 +++-------
 build/DEBIAN/postinst     |  5 ++++-
 build/utils.sh            |  9 ++++++---
 dist/web-greeter.desktop  | 10 ++++++----
 dist/web-xgreeter.desktop |  6 ++++++
 web-greeter/config.py     |  4 ++--
 6 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 dist/web-xgreeter.desktop

diff --git a/build/DEBIAN/control b/build/DEBIAN/control
index 64b55a6..e893870 100644
--- a/build/DEBIAN/control
+++ b/build/DEBIAN/control
@@ -1,18 +1,14 @@
 Package: web-greeter
-Version: 3.0.0
+Version: 3.1.0
 Provides: lightdm-greeter
 Replaces: lightdm-webkit-greeter
 Section: x11
 Priority: optional
 Homepage: https://github.com/JezerM/web-greeter
-Installed-Size: 15052
+Installed-Size: 402396
 Architecture: all
 Maintainer: JezerM <amyuki4@gmail.com>
-Depends: python3,
-	python3-pip,
-	python3-gi,
-	python3-pyqt5,
-	liblightdm-gobject-1-0,
+Depends: liblightdm-gobject-1-0,
   liblightdm-gobject-1-dev
 Description: A modern, visually appealing greeter for LightDM.
 	Web Greeter utilizes themes built with HTML/CSS/JavaScript for it's login screen. Web Greeter
diff --git a/build/DEBIAN/postinst b/build/DEBIAN/postinst
index ac34251..aa2b7bc 100755
--- a/build/DEBIAN/postinst
+++ b/build/DEBIAN/postinst
@@ -1,3 +1,6 @@
 #!/usr/bin/env sh
 
-pip3 install https://github.com/JezerM/whither/tarball/master
+# Link to the binary
+ln -sf '/opt/web-greeter/web-greeter' '/usr/bin/web-greeter'
+
+update-desktop-database /usr/share/applications || true
diff --git a/build/utils.sh b/build/utils.sh
index 83c217e..e9faf74 100755
--- a/build/utils.sh
+++ b/build/utils.sh
@@ -63,7 +63,7 @@ init_build_dir() {
 prepare_install() {
 	cd "${BUILD_DIR}"
 	mkdir -p \
-		"${INSTALL_ROOT}${PREFIX}"/share/{man/man1,metainfo,web-greeter,xgreeters,zsh/vendor-completions,bash-completion/completions} \
+		"${INSTALL_ROOT}${PREFIX}"/share/{man/man1,metainfo,web-greeter,xgreeters,applications,zsh/vendor-completions,bash-completion/completions} \
 		"${INSTALL_ROOT}"/etc/{lightdm,xdg/lightdm/lightdm.conf.d}
 
 	# Themes
@@ -88,8 +88,11 @@ prepare_install() {
 	# AppData File
 	cp "${BUILD_DIR}/dist/${PKGNAME}.appdata.xml" "${INSTALL_ROOT}${PREFIX}/share/metainfo"
 
-	# Desktop File
-	cp "${BUILD_DIR}/dist/${PKGNAME}.desktop" "${INSTALL_ROOT}${PREFIX}/share/xgreeters"
+	# Greeter desktop File
+	cp "${BUILD_DIR}/dist/web-xgreeter.desktop" "${INSTALL_ROOT}${PREFIX}/share/xgreeters/web-greeter.desktop"
+
+	# Application desktop File
+	cp "${BUILD_DIR}/dist/web-greeter.desktop" "${INSTALL_ROOT}${PREFIX}/share/applications/web-greeter.desktop"
 
 	# Xgreeter wrapper
 	cp "${BUILD_DIR}/dist/90-greeter-wrapper.conf" \
diff --git a/dist/web-greeter.desktop b/dist/web-greeter.desktop
index 036fa9d..3624ade 100644
--- a/dist/web-greeter.desktop
+++ b/dist/web-greeter.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
-Name=Web Greeter
-Comment=Greeter for LightDM
-Exec=web-greeter
+Name=web-greeter
+Exec=/opt/web-greeter/web-greeter %U
+Terminal=false
 Type=Application
-X-Ubuntu-Gettext-Domain=web-greeter
+StartupWMClass=web-greeter
+Comment=Web based greeter for lightdm
+Categories=system;
diff --git a/dist/web-xgreeter.desktop b/dist/web-xgreeter.desktop
new file mode 100644
index 0000000..036fa9d
--- /dev/null
+++ b/dist/web-xgreeter.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Web Greeter
+Comment=Greeter for LightDM
+Exec=web-greeter
+Type=Application
+X-Ubuntu-Gettext-Domain=web-greeter
diff --git a/web-greeter/config.py b/web-greeter/config.py
index 82acb9f..8066350 100644
--- a/web-greeter/config.py
+++ b/web-greeter/config.py
@@ -68,9 +68,9 @@ web_greeter_config = {
         "debug_mode": False,
         "theme_dir": "/usr/share/web-greeter/themes/",
         "version": {
-            "full": "3.0.0",
+            "full": "3.1.0",
             "major": 3,
-            "minor": 3,
+            "minor": 1,
             "micro": 0,
         },
     }