summaryrefslogtreecommitdiff
path: root/extra/git
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-01 21:29:17 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-01 21:29:17 -0300
commit5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch)
treef2d8419cf544c9c1980e49a5a94f19252e17d4e7 /extra/git
parent02380099f9ca13810767a2d25742c6862e255852 (diff)
parent40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/clementine/PKGBUILD community/google-gadgets/PKGBUILD community/redis/PKGBUILD community/uzbl/PKGBUILD extra/anjuta/PKGBUILD extra/atkmm/PKGBUILD extra/ekiga/PKGBUILD extra/epiphany/PKGBUILD extra/evolution-data-server/PKGBUILD extra/gdl/PKGBUILD extra/glade/PKGBUILD extra/glibmm/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-desktop/PKGBUILD extra/gnome-menus/PKGBUILD extra/gnome-nettool/PKGBUILD extra/gnome-panel/PKGBUILD extra/gnome-sharp/PKGBUILD extra/gtk2/PKGBUILD extra/gtkmm/PKGBUILD extra/libchamplain/PKGBUILD extra/libgda/PKGBUILD extra/libotr/PKGBUILD extra/libvncserver/PKGBUILD extra/libwebkit/PKGBUILD extra/notification-daemon/PKGBUILD extra/pangomm/PKGBUILD extra/pidgin/PKGBUILD extra/pygobject/PKGBUILD extra/rasqal/PKGBUILD extra/redland/PKGBUILD extra/vte/PKGBUILD extra/xarchiver/PKGBUILD extra/yelp/PKGBUILD testing/gnome-control-center/PKGBUILD testing/mesa/PKGBUILD testing/rasqal/PKGBUILD testing/redland/PKGBUILD
Diffstat (limited to 'extra/git')
-rw-r--r--extra/git/PKGBUILD14
1 files changed, 8 insertions, 6 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index d131a1842..cfd3a006f 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118450 2011-04-07 01:40:08Z dan $
+# $Id: PKGBUILD 120940 2011-04-27 15:41:06Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.4.4
+pkgver=1.7.5
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,9 @@ makedepends=('python2')
optdepends=('tk: gitk and git gui'
'perl-libwww: git svn'
'perl-term-readkey: git svn'
+ 'perl-mime-tools: git send-email'
'perl-net-smtp-ssl: git send-email TLS support'
+ 'perl-authen-sasl: git send-email TLS support'
'python2: various helper scripts'
'subversion: git svn'
'cvsps: git cvsimport')
@@ -69,11 +71,11 @@ package() {
install -D -m644 $srcdir/git-daemon.conf $pkgdir/etc/conf.d/git-daemon.conf
}
-md5sums=('1313f71d62fa100b32fa313769a85f2a'
- '5812f4fca4afc6c81e06f485111ec8ab'
+md5sums=('7f0bc26a6e87d251c9b09fa05a186ed3'
+ '94cf18c292f0db30046092ef306bf57c'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('5c3e738b01a4021ade56abebfdcce8825d2a50868e5c7befb65102f497387aa0'
- 'fa2ce1fd34a81dac1d8fca466dcd823ce1ed800ec5cb98d8bb2b0967deed19d0'
+sha256sums=('7d293c5c0e544188d9b9ea94036cc56b39fbe045ead6f8ced00ad02a8854142d'
+ 'ced2319cbb48a4aa10bc5b1e1167a5de3b694eb9d256e68d978dbe86d997bee9'
'2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')