diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-22 12:03:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-22 12:03:57 -0300 |
| commit | 0830ec32f40473e1a83ec7e12be11daabf6d2762 (patch) | |
| tree | d2929aa2fd3c63af741f9862575025734f785aba /extra/git | |
| parent | c02976460621a16b172e3e33432d5790f3ed6117 (diff) | |
| parent | b7f839da11975b9f2a964a82d591b7a8628f0931 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pppd-ldap/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/totem/PKGBUILD
Diffstat (limited to 'extra/git')
| -rw-r--r-- | extra/git/PKGBUILD | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 3e2b83e2d..2222f461e 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 136451 2011-08-29 14:54:02Z jgc $ +# $Id: PKGBUILD 138349 2011-09-20 14:19:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.6.1 +pkgver=1.7.6.3 +_manver=1.7.6.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -22,8 +23,9 @@ 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://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" +source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" + "http://kernel.org/pub/software/scm/git/git-manpages-$_manver.tar.bz2" git-daemon git-daemon.conf) changelog=ChangeLog @@ -78,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('d1e00772cc9dc6c571999feb9e8771ab' +md5sums=('c8f9390f970079495085d343671d6646' 'cae559424a62507cb2c15252d85a158e' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('856d4197ef7172938b0b44e55174c7d7ddfaf5e844e04960322c49eda9f3a246' +sha256sums=('b8c7642f7e2b6638c442c0d3f907d197023b8c9a35cb03681643ed7ec619eff8' 'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') |