From 49a5137d51150ab6b18016a6f06323bac800f4d3 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Feb 2009 13:59:37 +0100
Subject: [PATCH] Updated git to 1.6.1.2

---
 config/rootfiles/packages/git | 12 ++++++++++++
 lfs/git                       |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index a555c3f8f..f31604038 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -216,3 +216,15 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib/msgs/sv.msg
 #usr/share/man/man3/Git.3
 #usr/share/man/man3/private-Error.3
+usr/bin/git-cvsserver
+usr/bin/git-shell
+usr/libexec/git-core/git-gui--askpass
+usr/libexec/git-core/git-help
+usr/libexec/git-core/git-stage
+#usr/share/git-gui/lib/mergetool.tcl
+#usr/share/git-gui/lib/msgs/nb.msg
+#usr/share/git-gui/lib/remote_add.tcl
+#usr/share/git-gui/lib/search.tcl
+#usr/share/git-gui/lib/sshkey.tcl
+#usr/share/git-gui/lib/tools.tcl
+#usr/share/git-gui/lib/tools_dlg.tcl
diff --git a/lfs/git b/lfs/git
index e7da76e07..0dc8b4de7 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 1.6.1.2
 
 THISAPP    = git-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3d37e1f1e93c7828236e2af04ea0d071
+$(DL_FILE)_MD5 = 72a9d88932190ff3523678eec88844ae
 
 install : $(TARGET)
 
-- 
2.39.2