Merge branch 'next'

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

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index ea31b20a1ce3215b3f9c63a7fa01c12280d48121..1c93049b5442a223fecdb88993c0ec253610c929 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -5,25 +5,25 @@ usr/bin/git-shell
 usr/bin/git-upload-archive
 usr/bin/git-upload-pack
 #usr/bin/gitk
-usr/lib/perl5/site_perl/5.12.3/Error.pm
-#usr/lib/perl5/site_perl/5.12.3/Git
-usr/lib/perl5/site_perl/5.12.3/Git.pm
-usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm
-usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN
-usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm
-usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
+usr/lib/perl5/site_perl/5.30.0/Error.pm
+#usr/lib/perl5/site_perl/5.30.0/Git
+usr/lib/perl5/site_perl/5.30.0/Git.pm
+usr/lib/perl5/site_perl/5.30.0/Git/I18N.pm
+usr/lib/perl5/site_perl/5.30.0/Git/IndexInfo.pm
+usr/lib/perl5/site_perl/5.30.0/Git/SVN
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Editor.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Fetcher.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/GlobSpec.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Log.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize/YAML.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Migration.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Prompt.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Ra.pm
+#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Utils.pm
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Git
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Git/.packlist
 #usr/libexec/git-core
 #usr/libexec/git-core/git
 usr/libexec/git-core/git-add
@@ -138,7 +138,6 @@ usr/libexec/git-core/git-rebase--interactive
 usr/libexec/git-core/git-rebase--merge
 usr/libexec/git-core/git-receive-pack
 usr/libexec/git-core/git-reflog
-usr/libexec/git-core/git-relink
 usr/libexec/git-core/git-remote
 usr/libexec/git-core/git-remote-ext
 usr/libexec/git-core/git-remote-fd
@@ -201,6 +200,7 @@ usr/libexec/git-core/mergetools/diffmerge
 usr/libexec/git-core/mergetools/diffuse
 usr/libexec/git-core/mergetools/ecmerge
 usr/libexec/git-core/mergetools/emerge
+usr/libexec/git-core/mergetools/examdiff
 usr/libexec/git-core/mergetools/gvimdiff
 usr/libexec/git-core/mergetools/gvimdiff2
 usr/libexec/git-core/mergetools/gvimdiff3
@@ -228,6 +228,7 @@ usr/share/git-core/templates/hooks/pre-applypatch.sample
 usr/share/git-core/templates/hooks/pre-commit.sample
 usr/share/git-core/templates/hooks/pre-push.sample
 usr/share/git-core/templates/hooks/pre-rebase.sample
+usr/share/git-core/templates/hooks/pre-receive.sample
 usr/share/git-core/templates/hooks/prepare-commit-msg.sample
 usr/share/git-core/templates/hooks/update.sample
 #usr/share/git-core/templates/info
@@ -270,6 +271,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/msgs/ja.msg
 #usr/share/git-gui/lib/msgs/nb.msg
 #usr/share/git-gui/lib/msgs/pt_br.msg
+#usr/share/git-gui/lib/msgs/pt_pt.msg
 #usr/share/git-gui/lib/msgs/ru.msg
 #usr/share/git-gui/lib/msgs/sv.msg
 #usr/share/git-gui/lib/msgs/vi.msg
@@ -302,6 +304,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib/msgs/it.msg
 #usr/share/gitk/lib/msgs/ja.msg
 #usr/share/gitk/lib/msgs/pt_br.msg
+#usr/share/gitk/lib/msgs/pt_pt.msg
 #usr/share/gitk/lib/msgs/ru.msg
 #usr/share/gitk/lib/msgs/sv.msg
 #usr/share/gitk/lib/msgs/vi.msg