makedeb


tutanota-desktop-bin 220.240411.0-0


Official Tutanota email client

Click here to go back to the commit logs for tutanota-desktop-bin.

Commit:


Hash: a33087b7b8533484eae9f23931e9c773d7d71896

Message: added old package to conflicts

Diff


diff --git a/.SRCINFO b/.SRCINFO
index 8ffbb5b..6f763d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tutanota-desktop-bin
 	pkgdesc = Official Tutanota email client
 	pkgver = 3.66.5
-	pkgrel = 3
+	pkgrel = 4
 	url = https://tutanota.com
 	arch = x86_64
 	license = GPL3
@@ -15,6 +15,7 @@ pkgbase = tutanota-desktop-bin
 	optdepends = xdialog: for dialogs
 	provides = tutanota-desktop
 	conflicts = tutanota-desktop
+	conflicts = tutanota-desktop-linux
 	replaces = tutanota-desktop-linux
 	source = tutanota-desktop-3.66.5.AppImage::https://mail.tutanota.com/desktop/tutanota-desktop-linux.AppImage
 	source = https://mail.tutanota.com/desktop/linux-sig.bin
diff --git a/PKGBUILD b/PKGBUILD
index 1fff97a..d4a4163 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 # Co-Maintainer: agilob <archlinux@agilob.net>
 # Co-Maintainer: Aaron J. Graves <linux@ajgraves.com>
 pkgname=tutanota-desktop-bin
 pkgver=3.66.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Official Tutanota email client"
 arch=('x86_64')
 url="https://tutanota.com"
@@ -17,7 +17,7 @@ source=("${pkgname%-bin}-$pkgver.AppImage::https://mail.tutanota.com/desktop/${p
         'https://raw.githubusercontent.com/tutao/tutanota/master/tutao-pub.pem'
         "${pkgname%-bin}")
 provides=("${pkgname%-bin}")
-conflicts=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}" "${pkgname%-bin}-linux")
 replaces=("${pkgname%-bin}-linux")
 sha512sums=('48c64bdf53bc3575099b3b6bd74900068ac919090f4c79a83941ee920fb3bb59630c0058f841db7c2f14c04f9431c6de736a2162051ed9116a4ce492ede16b29'
             '80c8c3b823bbe793cbf25f742b79d760d5c214496a554dc483fb8e2794dbfab2143e3d41a54e4eedbb1df26b7483cbaf5356bf2a4a14733a1b0fbe42617b232c'
@@ -42,6 +42,7 @@ package() {
 	install -d "$pkgdir/opt/${pkgname%-bin}"
 	cp -r squashfs-root/* "$pkgdir/opt/${pkgname%-bin}"
 	rm -rf "$pkgdir/opt/${pkgname%-bin}/usr"
+	rm "$pkgdir/opt/${pkgname%-bin}/${pkgname%-bin}.desktop"
 
 	# Disable autoUpdater
 	rm "$pkgdir/opt/${pkgname%-bin}/resources/app-update.yml"