summaryrefslogtreecommitdiff
path: root/extra/git
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-15 19:25:01 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-15 19:25:01 -0300
commitecec4d4d3ca64d7929f1f63857e82268798e066b (patch)
treedfc5421b1f5460a449502c66d612e1132ec5d49f /extra/git
parenteddd84528e605047a994ee8d652ba99686a412fc (diff)
parent1ffabe284d9f5a4ac055941d9817af71be1e5b54 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/binutils-avr/PKGBUILD community/freecol/PKGBUILD community/gcc-avr/PKGBUILD community/lightspark/PKGBUILD community/lorcon-old-svn/PKGBUILD community/mdf2iso/PKGBUILD community/pylorcon/PKGBUILD community/qbittorrent/PKGBUILD community/remmina-plugins/PKGBUILD community/systemd/PKGBUILD community/texmaker/PKGBUILD extra/pyqt/PKGBUILD extra/uim/PKGBUILD extra/wesnoth/PKGBUILD libre/kdenetwork-libre/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch multilib-testing/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/libtool-multilib/libtool.install testing/glibc/PKGBUILD testing/shadow/PKGBUILD testing/xf86-video-savage/PKGBUILD
Diffstat (limited to 'extra/git')
-rw-r--r--extra/git/PKGBUILD12
1 files changed, 5 insertions, 7 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 34552f494..be706a15c 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149948 2012-02-11 23:30:42Z allan $
+# $Id: PKGBUILD 150206 2012-02-14 20:14:21Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.9
-pkgrel=2
+pkgver=1.7.9.1
+pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
url="http://git-scm.com/"
@@ -22,8 +22,6 @@ optdepends=('tk: gitk and git gui'
replaces=('git-core')
provides=('git-core')
backup=('etc/conf.d/git-daemon.conf')
-#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2"
-# "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2"
source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
"http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
git-daemon
@@ -80,7 +78,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c'
- '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a'
+sha1sums=('bd85327627f96c4e98071a4d1d32c30f210aa54a'
+ '8c6ee031b39da5c5e53f927952838796e0959ce9'
'f2b41828bd912b72e2cb3e14677739c4f370de66'
'149e2da1ecb48872ddb31c0945afeaad1f9653d7')