[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. df106d88e5a7eeafb9298b0febbe02e9a349728f

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. df106d88e5a7eeafb9298b0febbe02e9a349728f

[git]

[-- Attachment #1: Type: text/plain, Size: 1816 bytes --]

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, next has been updated
       via  df106d88e5a7eeafb9298b0febbe02e9a349728f (commit)
       via  477e28cf0d33a4a97825ec554ed6e969dbba7e0b (commit)
      from  e659ba5b3aba411d7155665e5fe4d5dd03e026b8 (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 df106d88e5a7eeafb9298b0febbe02e9a349728f
Merge: e659ba5 477e28c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jun 17 20:27:19 2012 +0200

    Merge remote-tracking branch 'jlentfer/foomatic' into next

commit 477e28cf0d33a4a97825ec554ed6e969dbba7e0b
Author: Jan Lentfer <Jan.Lentfer(a)web.de>
Date:   Sun Jun 17 20:23:35 2012 +0200

    foomatic: Clean out /usr/share/foomatic prior to build to prevent hangs

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

Summary of changes:
 lfs/foomatic |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Difference in files:
diff --git a/lfs/foomatic b/lfs/foomatic
index e22f4b8..712247f 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -86,7 +86,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \
+	@rm -rf $(DIR_SRC)/foomatic-* /usr/share/foomatic && cd $(DIR_SRC) && \
 		tar zxf $(DIR_DL)/$(DL_FILE) && \
 		tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
 		tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \


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