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 8caf7b64c83ea3641ee66a1e5b35d965ce78f666 (commit) via 889a288b3639ec726f28b39022a42d38532e18e7 (commit) via 24d109d134465bffb72306e63e97a33d465b0b3c (commit) via c0a0f74012af54902797b07897642d4799d99c25 (commit) via 6fb0e3776fde47f22c3fe35b63777d3be75c189f (commit) via b0fdaa6f34b1529951f7aeb5c13d26c10fbd750d (commit) via 9963abf5d4b639c75b626a1122d8fa1b91fc3a28 (commit) from a398cc21e909a60e582ee65887e17f66e22d3d29 (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 8caf7b64c83ea3641ee66a1e5b35d965ce78f666 Merge: a398cc2 889a288 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Oct 23 13:34:53 2010 +0200
Merge commit 'origin/master' into next
Conflicts: src/paks/linux-pae/uninstall.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/cmake | 2 ++ lfs/squidguard | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake index a9a5865..8cefc88 100644 --- a/config/rootfiles/common/cmake +++ b/config/rootfiles/common/cmake @@ -11,6 +11,8 @@ #usr/local/doc/cmake-2.4/cmake.txt #usr/local/doc/cmake-2.4/ctest.html #usr/local/doc/cmake-2.4/ctest.txt +#usr/local/man +#usr/local/man/man1 #usr/local/man/man1/ccmake.1 #usr/local/man/man1/cmake.1 #usr/local/man/man1/ctest.1 diff --git a/lfs/squidguard b/lfs/squidguard index a5dd7b9..c70a0d8 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \ --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make cd $(DIR_APP) && make install
# URL-Filter
hooks/post-receive -- IPFire 2.x development tree