Merge branch 'perl'

[people/pmueller/ipfire-2.x.git] / config / rootfiles / packages / git

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index a555c3f8ff6d82b9c85a8f238ad6d131a3d902bc..a7987363041876e0a3aafe233119056af0d8f614 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -1,12 +1,14 @@
 usr/bin/git
+usr/bin/git-cvsserver
 usr/bin/git-receive-pack
+usr/bin/git-shell
 usr/bin/git-upload-archive
 usr/bin/git-upload-pack
 #usr/bin/gitk
-usr/lib/perl5/site_perl/5.8.8/Error.pm
-usr/lib/perl5/site_perl/5.8.8/Git.pm
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Git
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Git/.packlist
+usr/lib/perl5/site_perl/5.12.3/Error.pm
+usr/lib/perl5/site_perl/5.12.3/Git.pm
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist
 usr/libexec/git-core
 usr/libexec/git-core/git-add
 usr/libexec/git-core/git-add--interactive
@@ -16,6 +18,7 @@ usr/libexec/git-core/git-apply
 usr/libexec/git-core/git-archimport
 usr/libexec/git-core/git-archive
 usr/libexec/git-core/git-bisect
+usr/libexec/git-core/git-bisect--helper
 usr/libexec/git-core/git-blame
 usr/libexec/git-core/git-branch
 usr/libexec/git-core/git-bundle
@@ -42,6 +45,8 @@ usr/libexec/git-core/git-diff
 usr/libexec/git-core/git-diff-files
 usr/libexec/git-core/git-diff-index
 usr/libexec/git-core/git-diff-tree
+usr/libexec/git-core/git-difftool
+usr/libexec/git-core/git-difftool--helper
 usr/libexec/git-core/git-fast-export
 usr/libexec/git-core/git-fast-import
 usr/libexec/git-core/git-fetch
@@ -57,7 +62,9 @@ usr/libexec/git-core/git-gc
 usr/libexec/git-core/git-get-tar-commit-id
 usr/libexec/git-core/git-grep
 usr/libexec/git-core/git-gui
+usr/libexec/git-core/git-gui--askpass
 usr/libexec/git-core/git-hash-object
+usr/libexec/git-core/git-help
 usr/libexec/git-core/git-http-fetch
 usr/libexec/git-core/git-http-push
 usr/libexec/git-core/git-imap-send
@@ -84,6 +91,7 @@ usr/libexec/git-core/git-merge-resolve
 usr/libexec/git-core/git-merge-subtree
 usr/libexec/git-core/git-merge-tree
 usr/libexec/git-core/git-mergetool
+usr/libexec/git-core/git-mergetool--lib
 usr/libexec/git-core/git-mktag
 usr/libexec/git-core/git-mktree
 usr/libexec/git-core/git-mv
@@ -124,6 +132,7 @@ usr/libexec/git-core/git-show
 usr/libexec/git-core/git-show-branch
 usr/libexec/git-core/git-show-index
 usr/libexec/git-core/git-show-ref
+usr/libexec/git-core/git-stage
 usr/libexec/git-core/git-stash
 usr/libexec/git-core/git-status
 usr/libexec/git-core/git-stripspace
@@ -188,22 +197,29 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/index.tcl
 #usr/share/git-gui/lib/logo.tcl
 #usr/share/git-gui/lib/merge.tcl
+#usr/share/git-gui/lib/mergetool.tcl
 #usr/share/git-gui/lib/msgs
 #usr/share/git-gui/lib/msgs/de.msg
 #usr/share/git-gui/lib/msgs/fr.msg
 #usr/share/git-gui/lib/msgs/hu.msg
 #usr/share/git-gui/lib/msgs/it.msg
 #usr/share/git-gui/lib/msgs/ja.msg
+#usr/share/git-gui/lib/msgs/nb.msg
 #usr/share/git-gui/lib/msgs/ru.msg
 #usr/share/git-gui/lib/msgs/sv.msg
 #usr/share/git-gui/lib/msgs/zh_cn.msg
 #usr/share/git-gui/lib/option.tcl
 #usr/share/git-gui/lib/remote.tcl
+#usr/share/git-gui/lib/remote_add.tcl
 #usr/share/git-gui/lib/remote_branch_delete.tcl
+#usr/share/git-gui/lib/search.tcl
 #usr/share/git-gui/lib/shortcut.tcl
 #usr/share/git-gui/lib/spellcheck.tcl
+#usr/share/git-gui/lib/sshkey.tcl
 #usr/share/git-gui/lib/status_bar.tcl
 #usr/share/git-gui/lib/tclIndex
+#usr/share/git-gui/lib/tools.tcl
+#usr/share/git-gui/lib/tools_dlg.tcl
 #usr/share/git-gui/lib/transport.tcl
 #usr/share/git-gui/lib/win32.tcl
 #usr/share/git-gui/lib/win32_shortcut.js
@@ -213,6 +229,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib/msgs/de.msg
 #usr/share/gitk/lib/msgs/es.msg
 #usr/share/gitk/lib/msgs/it.msg
+#usr/share/gitk/lib/msgs/ru.msg
 #usr/share/gitk/lib/msgs/sv.msg
 #usr/share/man/man3/Git.3
 #usr/share/man/man3/private-Error.3