Implement City-busz's suggestions and bump

- Install the web extension to /usr/lib... .
- Install the license file to /usr/share/licenses/lariza-git.
- Display a warning for users upgrading from older versions.
- This also includes a warning lariza now looking for WE's in ~/.config.

3 files changed, 27 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9f6c0a278a4..94210b6bc509 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Jul 30 07:58:55 UTC 2016
 pkgbase = lariza-git
 	pkgdesc = Simple WebKit2GTK+ Browser
-	pkgver = 15.09.5.g3fb92e0
+	pkgver = 16.06.1.g82f095c
 	pkgrel = 1
 	url = https://github.com/vain/lariza
 	install = lariza.install
diff --git a/PKGBUILD b/PKGBUILD
index 5e6d61c7ed15..36acef9e24e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Vain <aurmaint1 on host: uninformativ dot de>
 pkgname=lariza-git
-pkgver=15.09.5.g3fb92e0
+pkgver=16.06.1.g82f095c
 pkgrel=1
 pkgdesc="Simple WebKit2GTK+ Browser"
 arch=('i686' 'x86_64')
@@ -31,6 +31,6 @@ package() {
   make DESTDIR="$pkgdir" prefix="/usr" install
 
   install -Dm755 we_adblock.so \
-    "$pkgdir"/usr/share/"${pkgname%-git}"/web_extensions/we_adblock.so
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
+    "$pkgdir"/usr/lib/"${pkgname%-git}"/web_extensions/we_adblock.so
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/lariza.install b/lariza.install
index 1c872e999bea..4a20b4cff053 100644
--- a/lariza.install
+++ b/lariza.install
@@ -1,8 +1,24 @@
 # arg 1:  the new package version
 post_install() {
-  echo 'If you wish to use any web extensions, please create appropriate'
-  echo 'symlinks in your ~/.local/share/lariza/web_extensions/. For example:'
-  echo
-  echo '  $ cd ~/.local/share/lariza/web_extensions'
-  echo '  $ ln -s /usr/share/lariza/web_extensions/we_adblock.so'
+  cat <<EOM
+If you wish to use any web extensions, please create appropriate
+symlinks in your ~/.config/lariza/web_extensions/. For example:
+
+  $ cd ~/.config/lariza/web_extensions
+  $ ln -s /usr/lib/lariza/web_extensions/we_adblock.so
+EOM
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp "$2" 16.06-1)" -lt 1 ]; then
+    cat <<EOM
+>>> IMPORTANT CHANGES
+
+  - Bundled web extensions have been moved to /usr/lib/lariza/web_extensions.
+  - Also, lariza now looks for symlinks to web extensions in
+    ~/.config/lariza/web_extensions.
+EOM
+  fi
 }