Update to 2.2.r13.g9be9688-1

* Update pkgdesc
* Extract correct licence from vim's help
* Minor style cleanups

3 files changed, 17 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fce72b4cc3ff..cda4beb87eca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec 10 10:51:03 UTC 2015
+# Wed Mar 30 02:40:49 UTC 2016
 pkgbase = vim-vimwiki-dev-git
-	pkgdesc = Personal Wiki for Vim; dev branch
-	pkgver = 2.2.r13.g9be9688
+	pkgdesc = A personal wiki for Vim; dev branch
+	pkgver = 2.2.1.r24.g722d6e4
 	pkgrel = 1
 	url = https://github.com/vimwiki/vimwiki
 	install = vimdoc.install
@@ -14,9 +14,7 @@ pkgbase = vim-vimwiki-dev-git
 	provides = vim-vimwiki
 	conflicts = vim-vimwiki
 	source = git+https://github.com/vimwiki/vimwiki.git#branch=dev
-	source = license.txt
 	sha256sums = SKIP
-	sha256sums = 0870512ee7459a1caa7476a9df38585de4b309bc0ec90eaf5e8dc053af0eff53
 
 pkgname = vim-vimwiki-dev-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 179d6320107c..c16bb57c3b2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Andreas Wagner <AndreasBWagner@pointfree.net>
 
 pkgname=vim-vimwiki-dev-git
-pkgver=2.2.r13.g9be9688
+pkgver=2.2.1.r24.g722d6e4
 pkgrel=1
-pkgdesc='Personal Wiki for Vim; dev branch'
+pkgdesc='A personal wiki for Vim; dev branch'
 arch=('any')
 url='https://github.com/vimwiki/vimwiki'
 license=('MIT')
@@ -14,28 +14,31 @@ makedepends=('git')
 conflicts=('vim-vimwiki')
 provides=('vim-vimwiki')
 install=vimdoc.install
-source=('git+https://github.com/vimwiki/vimwiki.git#branch=dev' license.txt)
-sha256sums=('SKIP'
-            '0870512ee7459a1caa7476a9df38585de4b309bc0ec90eaf5e8dc053af0eff53')
+source=('git+https://github.com/vimwiki/vimwiki.git#branch=dev')
+sha256sums=('SKIP')
 
 pkgver() {
 	cd vimwiki
 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  # Extract licence from vim's help
+  grep '^[0-9]*. License' "vimwiki/doc/vimwiki.txt" -A 1000 > LICENCE
+}
+
 package() {
   cd vimwiki
   install -d ${pkgdir}/usr/share/vim/vimfiles/autoload/vimwiki
   install -m644 ${srcdir}/vimwiki/autoload/vimwiki/* \
     ${pkgdir}/usr/share/vim/vimfiles/autoload/vimwiki/
-  install -d ${pkgdir}/usr/share/vim/vimfiles/{ftplugin,plugin,syntax}
+  install -d ${pkgdir}/usr/share/vim/vimfiles/{doc,ftplugin,plugin,syntax}
+  install -m644 ${srcdir}/vimwiki/doc/vimwiki.txt \
+    ${pkgdir}/usr/share/vim/vimfiles/doc/
   for x in {ftplugin,plugin,syntax}; do
     install -m644 ${srcdir}/vimwiki/$x/* \
       ${pkgdir}/usr/share/vim/vimfiles/$x/
   done
-  install -Dm644 ${srcdir}/license.txt \
-    ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-  install -d ${pkgdir}/usr/share/vim/vimfiles/doc
-  install -m644 ${srcdir}/vimwiki/doc/vimwiki.txt \
-    ${pkgdir}/usr/share/vim/vimfiles/doc/
+  install -Dm644 ${srcdir}/LICENCE \
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENCE
 }
diff --git a/license.txt b/license.txt
deleted file mode 100644
index a2784c730add..000000000000
--- a/license.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT Licence
-http://www.opensource.org/licenses/mit-license.php
-
-Copyright (c) 2009 Maxim Kim
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.