summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-10-29 00:15:38 +0200
committerpiernov <piernov@piernov.org>2011-10-29 00:15:38 +0200
commitbf8dfd4ec2d35ffdffc7e459e2999ea3b6717d90 (patch)
treebbb610278c22772cf3346641eb3f2891936320ad /extra
parentff9759cecc78379ae50d92507c4ab1d325d4c8c0 (diff)
downloadnutyx-pakxe-bf8dfd4ec2d35ffdffc7e459e2999ea3b6717d90.tar.gz
nutyx-pakxe-bf8dfd4ec2d35ffdffc7e459e2999ea3b6717d90.tar.bz2
nutyx-pakxe-bf8dfd4ec2d35ffdffc7e459e2999ea3b6717d90.tar.xz
nutyx-pakxe-bf8dfd4ec2d35ffdffc7e459e2999ea3b6717d90.zip
git 1.7.7.1-1 màj port
Diffstat (limited to 'extra')
-rw-r--r--extra/git/.footprint.i68620
-rw-r--r--extra/git/.footprint.x86_6420
-rw-r--r--extra/git/.md5sum.i6864
-rw-r--r--extra/git/.md5sum.x86_644
-rw-r--r--extra/git/Pkgfile4
5 files changed, 42 insertions, 10 deletions
diff --git a/extra/git/.footprint.i686 b/extra/git/.footprint.i686
index f5e1ee2a9..d4984d896 100644
--- a/extra/git/.footprint.i686
+++ b/extra/git/.footprint.i686
@@ -167,6 +167,22 @@ drwxr-xr-x root/root usr/lib/git-core/
-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
+drwxrwxr-x root/root usr/lib/git-core/mergetools/
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/araxis
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/bc3
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/defaults
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/diffuse
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/ecmerge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/emerge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/kdiff3
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/kompare
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/meld
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/opendiff
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/p4merge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/tkdiff
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/tortoisemerge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/vim
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/xxdiff
drwxr-xr-x root/root usr/lib/perl5/
drwxr-xr-x root/root usr/lib/perl5/site/
drwxr-xr-x root/root usr/lib/perl5/site/auto/
@@ -200,8 +216,6 @@ drwxr-xr-x root/root usr/share/git-core/templates/branches/
drwxr-xr-x root/root usr/share/git-core/templates/hooks/
-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
@@ -371,6 +385,7 @@ drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/git-remote-ext.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-remote-fd.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-remote-helpers.1.gz
+-rw-r--r-- root/root usr/share/man/man1/git-remote-testgit.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-remote.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-repack.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-replace.1.gz
@@ -432,6 +447,7 @@ drwxr-xr-x root/root usr/share/man/man7/
-rw-r--r-- root/root usr/share/man/man7/gitcvs-migration.7.gz
-rw-r--r-- root/root usr/share/man/man7/gitdiffcore.7.gz
-rw-r--r-- root/root usr/share/man/man7/gitglossary.7.gz
+-rw-r--r-- root/root usr/share/man/man7/gitnamespaces.7.gz
-rw-r--r-- root/root usr/share/man/man7/gitrevisions.7.gz
-rw-r--r-- root/root usr/share/man/man7/gittutorial-2.7.gz
-rw-r--r-- root/root usr/share/man/man7/gittutorial.7.gz
diff --git a/extra/git/.footprint.x86_64 b/extra/git/.footprint.x86_64
index f5e1ee2a9..d4984d896 100644
--- a/extra/git/.footprint.x86_64
+++ b/extra/git/.footprint.x86_64
@@ -167,6 +167,22 @@ drwxr-xr-x root/root usr/lib/git-core/
-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
+drwxrwxr-x root/root usr/lib/git-core/mergetools/
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/araxis
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/bc3
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/defaults
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/diffuse
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/ecmerge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/emerge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/kdiff3
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/kompare
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/meld
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/opendiff
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/p4merge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/tkdiff
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/tortoisemerge
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/vim
+-rw-rw-r-- root/root usr/lib/git-core/mergetools/xxdiff
drwxr-xr-x root/root usr/lib/perl5/
drwxr-xr-x root/root usr/lib/perl5/site/
drwxr-xr-x root/root usr/lib/perl5/site/auto/
@@ -200,8 +216,6 @@ drwxr-xr-x root/root usr/share/git-core/templates/branches/
drwxr-xr-x root/root usr/share/git-core/templates/hooks/
-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
@@ -371,6 +385,7 @@ drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/git-remote-ext.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-remote-fd.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-remote-helpers.1.gz
+-rw-r--r-- root/root usr/share/man/man1/git-remote-testgit.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-remote.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-repack.1.gz
-rw-r--r-- root/root usr/share/man/man1/git-replace.1.gz
@@ -432,6 +447,7 @@ drwxr-xr-x root/root usr/share/man/man7/
-rw-r--r-- root/root usr/share/man/man7/gitcvs-migration.7.gz
-rw-r--r-- root/root usr/share/man/man7/gitdiffcore.7.gz
-rw-r--r-- root/root usr/share/man/man7/gitglossary.7.gz
+-rw-r--r-- root/root usr/share/man/man7/gitnamespaces.7.gz
-rw-r--r-- root/root usr/share/man/man7/gitrevisions.7.gz
-rw-r--r-- root/root usr/share/man/man7/gittutorial-2.7.gz
-rw-r--r-- root/root usr/share/man/man7/gittutorial.7.gz
diff --git a/extra/git/.md5sum.i686 b/extra/git/.md5sum.i686
index 73e659f1a..7d9ce28b5 100644
--- a/extra/git/.md5sum.i686
+++ b/extra/git/.md5sum.i686
@@ -1,2 +1,2 @@
-9e0a438eb71e89eedb61f89470ed32a0 git-1.7.6.tar.bz2
-a017935cf9e90d9f056b6547c318fd15 git-manpages-1.7.6.tar.bz2
+7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz
+b6ec6c3a08855b7393284675643be95c git-manpages-1.7.7.1.tar.gz
diff --git a/extra/git/.md5sum.x86_64 b/extra/git/.md5sum.x86_64
index 73e659f1a..7d9ce28b5 100644
--- a/extra/git/.md5sum.x86_64
+++ b/extra/git/.md5sum.x86_64
@@ -1,2 +1,2 @@
-9e0a438eb71e89eedb61f89470ed32a0 git-1.7.6.tar.bz2
-a017935cf9e90d9f056b6547c318fd15 git-manpages-1.7.6.tar.bz2
+7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz
+b6ec6c3a08855b7393284675643be95c git-manpages-1.7.7.1.tar.gz
diff --git a/extra/git/Pkgfile b/extra/git/Pkgfile
index 8962dc7dc..698d36731 100644
--- a/extra/git/Pkgfile
+++ b/extra/git/Pkgfile
@@ -6,9 +6,9 @@
# Run on: curl,libidn
name=git
-version=1.7.6
+version=1.7.7.1
release=1
-source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
+source=(http://git-core.googlecode.com/files/$name-{,manpages-}$version.tar.gz)
build() {
export PYTHON_PATH='/usr/bin/python2'