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 510e4cc9c184adc0a58624a9b3c15181c1f38dfb (commit) via dc188082d576106e6877735f0e858e6f05f041db (commit) via c05bbee7dc7f4c3dd15e33c6200280d71b5f4b93 (commit) from bfdab6e3644fef33b22dfcf10e641ebdf8b55367 (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 510e4cc9c184adc0a58624a9b3c15181c1f38dfb Merge: dc18808 bfdab6e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 10 19:17:45 2014 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit dc188082d576106e6877735f0e858e6f05f041db Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 10 19:17:35 2014 +0200

Rootfile update.

commit c05bbee7dc7f4c3dd15e33c6200280d71b5f4b93 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 10 19:17:09 2014 +0200

make.sh: ddns must be built after intltool

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

Summary of changes: config/rootfiles/common/strongswan | 2 -- make.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 8a99cc3..e55c43c 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -63,7 +63,6 @@ etc/strongswan.d/charon/xcbc.conf etc/strongswan.d/pki.conf etc/strongswan.d/scepclient.conf etc/strongswan.d/starter.conf -etc/strongswan.d/tools.conf usr/bin/pki #usr/lib/ipsec #usr/lib/ipsec/libcharon.a @@ -225,4 +224,3 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/strongswan.d/pki.conf #usr/share/strongswan/templates/config/strongswan.d/scepclient.conf #usr/share/strongswan/templates/config/strongswan.d/starter.conf -#usr/share/strongswan/templates/config/strongswan.d/tools.conf diff --git a/make.sh b/make.sh index 174ef25..8cb2b88 100755 --- a/make.sh +++ b/make.sh @@ -475,7 +475,6 @@ buildipfire() { ipfiremake sqlite ipfiremake python ipfiremake fireinfo - ipfiremake ddns ipfiremake libnet ipfiremake libnl ipfiremake libidn @@ -764,6 +763,7 @@ buildipfire() { ipfiremake python-progressbar ipfiremake python-xattr ipfiremake intltool + ipfiremake ddns ipfiremake transmission ipfiremake dpfhack ipfiremake lcd4linux

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