From 4a3f7cf862ebfda0197b32ce580f2277bc73709e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 11 Apr 2008 08:54:50 +0200
Subject: [PATCH] Updated git to 1.5.5.

---
 config/rootfiles/packages/git | 5 ++++-
 doc/packages-list.txt         | 6 ++++--
 lfs/git                       | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index 205e68c68..646e55ac5 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -49,7 +49,6 @@ usr/bin/git-get-tar-commit-id
 usr/bin/git-grep
 usr/bin/git-gui
 usr/bin/git-hash-object
-usr/bin/git-help--browse
 usr/bin/git-http-fetch
 usr/bin/git-http-push
 usr/bin/git-imap-send
@@ -135,6 +134,7 @@ usr/bin/git-upload-pack
 usr/bin/git-var
 usr/bin/git-verify-pack
 usr/bin/git-verify-tag
+usr/bin/git-web--browse
 usr/bin/git-whatchanged
 usr/bin/git-write-tree
 #usr/bin/gitk
@@ -155,6 +155,7 @@ usr/share/git-core/templates/hooks/post-update
 usr/share/git-core/templates/hooks/pre-applypatch
 usr/share/git-core/templates/hooks/pre-commit
 usr/share/git-core/templates/hooks/pre-rebase
+usr/share/git-core/templates/hooks/prepare-commit-msg
 usr/share/git-core/templates/hooks/update
 usr/share/git-core/templates/info
 usr/share/git-core/templates/info/exclude
@@ -197,6 +198,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/remote.tcl
 #usr/share/git-gui/lib/remote_branch_delete.tcl
 #usr/share/git-gui/lib/shortcut.tcl
+#usr/share/git-gui/lib/spellcheck.tcl
 #usr/share/git-gui/lib/status_bar.tcl
 #usr/share/git-gui/lib/tclIndex
 #usr/share/git-gui/lib/transport.tcl
@@ -206,5 +208,6 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib
 #usr/share/gitk/lib/msgs
 #usr/share/gitk/lib/msgs/de.msg
+#usr/share/gitk/lib/msgs/it.msg
 #usr/share/man/man3/Git.3
 #usr/share/man/man3/private-Error.3
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 0cfd4d16d..3da833265 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -42,6 +42,7 @@
 * automake-1.9.6
 * backup-ipfire
 * bash-3.1
+* bc-1.06
 * beep-1.2.2
 * bind-9.3.2
 * binutils-2.16.1
@@ -57,6 +58,7 @@
 * cdrtools-2.01
 * centerim-4.22.1
 * clamav-0.92.1
+* cmake-2.4.8
 * collectd-4.3.0
 * coreutils-5.96
 * cpio-2.6
@@ -96,7 +98,7 @@
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
-* git-1.5.4.5
+* git-1.5.5
 * glib-2.9.6
 * glibc-2.3.6
 * gmp-4.2
@@ -248,7 +250,7 @@
 * smartmontools-5.36
 * snort-2.6.1.4
 * sox-12.18.1
-* spandsp-0.0.3pre24
+* spandsp-0.0.4pre15
 * squashfs3.2-r2
 * squid-2.6.STABLE19
 * squid-graph-3.2
diff --git a/lfs/git b/lfs/git
index 4795459f4..b4868f47a 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.5.4.5
+VER        = 1.5.5
 
 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    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed28e30c5e9d2a7ffe5b2268eaf8a29a
+$(DL_FILE)_MD5 = 09f15f0b0e330986d930746abf6962f4
 
 install : $(TARGET)
 
-- 
2.39.2