summaryrefslogtreecommitdiff
path: root/extra/git/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-08-27 12:44:19 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-08-27 12:44:19 +0200
commit830afd54d0d990fdb982292bed4c97f577dc195d (patch)
tree5c081214c4d28eae5e46c33094131ecc555b4a8f /extra/git/PKGBUILD
parent06dc337f60287526f4db95ce79a2ea506023bffa (diff)
parent5ea071a53492ec9512f8d08a8b8ff8e08499209d (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/collectd/PKGBUILD community/erlang/PKGBUILD community/fcitx-mozc/PKGBUILD community/libgexiv2/PKGBUILD community/monica/PKGBUILD community/neatx/PKGBUILD community/qstardict/PKGBUILD community/shell-fm/PKGBUILD core/isl/PKGBUILD extra/kdeadmin/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdesdk/PKGBUILD extra/kdetoys/PKGBUILD extra/pkgfile/PKGBUILD extra/pyqt4/PKGBUILD extra/sip/PKGBUILD extra/sqlite/PKGBUILD
Diffstat (limited to 'extra/git/PKGBUILD')
-rw-r--r--extra/git/PKGBUILD12
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 74a7cbe7d..11f677f4c 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $
+# $Id: PKGBUILD 193588 2013-08-24 16:58:24Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.8.3.4
+pkgver=1.8.4
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -90,13 +90,13 @@ package() {
cp -a ./contrib/* $pkgdir/usr/share/git/
# scripts are for python 2.x
- sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
+ sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
$(find "$pkgdir" -name '*.py') \
"$pkgdir"/usr/lib/git-core/git-p4 \
"$pkgdir"/usr/share/git/gitview/gitview \
"$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
"$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
- sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \
+ sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
"$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
@@ -115,7 +115,7 @@ package() {
install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('80eec3201a5d012913d287b85adaee8e'
- '86fd812754d25201fd72c7476045dfec'
+md5sums=('355768a1c70d0cb4fedf4b598ac1375b'
+ 'e3720f56e18a5ab8ee1871ac9c72ca7c'
'042524f942785772d7bd52a1f02fe5ae'
'f67869315c2cc112e076f0c73f248002')