[arch-commits] Commit in git/repos (extra-i686 extra-i686/PKGBUILD)

[Dan McGee]

    Date: Sunday, December 6, 2009 @ 11:38:36
  Author: dan
Revision: 60733

Merged revisions 60731 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/git/trunk

........
  r60731 | dan | 2009-12-06 10:33:16 -0600 (Sun, 06 Dec 2009) | 2 lines
  
  Move contrib/ into a more sane place, whoops
........

Modified:
  git/repos/extra-i686/	(properties)
  git/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: git/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /git/trunk:1-60729
   + /git/trunk:1-60732

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-06 16:33:36 UTC (rev 60732)
+++ extra-i686/PKGBUILD	2009-12-06 16:38:36 UTC (rev 60733)
@@ -3,7 +3,7 @@
 
 pkgname=git
 pkgver=1.6.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/"
@@ -31,7 +31,7 @@
   install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
 
   # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/ || return 1
+  cp -a ./contrib $pkgdir/usr/share/git/ || return 1
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do