upstream update, remove obsolete install file

3 files changed, 3 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70067d2bc072..b8c12e8b9e5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sat Dec 19 00:34:36 UTC 2015
 pkgbase = subsurface-git
 	pkgdesc = Divelog program
-	pkgver = 20151218.e2d5bef
+	pkgver = 20160528.8acbeed
 	pkgrel = 1
 	url = http://subsurface-divelog.org/
-	install = install
 	arch = i686
 	arch = x86_64
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index c252785718de..317b5beab85d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=subsurface-git
 _pkgname=subsurface
-pkgver=20151218.e2d5bef
+pkgver=20160528.8acbeed
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -16,8 +16,6 @@ depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
 source=('git://git.subsurface-divelog.org/subsurface')
 sha1sums=('SKIP')
 
-install=install
-
 provides=('subsurface')
 conflicts=('subsurface')
 
@@ -29,6 +27,7 @@ pkgver() {
 prepare() {
 	cd "${srcdir}/${_pkgname}"
 	sed 's:<marble:<subsurface/marble:g' -i desktop-widgets/globe.*
+	sed '/merge_options.tree_flags/c merge_options.flags = GIT_MERGE_FIND_RENAMES;' -i core/git-access.c
 	mkdir build
 }
 
diff --git a/install b/install
deleted file mode 100644
index bc2362addd77..000000000000
--- a/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
-	type gtk-update-icon-cache &>/dev/null &&
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}