Merge remote-tracking branch 'origin/next' into thirteen

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 98686b010b810334927c19acacecaf04a04ddd56..f5407ebacf262ba89affe4cae830560d474e8b5f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -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
@@ -577,6 +577,7 @@ buildipfire() {
   ipfiremake ntp
   ipfiremake openssh
   ipfiremake fontconfig
+  ipfiremake dejavu-fonts-ttf
   ipfiremake freefont
   ipfiremake pixman
   ipfiremake cairo
@@ -758,6 +759,7 @@ buildipfire() {
   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