20140418.217-1

- add fish-completion (patch from Lokaltog)

3 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84684919c173..2c5ed9597ef0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pass-git
 	pkgdesc = Stores, retrieves, generates, and synchronizes passwords securely
-	pkgver = 20140417.200
+	pkgver = 20140418.217
 	pkgrel = 1
 	url = http://zx2c4.com/projects/password-store/
 	arch = any
@@ -17,7 +17,7 @@ pkgbase = pass-git
 	source = pass-git::git://git.zx2c4.com/password-store
 	source = Makefile.patch
 	sha256sums = SKIP
-	sha256sums = f64dfddc0c8e4469cb0f089cb4570f243400eb3fb4081dde51acbfe1f0fa7139
+	sha256sums = ff8496f7f73c08c47c7099363329b771663c1874863d69377f81900f2c23c5d7
 
 pkgname = pass-git
 
diff --git a/Makefile.patch b/Makefile.patch
index 74547073bbce..79f19e322742 100644
--- a/Makefile.patch
+++ b/Makefile.patch
@@ -1,13 +1,13 @@
 diff --git a/Makefile b/Makefile
-index bee69e1..80482cd 100644
+index bee69e1..f414f75 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -12,12 +12,12 @@ all:
+@@ -12,15 +12,15 @@ all:
  	@echo "Password store is a shell script, so there is nothing to do. Try \"make install\" instead."
  
  install-common:
 -	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/"
-+	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/"
++	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/" "$(DESTDIR)$(PREFIX)/share/fish/completions/"
  	@install -m 0644 -v man/pass.1 "$(DESTDIR)$(MANDIR)/man1/pass.1"
  	@install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass"
  
@@ -16,10 +16,14 @@ index bee69e1..80482cd 100644
 +	@install -m 0644 -v src/completion/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
  #
  #	Uncomment to install the fish completion file.
- #	@install -m 0644 -v src/completion/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
+-#	@install -m 0644 -v src/completion/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
++	@install -m 0644 -v src/completion/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
+ 
+ ifneq ($(strip $(wildcard $(PLATFORMFILE))),)
+ install: install-common
 @@ -34,4 +34,4 @@ install: install-common
  endif
  
  uninstall:
 -	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
-+	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
++	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass" "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
diff --git a/PKGBUILD b/PKGBUILD
index 95ff2b0a07f9..bc417dc5e54d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Simon Zimmermann <simon@insmo.com>
 
 pkgname=pass-git
-pkgver=20140417.200
+pkgver=20140418.217
 pkgrel=1
 pkgdesc='Stores, retrieves, generates, and synchronizes passwords securely'
 url='http://zx2c4.com/projects/password-store/'
@@ -15,7 +15,7 @@ conflicts=('pass')
 source=("$pkgname::git://git.zx2c4.com/password-store"
         'Makefile.patch')
 sha256sums=('SKIP'
-            'f64dfddc0c8e4469cb0f089cb4570f243400eb3fb4081dde51acbfe1f0fa7139')
+            'ff8496f7f73c08c47c7099363329b771663c1874863d69377f81900f2c23c5d7')
 
 pkgver() {
     cd "$pkgname"