[arch-commits] Commit in git/repos (3 files)

[Dan McGee]

    Date: Friday, June 5, 2009 @ 21:35:35
  Author: dan
Revision: 41627

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

........
  r41621 | dan | 2009-06-05 20:17:09 -0500 (Fri, 05 Jun 2009) | 1 line
  
  upgpkg: git 1.6.3.2-1
........

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

-----------+
 ChangeLog |    7 ++++++-
 PKGBUILD  |   11 ++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)


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

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-06-06 01:34:41 UTC (rev 41626)
+++ extra-i686/ChangeLog	2009-06-06 01:35:35 UTC (rev 41627)
@@ -1,8 +1,13 @@
 Simple version bumps are ommitted from the following ChangeLog.
 
+2009-06-05 Dan McGee <dan at archlinux.org>
+	Version 1.6.3.2-1
+	* Remove gitweb from /usr/share; it needs customization to be helpful
+	* Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
+
 2008-09-14 Dan McGee <dan at archlinux.org>
 	Version 1.6.0.2-1
-	* Moved optional depends from install file to optdepends array 
+	* Moved optional depends from install file to optdepends array
 
 2008-06-15 Dan McGee <dan at archlinux.org>
 	Version 1.5.6-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-06 01:34:41 UTC (rev 41626)
+++ extra-i686/PKGBUILD	2009-06-06 01:35:35 UTC (rev 41627)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=git
-pkgver=1.6.3.1
+pkgver=1.6.3.2
 pkgrel=1
 pkgdesc="GIT - the stupid content tracker"
 arch=(i686 x86_64)
@@ -23,12 +23,9 @@
   cd $srcdir/$pkgname-$pkgver
   make prefix=/usr gitexecdir=/usr/lib/git-core || return 1
   make prefix=/usr gitexecdir=/usr/lib/git-core \
+    NO_CROSS_DIRECTORY_HARDLINKS=1 \
     INSTALLDIRS=vendor DESTDIR=${pkgdir} install || return 1
   
-  # let's plop gitweb in /usr/share
-  mkdir -p $pkgdir/usr/share/
-  cp -dR ./gitweb $pkgdir/usr/share/gitweb || return 1
-
   #bash completion
   mkdir -p $pkgdir/etc/bash_completion.d/
   install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
@@ -44,5 +41,5 @@
   rm -rf $pkgdir/usr/lib/perl5
 }
 
-md5sums=('c1f4aab741359c29f0fbf28563ac7387'
-         '971d573e8f261feb83290a59728c2b33')
+md5sums=('149948ff33fb7d8cf9eef925e6c08157'
+         '2fb5ba5cabe0057470d577d2d4ff4816')