Version 2.2.5

4 files changed, 21 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b4447d90f0d..cee526074f74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,26 @@
 pkgbase = lantern-bin
-	pkgdesc = Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel)
-	pkgver = 2.2.4
+	pkgdesc = Free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel, binary)
+	pkgver = 2.2.5
 	pkgrel = 1
 	url = https://getlantern.org
-	install = lantern.install
 	arch = i686
 	arch = x86_64
 	license = Apache
 	depends = libappindicator-gtk3
-	depends = xcb-util
-	depends = xdg-utils
 	provides = lantern
 	conflicts = lantern
 	conflicts = lantern-headless
 	conflicts = lantern-headless-git
+	conflicts = lantern-git
 	options = !emptydirs
 	options = !strip
 	options = !docs
 	source = lantern.service
-	sha1sums = da705ba2fa3608a17258009b933e8bb58b3172a2
-	source_i686 = lantern-installer-32-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32-bit.deb
-	sha1sums_i686 = 7830bae28eeb6582cdd227c9c4b13416f8871543
-	source_x86_64 = lantern-installer-64-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64-bit.deb
-	sha1sums_x86_64 = 90146c3ac91fa5ba7e13b5cd59c489a147d5f963
+	sha256sums = fdece37945be10c00210bbde7b4058c356ef1df0554bd963fcddd12990ff930b
+	source_i686 = https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32-bit.deb
+	sha256sums_i686 = 187b4a22ce8c1c906887fd235aaf50c08b6aa26a5f2aa0122d3cf93552ce0339
+	source_x86_64 = https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64-bit.deb
+	sha256sums_x86_64 = 04ea25f644a227ff15c79a6621fdf843b7c55f3f4a0b1713b98a730882884cda
 
 pkgname = lantern-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 7b7561335ca7..91a49738389e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,24 @@
-# Submitter: neo.shadowsocks<neo.shadowsocks AT gmx.com>
-# Maintainer: Kars Wang <jaklsy g-mail>
+# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Contributor: neo.shadowsocks<neo.shadowsocks AT gmx.com>
+# Contributor: Kars Wang <jaklsy g-mail>
 
 pkgname=lantern-bin
-pkgver=2.2.4
+pkgver=2.2.5
 pkgrel=1
-pkgdesc='Lantern is a free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel)'
+pkgdesc='Free desktop application that delivers fast, reliable and secure access to the open Internet. (Stable Channel, binary)'
 arch=('i686' 'x86_64')
 url='https://getlantern.org'
 license=('Apache')
-
-# neo: I got it by ldd the lantern-binary as deb metadata doesn't provides it,
-# and remove duplicated, like atk required by gtk3
-depends=('libappindicator-gtk3' 'xcb-util' 'xdg-utils')
+depends=('libappindicator-gtk3')
 options=('!emptydirs' '!strip' '!docs')
-conflicts=('lantern' 'lantern-headless' 'lantern-headless-git')
+conflicts=('lantern' 'lantern-headless' 'lantern-headless-git' 'lantern-git')
 provides=('lantern')
-install=lantern.install
 source=('lantern.service')
-source_i686=('lantern-installer-32-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32-bit.deb')
-source_x86_64=('lantern-installer-64-bit.deb::https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64-bit.deb')
-sha1sums=('da705ba2fa3608a17258009b933e8bb58b3172a2')
-sha1sums_i686=('7830bae28eeb6582cdd227c9c4b13416f8871543')
-sha1sums_x86_64=('90146c3ac91fa5ba7e13b5cd59c489a147d5f963')
+source_i686=('https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-32-bit.deb')
+source_x86_64=('https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-64-bit.deb')
+sha256sums=('fdece37945be10c00210bbde7b4058c356ef1df0554bd963fcddd12990ff930b')
+sha256sums_i686=('187b4a22ce8c1c906887fd235aaf50c08b6aa26a5f2aa0122d3cf93552ce0339')
+sha256sums_x86_64=('04ea25f644a227ff15c79a6621fdf843b7c55f3f4a0b1713b98a730882884cda')
 
 package() {
     msg2 'Extracting the data.tar.xz...'
diff --git a/lantern.install b/lantern.install
deleted file mode 100644
index fa46fd905850..000000000000
--- a/lantern.install
+++ /dev/null
@@ -1,33 +0,0 @@
-# Colored makepkg-like functions
-all_off="$(tput sgr0)"
-bold="${all_off}$(tput bold)"
-blue="${bold}$(tput setaf 4)"
-yellow="${bold}$(tput setaf 3)"
-
-msg_blue() {
-    printf "${blue}==>${bold} $1${all_off}\n"
-}
-
-note() {
-    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
-}
-
-_update() {
-    msg_blue "Updating desktop MIME database..."
-    update-desktop-database -q
-
-    msg_blue "Updating icon cache.."
-    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-}
-
-post_install() {
-    _update
-}
-
-post_upgrade() {
-    _update
-}
-
-post_remove() {
-    _update
-}
diff --git a/lantern.service b/lantern.service
index 048917b8c4e5..47e560478b30 100644
--- a/lantern.service
+++ b/lantern.service
@@ -3,7 +3,7 @@ Description=Lantern
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/lantern -headless=true
+ExecStart=/usr/bin/lantern -headless
 
 [Install]
 WantedBy=default.target