This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 551bddaefe35e9b9d60ee2f7cfb0ca40c4af0a4e (commit) via ee7b74d483f8637f1c7a7ae08d45c75858519b1d (commit) via f2ab614b46212a977026117aba71968fc8bf361c (commit) from 8dbba0e4607ad83d26849e87b09ef52a5ec3f70f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 551bddaefe35e9b9d60ee2f7cfb0ca40c4af0a4e Merge: ee7b74d 8dbba0e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 19 19:29:52 2011 +0100

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

commit ee7b74d483f8637f1c7a7ae08d45c75858519b1d Merge: f2ab614 7bb2165 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 19 01:03:00 2011 +0100

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

commit f2ab614b46212a977026117aba71968fc8bf361c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 18 19:59:44 2011 +0100

fireinfo: Update to 2.0.3.

-----------------------------------------------------------------------

Summary of changes: lfs/fireinfo | 8 ++------ src/patches/fireinfo-invalid-id.patch | 18 ------------------ 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 src/patches/fireinfo-invalid-id.patch

Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 97b5a87..0c55e00 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@

include Config

-VER = 2.0.2 +VER = 2.0.3

THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = ed29f591ccfeeb6386a61eafcc5dc398 +$(DL_FILE)_MD5 = f9ce8b96350dd5af1e5c095806128cd0

install : $(TARGET)

@@ -70,10 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Fix for braindead board vendors. - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch - cd $(DIR_APP) && python setup.py build cd $(DIR_APP) && python setup.py install

diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch deleted file mode 100644 index 669deb6..0000000 --- a/src/patches/fireinfo-invalid-id.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit ac68f90a0229083d755e7e2e8980822405ac2da8 -Author: Michael Tremer michael.tremer@ipfire.org -Date: Tue Jan 18 19:11:06 2011 +0100 - - Add invalid ID: 00020003-0004-0005-0006-000700080009. - -diff --git a/fireinfo/system.py b/fireinfo/system.py -index 135c29b..690eae2 100644 ---- a/fireinfo/system.py -+++ b/fireinfo/system.py -@@ -41,6 +41,7 @@ INVALID_ID_STRINGS = ( - "N/A", "n/a", - "12345", "54321", "202020", - "Chassis", "chassis", -+ "00020003-0004-0005-0006-000700080009", - ) - - class Singleton(type):

hooks/post-receive -- IPFire 2.x development tree