various fixes & improvements

2 files changed, 26 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5f18be3aed2..990cd40d617a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = webapp-manager-git
 	pkgdesc = Run websites as if they were apps.
-	pkgver = 1.1.4.r0.g6cc4f29
+	pkgver = 1.1.5.r1.g2f3e132
 	pkgrel = 1
 	url = https://github.com/linuxmint/webapp-manager
 	arch = any
@@ -16,8 +16,6 @@ pkgbase = webapp-manager-git
 	depends = xapp
 	provides = webapp-manager
 	conflicts = webapp-manager
-	conflicts = ice-ssb
-	conflicts = ice-dev
 	source = git+https://github.com/linuxmint/webapp-manager.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index d656e39b0dca..481dcb1bb45b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=webapp-manager-git
-pkgver=1.1.4.r0.g6cc4f29
+pkgver=1.1.5.r1.g2f3e132
 pkgrel=1
 pkgdesc="Run websites as if they were apps."
 arch=('any')
@@ -10,47 +10,41 @@ depends=('python-beautifulsoup4' 'python-configobj' 'python-gobject' 'python-pil
          'python-setproctitle' 'python-tldextract' 'dconf' 'xapp')
 makedepends=('git')
 provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}" 'ice-ssb' 'ice-dev')
+conflicts=("${pkgname%-git}")
 source=('git+https://github.com/linuxmint/webapp-manager.git')
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-#	printf "%s.r%s.%s" "$(head -n 1 debian/changelog | cut -d'(' -f 2 | cut -d')' -f 1 | \
-#		sed 's/-/./')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/${pkgname%-git}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "$srcdir/${pkgname%-git}"
-
-	# Fix browser names
-	sed -i 's/brave-browser/brave/g' \
-		"usr/lib/${pkgname%-git}/common.py"
-	sed -i 's/epiphany-browser/epiphany/g' \
-		"usr/lib/${pkgname%-git}/common.py"
-	sed -i 's/microsoft-edge/microsoft-edge-beta/g' \
-		"usr/lib/${pkgname%-git}/common.py"
-
-	# Fix license path
-	sed -i 's/common-licenses\/GPL/licenses\/common\/GPL\/license.txt/g' \
-		"usr/lib/${pkgname%-git}/${pkgname%-git}.py"
-
-	# Set version in About dialog
-	sed -i "s/__DEB_VERSION__/${pkgver%.r*}/g" \
-		"usr/lib/${pkgname%-git}/${pkgname%-git}.py"
+  cd "$srcdir/${pkgname%-git}"
+
+  # Fix browser names
+  sed -i 's/brave-browser/brave/g' \
+    "usr/lib/${pkgname%-git}/common.py"
+  sed -i 's/epiphany-browser/epiphany/g' \
+    "usr/lib/${pkgname%-git}/common.py"
+  sed -i 's/microsoft-edge/microsoft-edge-beta/g' \
+    "usr/lib/${pkgname%-git}/common.py"
+
+  # Fix license path
+  sed -i 's/common-licenses\/GPL/licenses\/common\/GPL\/license.txt/g' \
+    "usr/lib/${pkgname%-git}/${pkgname%-git}.py"
+
+  # Set version in About dialog
+  sed -i "s/__DEB_VERSION__/${pkgver%.r*}/g" \
+    "usr/lib/${pkgname%-git}/${pkgname%-git}.py"
 }
 
 build() {
-	cd "$srcdir/${pkgname%-git}"
-	make buildmo
+  cd "$srcdir/${pkgname%-git}"
+  make buildmo
 }
 
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	cp -r etc usr "$pkgdir"
-
-	# Fix launching Chrome & Vivaldi
-	ln -s /usr/bin/google-chrome-stable "$pkgdir/usr/bin/google-chrome"
-	ln -s /usr/bin/vivaldi-stable "$pkgdir/usr/bin/vivaldi"
+  cd "$srcdir/${pkgname%-git}"
+  cp -r etc usr "$pkgdir"
 }