From 796104d370975c8a1ef7090ab25ec99bdb7cd1f6 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 18 Aug 2008 21:01:31 +0200 Subject: [PATCH] git: updated to 1.6.0. --- git/.footprint | 293 +++++++++++++++++++++++++------------------------ git/.md5sum | 4 +- git/Pkgfile | 5 +- 3 files changed, 153 insertions(+), 149 deletions(-) diff --git a/git/.footprint b/git/.footprint index ce3dfa8e6..ec0ffd502 100644 --- a/git/.footprint +++ b/git/.footprint @@ -1,146 +1,149 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/git --rwxr-xr-x root/root usr/bin/git-add --rwxr-xr-x root/root usr/bin/git-add--interactive --rwxr-xr-x root/root usr/bin/git-am --rwxr-xr-x root/root usr/bin/git-annotate --rwxr-xr-x root/root usr/bin/git-apply --rwxr-xr-x root/root usr/bin/git-archimport --rwxr-xr-x root/root usr/bin/git-archive --rwxr-xr-x root/root usr/bin/git-bisect --rwxr-xr-x root/root usr/bin/git-blame --rwxr-xr-x root/root usr/bin/git-branch --rwxr-xr-x root/root usr/bin/git-bundle --rwxr-xr-x root/root usr/bin/git-cat-file --rwxr-xr-x root/root usr/bin/git-check-attr --rwxr-xr-x root/root usr/bin/git-check-ref-format --rwxr-xr-x root/root usr/bin/git-checkout --rwxr-xr-x root/root usr/bin/git-checkout-index --rwxr-xr-x root/root usr/bin/git-cherry --rwxr-xr-x root/root usr/bin/git-cherry-pick --rwxr-xr-x root/root usr/bin/git-citool --rwxr-xr-x root/root usr/bin/git-clean --rwxr-xr-x root/root usr/bin/git-clone --rwxr-xr-x root/root usr/bin/git-commit --rwxr-xr-x root/root usr/bin/git-commit-tree --rwxr-xr-x root/root usr/bin/git-config --rwxr-xr-x root/root usr/bin/git-count-objects --rwxr-xr-x root/root usr/bin/git-cvsexportcommit --rwxr-xr-x root/root usr/bin/git-cvsimport --rwxr-xr-x root/root usr/bin/git-cvsserver --rwxr-xr-x root/root usr/bin/git-daemon --rwxr-xr-x root/root usr/bin/git-describe --rwxr-xr-x root/root usr/bin/git-diff --rwxr-xr-x root/root usr/bin/git-diff-files --rwxr-xr-x root/root usr/bin/git-diff-index --rwxr-xr-x root/root usr/bin/git-diff-tree --rwxr-xr-x root/root usr/bin/git-fast-export --rwxr-xr-x root/root usr/bin/git-fast-import --rwxr-xr-x root/root usr/bin/git-fetch --rwxr-xr-x root/root usr/bin/git-fetch--tool --rwxr-xr-x root/root usr/bin/git-fetch-pack --rwxr-xr-x root/root usr/bin/git-filter-branch --rwxr-xr-x root/root usr/bin/git-fmt-merge-msg --rwxr-xr-x root/root usr/bin/git-for-each-ref --rwxr-xr-x root/root usr/bin/git-format-patch --rwxr-xr-x root/root usr/bin/git-fsck --rwxr-xr-x root/root usr/bin/git-fsck-objects --rwxr-xr-x root/root usr/bin/git-gc --rwxr-xr-x root/root usr/bin/git-get-tar-commit-id --rwxr-xr-x root/root usr/bin/git-grep --rwxr-xr-x root/root usr/bin/git-gui --rwxr-xr-x root/root usr/bin/git-hash-object --rwxr-xr-x root/root usr/bin/git-http-fetch --rwxr-xr-x root/root usr/bin/git-http-push --rwxr-xr-x root/root usr/bin/git-imap-send --rwxr-xr-x root/root usr/bin/git-index-pack --rwxr-xr-x root/root usr/bin/git-init --rwxr-xr-x root/root usr/bin/git-init-db --rwxr-xr-x root/root usr/bin/git-instaweb --rwxr-xr-x root/root usr/bin/git-log --rwxr-xr-x root/root usr/bin/git-lost-found --rwxr-xr-x root/root usr/bin/git-ls-files --rwxr-xr-x root/root usr/bin/git-ls-remote --rwxr-xr-x root/root usr/bin/git-ls-tree --rwxr-xr-x root/root usr/bin/git-mailinfo --rwxr-xr-x root/root usr/bin/git-mailsplit --rwxr-xr-x root/root usr/bin/git-merge --rwxr-xr-x root/root usr/bin/git-merge-base --rwxr-xr-x root/root usr/bin/git-merge-file --rwxr-xr-x root/root usr/bin/git-merge-index --rwxr-xr-x root/root usr/bin/git-merge-octopus --rwxr-xr-x root/root usr/bin/git-merge-one-file --rwxr-xr-x root/root usr/bin/git-merge-ours --rwxr-xr-x root/root usr/bin/git-merge-recursive --rwxr-xr-x root/root usr/bin/git-merge-resolve --rwxr-xr-x root/root usr/bin/git-merge-stupid --rwxr-xr-x root/root usr/bin/git-merge-subtree --rwxr-xr-x root/root usr/bin/git-merge-tree --rwxr-xr-x root/root usr/bin/git-mergetool --rwxr-xr-x root/root usr/bin/git-mktag --rwxr-xr-x root/root usr/bin/git-mktree --rwxr-xr-x root/root usr/bin/git-mv --rwxr-xr-x root/root usr/bin/git-name-rev --rwxr-xr-x root/root usr/bin/git-pack-objects --rwxr-xr-x root/root usr/bin/git-pack-redundant --rwxr-xr-x root/root usr/bin/git-pack-refs --rwxr-xr-x root/root usr/bin/git-parse-remote --rwxr-xr-x root/root usr/bin/git-patch-id --rwxr-xr-x root/root usr/bin/git-peek-remote --rwxr-xr-x root/root usr/bin/git-prune --rwxr-xr-x root/root usr/bin/git-prune-packed --rwxr-xr-x root/root usr/bin/git-pull --rwxr-xr-x root/root usr/bin/git-push --rwxr-xr-x root/root usr/bin/git-quiltimport --rwxr-xr-x root/root usr/bin/git-read-tree --rwxr-xr-x root/root usr/bin/git-rebase --rwxr-xr-x root/root usr/bin/git-rebase--interactive -rwxr-xr-x root/root usr/bin/git-receive-pack --rwxr-xr-x root/root usr/bin/git-reflog --rwxr-xr-x root/root usr/bin/git-relink --rwxr-xr-x root/root usr/bin/git-remote --rwxr-xr-x root/root usr/bin/git-repack --rwxr-xr-x root/root usr/bin/git-repo-config --rwxr-xr-x root/root usr/bin/git-request-pull --rwxr-xr-x root/root usr/bin/git-rerere --rwxr-xr-x root/root usr/bin/git-reset --rwxr-xr-x root/root usr/bin/git-rev-list --rwxr-xr-x root/root usr/bin/git-rev-parse --rwxr-xr-x root/root usr/bin/git-revert --rwxr-xr-x root/root usr/bin/git-rm --rwxr-xr-x root/root usr/bin/git-send-email --rwxr-xr-x root/root usr/bin/git-send-pack --rwxr-xr-x root/root usr/bin/git-sh-setup --rwxr-xr-x root/root usr/bin/git-shell --rwxr-xr-x root/root usr/bin/git-shortlog --rwxr-xr-x root/root usr/bin/git-show --rwxr-xr-x root/root usr/bin/git-show-branch --rwxr-xr-x root/root usr/bin/git-show-index --rwxr-xr-x root/root usr/bin/git-show-ref --rwxr-xr-x root/root usr/bin/git-stash --rwxr-xr-x root/root usr/bin/git-status --rwxr-xr-x root/root usr/bin/git-stripspace --rwxr-xr-x root/root usr/bin/git-submodule --rwxr-xr-x root/root usr/bin/git-svn --rwxr-xr-x root/root usr/bin/git-symbolic-ref --rwxr-xr-x root/root usr/bin/git-tag --rwxr-xr-x root/root usr/bin/git-tar-tree --rwxr-xr-x root/root usr/bin/git-unpack-file --rwxr-xr-x root/root usr/bin/git-unpack-objects --rwxr-xr-x root/root usr/bin/git-update-index --rwxr-xr-x root/root usr/bin/git-update-ref --rwxr-xr-x root/root usr/bin/git-update-server-info -rwxr-xr-x root/root usr/bin/git-upload-archive -rwxr-xr-x root/root usr/bin/git-upload-pack --rwxr-xr-x root/root usr/bin/git-var --rwxr-xr-x root/root usr/bin/git-verify-pack --rwxr-xr-x root/root usr/bin/git-verify-tag --rwxr-xr-x root/root usr/bin/git-web--browse --rwxr-xr-x root/root usr/bin/git-whatchanged --rwxr-xr-x root/root usr/bin/git-write-tree -rwxr-xr-x root/root usr/bin/gitk drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/git-core/ +-rwxr-xr-x root/root usr/lib/git-core/git-add +-rwxr-xr-x root/root usr/lib/git-core/git-add--interactive +-rwxr-xr-x root/root usr/lib/git-core/git-am +-rwxr-xr-x root/root usr/lib/git-core/git-annotate +-rwxr-xr-x root/root usr/lib/git-core/git-apply +-rwxr-xr-x root/root usr/lib/git-core/git-archimport +-rwxr-xr-x root/root usr/lib/git-core/git-archive +-rwxr-xr-x root/root usr/lib/git-core/git-bisect +-rwxr-xr-x root/root usr/lib/git-core/git-blame +-rwxr-xr-x root/root usr/lib/git-core/git-branch +-rwxr-xr-x root/root usr/lib/git-core/git-bundle +-rwxr-xr-x root/root usr/lib/git-core/git-cat-file +-rwxr-xr-x root/root usr/lib/git-core/git-check-attr +-rwxr-xr-x root/root usr/lib/git-core/git-check-ref-format +-rwxr-xr-x root/root usr/lib/git-core/git-checkout +-rwxr-xr-x root/root usr/lib/git-core/git-checkout-index +-rwxr-xr-x root/root usr/lib/git-core/git-cherry +-rwxr-xr-x root/root usr/lib/git-core/git-cherry-pick +-rwxr-xr-x root/root usr/lib/git-core/git-citool +-rwxr-xr-x root/root usr/lib/git-core/git-clean +-rwxr-xr-x root/root usr/lib/git-core/git-clone +-rwxr-xr-x root/root usr/lib/git-core/git-commit +-rwxr-xr-x root/root usr/lib/git-core/git-commit-tree +-rwxr-xr-x root/root usr/lib/git-core/git-config +-rwxr-xr-x root/root usr/lib/git-core/git-count-objects +-rwxr-xr-x root/root usr/lib/git-core/git-cvsexportcommit +-rwxr-xr-x root/root usr/lib/git-core/git-cvsimport +-rwxr-xr-x root/root usr/lib/git-core/git-cvsserver +-rwxr-xr-x root/root usr/lib/git-core/git-daemon +-rwxr-xr-x root/root usr/lib/git-core/git-describe +-rwxr-xr-x root/root usr/lib/git-core/git-diff +-rwxr-xr-x root/root usr/lib/git-core/git-diff-files +-rwxr-xr-x root/root usr/lib/git-core/git-diff-index +-rwxr-xr-x root/root usr/lib/git-core/git-diff-tree +-rwxr-xr-x root/root usr/lib/git-core/git-fast-export +-rwxr-xr-x root/root usr/lib/git-core/git-fast-import +-rwxr-xr-x root/root usr/lib/git-core/git-fetch +-rwxr-xr-x root/root usr/lib/git-core/git-fetch--tool +-rwxr-xr-x root/root usr/lib/git-core/git-fetch-pack +-rwxr-xr-x root/root usr/lib/git-core/git-filter-branch +-rwxr-xr-x root/root usr/lib/git-core/git-fmt-merge-msg +-rwxr-xr-x root/root usr/lib/git-core/git-for-each-ref +-rwxr-xr-x root/root usr/lib/git-core/git-format-patch +-rwxr-xr-x root/root usr/lib/git-core/git-fsck +-rwxr-xr-x root/root usr/lib/git-core/git-fsck-objects +-rwxr-xr-x root/root usr/lib/git-core/git-gc +-rwxr-xr-x root/root usr/lib/git-core/git-get-tar-commit-id +-rwxr-xr-x root/root usr/lib/git-core/git-grep +-rwxr-xr-x root/root usr/lib/git-core/git-gui +-rwxr-xr-x root/root usr/lib/git-core/git-hash-object +-rwxr-xr-x root/root usr/lib/git-core/git-http-fetch +-rwxr-xr-x root/root usr/lib/git-core/git-http-push +-rwxr-xr-x root/root usr/lib/git-core/git-imap-send +-rwxr-xr-x root/root usr/lib/git-core/git-index-pack +-rwxr-xr-x root/root usr/lib/git-core/git-init +-rwxr-xr-x root/root usr/lib/git-core/git-init-db +-rwxr-xr-x root/root usr/lib/git-core/git-instaweb +-rwxr-xr-x root/root usr/lib/git-core/git-log +-rwxr-xr-x root/root usr/lib/git-core/git-lost-found +-rwxr-xr-x root/root usr/lib/git-core/git-ls-files +-rwxr-xr-x root/root usr/lib/git-core/git-ls-remote +-rwxr-xr-x root/root usr/lib/git-core/git-ls-tree +-rwxr-xr-x root/root usr/lib/git-core/git-mailinfo +-rwxr-xr-x root/root usr/lib/git-core/git-mailsplit +-rwxr-xr-x root/root usr/lib/git-core/git-merge +-rwxr-xr-x root/root usr/lib/git-core/git-merge-base +-rwxr-xr-x root/root usr/lib/git-core/git-merge-file +-rwxr-xr-x root/root usr/lib/git-core/git-merge-index +-rwxr-xr-x root/root usr/lib/git-core/git-merge-octopus +-rwxr-xr-x root/root usr/lib/git-core/git-merge-one-file +-rwxr-xr-x root/root usr/lib/git-core/git-merge-ours +-rwxr-xr-x root/root usr/lib/git-core/git-merge-recursive +-rwxr-xr-x root/root usr/lib/git-core/git-merge-resolve +-rwxr-xr-x root/root usr/lib/git-core/git-merge-subtree +-rwxr-xr-x root/root usr/lib/git-core/git-merge-tree +-rwxr-xr-x root/root usr/lib/git-core/git-mergetool +-rwxr-xr-x root/root usr/lib/git-core/git-mktag +-rwxr-xr-x root/root usr/lib/git-core/git-mktree +-rwxr-xr-x root/root usr/lib/git-core/git-mv +-rwxr-xr-x root/root usr/lib/git-core/git-name-rev +-rwxr-xr-x root/root usr/lib/git-core/git-pack-objects +-rwxr-xr-x root/root usr/lib/git-core/git-pack-redundant +-rwxr-xr-x root/root usr/lib/git-core/git-pack-refs +-rwxr-xr-x root/root usr/lib/git-core/git-parse-remote +-rwxr-xr-x root/root usr/lib/git-core/git-patch-id +-rwxr-xr-x root/root usr/lib/git-core/git-peek-remote +-rwxr-xr-x root/root usr/lib/git-core/git-prune +-rwxr-xr-x root/root usr/lib/git-core/git-prune-packed +-rwxr-xr-x root/root usr/lib/git-core/git-pull +-rwxr-xr-x root/root usr/lib/git-core/git-push +-rwxr-xr-x root/root usr/lib/git-core/git-quiltimport +-rwxr-xr-x root/root usr/lib/git-core/git-read-tree +-rwxr-xr-x root/root usr/lib/git-core/git-rebase +-rwxr-xr-x root/root usr/lib/git-core/git-rebase--interactive +-rwxr-xr-x root/root usr/lib/git-core/git-receive-pack +-rwxr-xr-x root/root usr/lib/git-core/git-reflog +-rwxr-xr-x root/root usr/lib/git-core/git-relink +-rwxr-xr-x root/root usr/lib/git-core/git-remote +-rwxr-xr-x root/root usr/lib/git-core/git-repack +-rwxr-xr-x root/root usr/lib/git-core/git-repo-config +-rwxr-xr-x root/root usr/lib/git-core/git-request-pull +-rwxr-xr-x root/root usr/lib/git-core/git-rerere +-rwxr-xr-x root/root usr/lib/git-core/git-reset +-rwxr-xr-x root/root usr/lib/git-core/git-rev-list +-rwxr-xr-x root/root usr/lib/git-core/git-rev-parse +-rwxr-xr-x root/root usr/lib/git-core/git-revert +-rwxr-xr-x root/root usr/lib/git-core/git-rm +-rwxr-xr-x root/root usr/lib/git-core/git-send-email +-rwxr-xr-x root/root usr/lib/git-core/git-send-pack +-rwxr-xr-x root/root usr/lib/git-core/git-sh-setup +-rwxr-xr-x root/root usr/lib/git-core/git-shell +-rwxr-xr-x root/root usr/lib/git-core/git-shortlog +-rwxr-xr-x root/root usr/lib/git-core/git-show +-rwxr-xr-x root/root usr/lib/git-core/git-show-branch +-rwxr-xr-x root/root usr/lib/git-core/git-show-index +-rwxr-xr-x root/root usr/lib/git-core/git-show-ref +-rwxr-xr-x root/root usr/lib/git-core/git-stash +-rwxr-xr-x root/root usr/lib/git-core/git-status +-rwxr-xr-x root/root usr/lib/git-core/git-stripspace +-rwxr-xr-x root/root usr/lib/git-core/git-submodule +-rwxr-xr-x root/root usr/lib/git-core/git-svn +-rwxr-xr-x root/root usr/lib/git-core/git-symbolic-ref +-rwxr-xr-x root/root usr/lib/git-core/git-tag +-rwxr-xr-x root/root usr/lib/git-core/git-tar-tree +-rwxr-xr-x root/root usr/lib/git-core/git-unpack-file +-rwxr-xr-x root/root usr/lib/git-core/git-unpack-objects +-rwxr-xr-x root/root usr/lib/git-core/git-update-index +-rwxr-xr-x root/root usr/lib/git-core/git-update-ref +-rwxr-xr-x root/root usr/lib/git-core/git-update-server-info +-rwxr-xr-x root/root usr/lib/git-core/git-upload-archive +-rwxr-xr-x root/root usr/lib/git-core/git-upload-pack +-rwxr-xr-x root/root usr/lib/git-core/git-var +-rwxr-xr-x root/root usr/lib/git-core/git-verify-pack +-rwxr-xr-x root/root usr/lib/git-core/git-verify-tag +-rwxr-xr-x root/root usr/lib/git-core/git-web--browse +-rwxr-xr-x root/root usr/lib/git-core/git-whatchanged +-rwxr-xr-x root/root usr/lib/git-core/git-write-tree drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/5.8.8/ drwxr-xr-x root/root usr/lib/perl5/5.8.8/linux/ @@ -308,16 +311,16 @@ drwxr-xr-x root/root usr/share/git-core/templates/ drwxr-xr-x root/root usr/share/git-core/templates/branches/ -rw-r--r-- root/root usr/share/git-core/templates/description drwxr-xr-x root/root usr/share/git-core/templates/hooks/ --rw-r--r-- root/root usr/share/git-core/templates/hooks/applypatch-msg --rw-r--r-- root/root usr/share/git-core/templates/hooks/commit-msg --rw-r--r-- root/root usr/share/git-core/templates/hooks/post-commit --rw-r--r-- root/root usr/share/git-core/templates/hooks/post-receive --rw-r--r-- root/root usr/share/git-core/templates/hooks/post-update --rw-r--r-- root/root usr/share/git-core/templates/hooks/pre-applypatch --rw-r--r-- root/root usr/share/git-core/templates/hooks/pre-commit --rw-r--r-- root/root usr/share/git-core/templates/hooks/pre-rebase --rw-r--r-- root/root usr/share/git-core/templates/hooks/prepare-commit-msg --rw-r--r-- root/root usr/share/git-core/templates/hooks/update +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/applypatch-msg.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/commit-msg.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/post-commit.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/post-receive.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/post-update.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-applypatch.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-commit.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-rebase.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/prepare-commit-msg.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/update.sample drwxr-xr-x root/root usr/share/git-core/templates/info/ -rw-r--r-- root/root usr/share/git-core/templates/info/exclude drwxr-xr-x root/root usr/share/git-gui/ diff --git a/git/.md5sum b/git/.md5sum index 8f1a4c2ec..f11c0fda2 100644 --- a/git/.md5sum +++ b/git/.md5sum @@ -1,2 +1,2 @@ -5175d142ad0745b9e22a64904aa86c45 git-1.5.6.5.tar.bz2 -fd0632919f14b28a7af6abccf8c2d796 git-manpages-1.5.6.5.tar.bz2 +3d37e1f1e93c7828236e2af04ea0d071 git-1.6.0.tar.bz2 +0154019dc417fb72e682a98afeac9cbc git-manpages-1.6.0.tar.bz2 diff --git a/git/Pkgfile b/git/Pkgfile index e63563d62..ffe2dc431 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -5,7 +5,7 @@ # Nice to have: tk name=git -version=1.5.6.5 +version=1.6.0 release=1 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2) @@ -16,7 +16,8 @@ build() { # investigate whether there's a better way. sed -i -e '15,16d' -e '18d' perl/Makefile.PL - make CFLAGS="$CFLAGS" prefix=/usr DESTDIR=$PKG install + make CFLAGS="$CFLAGS" prefix=/usr gitexecdir=/usr/lib/git-core \ + DESTDIR=$PKG install cd $SRC