[arch-commits] Commit in fish/repos (10 files)

Levente Polyak anthraxx at archlinux.org
Thu Jul 16 16:38:52 UTC 2015


    Date: Thursday, July 16, 2015 @ 18:38:51
  Author: anthraxx
Revision: 137012

archrelease: copy trunk to community-i686, community-x86_64

Added:
  fish/repos/community-i686/PKGBUILD
    (from rev 137011, fish/trunk/PKGBUILD)
  fish/repos/community-i686/fish.install
    (from rev 137011, fish/trunk/fish.install)
  fish/repos/community-x86_64/PKGBUILD
    (from rev 137011, fish/trunk/PKGBUILD)
  fish/repos/community-x86_64/fish.install
    (from rev 137011, fish/trunk/fish.install)
Deleted:
  fish/repos/community-i686/PKGBUILD
  fish/repos/community-i686/fish-2.1.1-grep-options-is-deprecated.patch
  fish/repos/community-i686/fish.install
  fish/repos/community-x86_64/PKGBUILD
  fish/repos/community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch
  fish/repos/community-x86_64/fish.install

--------------------------------------------------------------+
 /PKGBUILD                                                    |   78 ++++++++++
 /fish.install                                                |   38 ++++
 community-i686/PKGBUILD                                      |   41 -----
 community-i686/fish-2.1.1-grep-options-is-deprecated.patch   |   15 -
 community-i686/fish.install                                  |   17 --
 community-x86_64/PKGBUILD                                    |   41 -----
 community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch |   15 -
 community-x86_64/fish.install                                |   17 --
 8 files changed, 116 insertions(+), 146 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-07-16 16:38:45 UTC (rev 137011)
+++ community-i686/PKGBUILD	2015-07-16 16:38:51 UTC (rev 137012)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Jan Fader <jan.fader at web.de>
-
-pkgname=fish
-pkgver=2.1.2
-pkgrel=1
-pkgdesc='Smart and user friendly shell intended mostly for interactive use'
-arch=('i686' 'x86_64')
-url='http://fishshell.com/'
-license=('GPL2')
-depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
-optdepends=('python: for manual page completion parser and web configuration tool')
-makedepends=('doxygen')
-install=fish.install
-source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz
-        fish-2.1.1-grep-options-is-deprecated.patch)
-md5sums=('855389f9ed4cbe9290ca8d45b9b23093'
-         '0c94b1ca8c54ed1a03b551f9b84160e5')
-
-prepare() {
-  cd fish-shell-$pkgver
-  patch -p1 -i ../fish-2.1.1-grep-options-is-deprecated.patch
-
-  echo $pkgver > version
-  autoconf -i
-}
-
-build() {
-  cd fish-shell-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
-}

Copied: fish/repos/community-i686/PKGBUILD (from rev 137011, fish/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-07-16 16:38:51 UTC (rev 137012)
@@ -0,0 +1,39 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan Fader <jan.fader at web.de>
+
+pkgname=fish
+pkgver=2.2.0
+pkgrel=1
+pkgdesc='Smart and user friendly shell intended mostly for interactive use'
+url='http://fishshell.com/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
+optdepends=('python: for manual page completion parser and web configuration tool')
+makedepends=('doxygen')
+install=fish.install
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/fish-shell/fish-shell/archive/${pkgver}.tar.gz)
+sha512sums=('a1108a8d5c96bcac1b1ced74e6f28287094fa68f28756811f6a6604bde2b4de88d7637da21874b602723fce129a407be7e24affecab468997158442af208308a')
+
+prepare() {
+  cd fish-shell-${pkgver}
+  echo ${pkgver} > version
+  autoconf -i
+}
+
+build() {
+  cd fish-shell-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc
+  make
+}
+
+package() {
+  make -C fish-shell-${pkgver} DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/fish-2.1.1-grep-options-is-deprecated.patch
===================================================================
--- community-i686/fish-2.1.1-grep-options-is-deprecated.patch	2015-07-16 16:38:45 UTC (rev 137011)
+++ community-i686/fish-2.1.1-grep-options-is-deprecated.patch	2015-07-16 16:38:51 UTC (rev 137012)
@@ -1,15 +0,0 @@
-diff --git a/share/functions/grep.fish b/share/functions/grep.fish
-index b0dc958..cd7c31b 100644
---- a/share/functions/grep.fish
-+++ b/share/functions/grep.fish
-@@ -6,8 +6,8 @@ if command grep --color=auto --help 1>/dev/null 2>/dev/null
- 	if not set -q GREP_COLOR
- 		set -gx GREP_COLOR '97;45'
- 	end
--	if not set -q GREP_OPTIONS
--		set -gx GREP_OPTIONS --color=auto
-+	function grep
-+		command grep --color=auto $argv
- 	end
- end
- 

Deleted: community-i686/fish.install
===================================================================
--- community-i686/fish.install	2015-07-16 16:38:45 UTC (rev 137011)
+++ community-i686/fish.install	2015-07-16 16:38:51 UTC (rev 137012)
@@ -1,17 +0,0 @@
-post_install() {
-  grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
-}
-
-post_upgrade() {
-  post_install
-
-  if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
-    echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
-    echo "   to security concerns. To make fish pick up the changes, kill all"
-    echo "   fishd processes."
-  fi
-}
-
-pre_remove() {
-  sed -i '/^\/usr\/bin\/fish/d' /etc/shells
-}

Copied: fish/repos/community-i686/fish.install (from rev 137011, fish/trunk/fish.install)
===================================================================
--- community-i686/fish.install	                        (rev 0)
+++ community-i686/fish.install	2015-07-16 16:38:51 UTC (rev 137012)
@@ -0,0 +1,19 @@
+post_install() {
+  grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells
+}
+
+post_upgrade() {
+  post_install
+
+  if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
+    echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
+    echo "   to security concerns. To make fish pick up the changes, kill all"
+    echo "   fishd processes."
+  fi
+}
+
+pre_remove() {
+  sed -ri '\|^/usr/bin/fish$|d' etc/shells
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-07-16 16:38:45 UTC (rev 137011)
+++ community-x86_64/PKGBUILD	2015-07-16 16:38:51 UTC (rev 137012)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Jan Fader <jan.fader at web.de>
-
-pkgname=fish
-pkgver=2.1.2
-pkgrel=1
-pkgdesc='Smart and user friendly shell intended mostly for interactive use'
-arch=('i686' 'x86_64')
-url='http://fishshell.com/'
-license=('GPL2')
-depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
-optdepends=('python: for manual page completion parser and web configuration tool')
-makedepends=('doxygen')
-install=fish.install
-source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz
-        fish-2.1.1-grep-options-is-deprecated.patch)
-md5sums=('855389f9ed4cbe9290ca8d45b9b23093'
-         '0c94b1ca8c54ed1a03b551f9b84160e5')
-
-prepare() {
-  cd fish-shell-$pkgver
-  patch -p1 -i ../fish-2.1.1-grep-options-is-deprecated.patch
-
-  echo $pkgver > version
-  autoconf -i
-}
-
-build() {
-  cd fish-shell-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
-}

Copied: fish/repos/community-x86_64/PKGBUILD (from rev 137011, fish/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-07-16 16:38:51 UTC (rev 137012)
@@ -0,0 +1,39 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan Fader <jan.fader at web.de>
+
+pkgname=fish
+pkgver=2.2.0
+pkgrel=1
+pkgdesc='Smart and user friendly shell intended mostly for interactive use'
+url='http://fishshell.com/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
+optdepends=('python: for manual page completion parser and web configuration tool')
+makedepends=('doxygen')
+install=fish.install
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/fish-shell/fish-shell/archive/${pkgver}.tar.gz)
+sha512sums=('a1108a8d5c96bcac1b1ced74e6f28287094fa68f28756811f6a6604bde2b4de88d7637da21874b602723fce129a407be7e24affecab468997158442af208308a')
+
+prepare() {
+  cd fish-shell-${pkgver}
+  echo ${pkgver} > version
+  autoconf -i
+}
+
+build() {
+  cd fish-shell-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc
+  make
+}
+
+package() {
+  make -C fish-shell-${pkgver} DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch
===================================================================
--- community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch	2015-07-16 16:38:45 UTC (rev 137011)
+++ community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch	2015-07-16 16:38:51 UTC (rev 137012)
@@ -1,15 +0,0 @@
-diff --git a/share/functions/grep.fish b/share/functions/grep.fish
-index b0dc958..cd7c31b 100644
---- a/share/functions/grep.fish
-+++ b/share/functions/grep.fish
-@@ -6,8 +6,8 @@ if command grep --color=auto --help 1>/dev/null 2>/dev/null
- 	if not set -q GREP_COLOR
- 		set -gx GREP_COLOR '97;45'
- 	end
--	if not set -q GREP_OPTIONS
--		set -gx GREP_OPTIONS --color=auto
-+	function grep
-+		command grep --color=auto $argv
- 	end
- end
- 

Deleted: community-x86_64/fish.install
===================================================================
--- community-x86_64/fish.install	2015-07-16 16:38:45 UTC (rev 137011)
+++ community-x86_64/fish.install	2015-07-16 16:38:51 UTC (rev 137012)
@@ -1,17 +0,0 @@
-post_install() {
-  grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
-}
-
-post_upgrade() {
-  post_install
-
-  if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
-    echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
-    echo "   to security concerns. To make fish pick up the changes, kill all"
-    echo "   fishd processes."
-  fi
-}
-
-pre_remove() {
-  sed -i '/^\/usr\/bin\/fish/d' /etc/shells
-}

Copied: fish/repos/community-x86_64/fish.install (from rev 137011, fish/trunk/fish.install)
===================================================================
--- community-x86_64/fish.install	                        (rev 0)
+++ community-x86_64/fish.install	2015-07-16 16:38:51 UTC (rev 137012)
@@ -0,0 +1,19 @@
+post_install() {
+  grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells
+}
+
+post_upgrade() {
+  post_install
+
+  if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
+    echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
+    echo "   to security concerns. To make fish pick up the changes, kill all"
+    echo "   fishd processes."
+  fi
+}
+
+pre_remove() {
+  sed -ri '\|^/usr/bin/fish$|d' etc/shells
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list