make side-by-side installation with tdesktop possibile

3 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c03654c6cde..ecc4b2bb8da1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 64gram-desktop-bin
 	pkgdesc = Unofficial desktop version of Telegram messaging app - binary version
 	pkgver = 1.1.5
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/TDesktop-x64/tdesktop
 	arch = x86_64
@@ -14,9 +14,7 @@ pkgbase = 64gram-desktop-bin
 	depends = libglvnd
 	depends = fontconfig
 	optdepends = ttf-opensans: default Open Sans font family
-	provides = telegram-desktop
 	provides = 64gram-desktop
-	conflicts = telegram-desktop
 	conflicts = 64gram-desktop
 	source = io.github.tdesktop_x64.TDesktop.desktop
 	source = https://github.com/TDesktop-x64/tdesktop/raw/dev/Telegram/Resources/art/icon16.png
@@ -27,7 +25,7 @@ pkgbase = 64gram-desktop-bin
 	source = https://github.com/TDesktop-x64/tdesktop/raw/dev/Telegram/Resources/art/icon256.png
 	source = https://github.com/TDesktop-x64/tdesktop/raw/dev/Telegram/Resources/art/icon512.png
 	source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.1.5/64Gram_1.1.5_linux.zip
-	sha256sums = 731dcfb4dcdfe5e4cfcf9f1adc256090576ee91bc7592c7807c2bd343b7705f9
+	sha256sums = 8d93c52e7ad8d83f27e7f0adf6bc229886e797720e559a774c551a7001f077f0
 	sha256sums = ea1f36152b143cc2664daef5026656d55be2230ed42d43628e17ef7d2fff718c
 	sha256sums = 9e4180c78c895783b4559c5e1a7868a2c9aa30a29969fe5dbe9a4ce4cf5cde6c
 	sha256sums = 041b78681a35f07c3c929662fc66b6592c88588dc7297a5394ef7f923f2118e2
diff --git a/PKGBUILD b/PKGBUILD
index b7b582adf37e..2aab65ce5d9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: KspLite <ksplite@outlook.com>
 pkgname=64gram-desktop-bin
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Unofficial desktop version of Telegram messaging app - binary version"
 arch=(x86_64)
@@ -10,8 +10,8 @@ url="https://github.com/TDesktop-x64/tdesktop"
 license=(GPL3)
 depends=(desktop-file-utils glib2 hicolor-icon-theme libdbus libx11 libglvnd fontconfig)
 optdepends=('ttf-opensans: default Open Sans font family')
-conflicts=(telegram-desktop 64gram-desktop)
-provides=(telegram-desktop 64gram-desktop)
+conflicts=(64gram-desktop)
+provides=(64gram-desktop)
 
 source=(
 	"io.github.tdesktop_x64.TDesktop.desktop"
@@ -19,7 +19,7 @@ source=(
 	"${url}/releases/download/v${pkgver}/64Gram_${pkgver}_linux.zip"
 )
 
-sha256sums=('731dcfb4dcdfe5e4cfcf9f1adc256090576ee91bc7592c7807c2bd343b7705f9'
+sha256sums=('8d93c52e7ad8d83f27e7f0adf6bc229886e797720e559a774c551a7001f077f0'
             'ea1f36152b143cc2664daef5026656d55be2230ed42d43628e17ef7d2fff718c'
             '9e4180c78c895783b4559c5e1a7868a2c9aa30a29969fe5dbe9a4ce4cf5cde6c'
             '041b78681a35f07c3c929662fc66b6592c88588dc7297a5394ef7f923f2118e2'
@@ -39,10 +39,10 @@ package() {
 	install -dm755 "$pkgdir/usr/share/applications/"
 
 	# Program
-	install -Dm755 "$srcdir/Telegram" "$pkgdir/usr/bin/telegram-desktop"
+	install -Dm755 "$srcdir/Telegram" "$pkgdir/usr/bin/64gram-desktop"
 
 	# Desktop launcher
-	install -Dm644 "$srcdir/icon256.png" "$pkgdir/usr/share/pixmaps/telegram.png"
+	install -Dm644 "$srcdir/icon256.png" "$pkgdir/usr/share/pixmaps/64gram.png"
 	install -Dm644 "$srcdir/io.github.tdesktop_x64.TDesktop.desktop" "$pkgdir/usr/share/applications/io.github.tdesktop_x64.TDesktop.desktop"
 
 	# Icons
@@ -50,10 +50,10 @@ package() {
 	for icon_size in 16 32 48 64 128 256 512; do
 		icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
 		install -d "$icon_dir"
-		install -m644 "$srcdir/icon${icon_size}.png" "$icon_dir/telegram.png"
+		install -m644 "$srcdir/icon${icon_size}.png" "$icon_dir/64gram.png"
 	done
 
 	# Disable the official Telegram Desktop updater
-	mkdir -p "$pkgdir/etc/tdesktop"
-	echo "/usr/bin/telegram-desktop" > "$pkgdir/etc/tdesktop/externalupdater"
+	mkdir -p "$pkgdir/usr/share/64Gram/externalupdater.d"
+	echo "/usr/bin/64gram-desktop" >"$pkgdir/usr/share/64Gram/externalupdater.d/telegram-desktop.conf"
 }
diff --git a/io.github.tdesktop_x64.TDesktop.desktop b/io.github.tdesktop_x64.TDesktop.desktop
index 2361f0cbb13f..3f81357944e4 100644
--- a/io.github.tdesktop_x64.TDesktop.desktop
+++ b/io.github.tdesktop_x64.TDesktop.desktop
@@ -1,21 +1,21 @@
 [Desktop Entry]
 Name=64Gram Desktop
 Comment=Unofficial desktop version of Telegram messaging app
-TryExec=telegram-desktop
-Exec=telegram-desktop -- %u
-Icon=telegram
+TryExec=64gram-desktop
+Exec=64gram-desktop -- %u
+Icon=64gram
 Terminal=false
 StartupWMClass=64Gram
 Type=Application
 Categories=Chat;Network;InstantMessaging;Qt;
 MimeType=x-scheme-handler/tg;
-Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;
+Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;64gram;
 Actions=quit;
 SingleMainWindow=true
 X-GNOME-UsesNotifications=true
 X-GNOME-SingleWindow=true
 
 [Desktop Action quit]
-Exec=telegram-desktop -quit
+Exec=64gram-desktop -quit
 Name=Quit Telegram
 Icon=application-exit