From: Arne Fitzenreiter Date: Thu, 6 Sep 2012 10:36:18 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/next' into thirteen X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7f9e0e99c67ed945d1c170d0329ed1b7ad02249;p=people%2Fteissler%2Fipfire-2.x.git Merge remote-tracking branch 'origin/next' into thirteen Conflicts: lfs/php make.sh --- c7f9e0e99c67ed945d1c170d0329ed1b7ad02249 diff --cc lfs/apcupsd index a0da9357e,db14e1417..4e9137b11 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@@ -1,7 -1,7 +1,7 @@@ ############################################################################### # # # IPFire.org - A linux based firewall # --# Copyright (C) 2009 Michael Tremer & Christian Schmidt # ++# Copyright (C) 2007-2012 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --cc make.sh index 5a5d0d630,cf36f63a7..f5407ebac --- a/make.sh +++ b/make.sh @@@ -24,9 -24,9 +24,9 @@@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.11" # Version number +VERSION="2.13" # Version number CORE="62" # Core Level (Filename) - PAKFIRE_CORE="61" # Core Level (PAKFIRE) + PAKFIRE_CORE="62" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@@ -758,7 -770,7 +758,8 @@@ buildipfire() ipfiremake mtr ipfiremake tcpick ipfiremake minidlna + ipfiremake acpid + ipfiremake fping echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild