Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 6 Sep 2012 10:36:18 +0000 (12:36 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 6 Sep 2012 19:55:49 +0000 (21:55 +0200)
Conflicts:
lfs/php
make.sh

1  2 
lfs/apcupsd
lfs/php
make.sh

diff --cc 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  <info@ipfire.org>                     #
  #                                                                             #
  # 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 lfs/php
Simple merge
diff --cc 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