From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 24 Jun 2013 08:36:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'jlentfer/swatch' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bca7488392f50882571118a969d804d377d9b3dd;hp=-c;p=people%2Fteissler%2Fipfire-2.x.git

Merge remote-tracking branch 'jlentfer/swatch' into next

Conflicts:
	make.sh
---

bca7488392f50882571118a969d804d377d9b3dd
diff --combined make.sh
index 9d93f071e,757acec52..c6ef5df92
--- a/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
  VERSION="2.13"							# Version number
 -CORE="69"							# Core Level (Filename)
 +CORE="70"							# Core Level (Filename)
  PAKFIRE_CORE="69"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
@@@ -442,7 -442,7 +442,7 @@@ buildipfire() 
      ipfiremake r8169			KCFG="-kirkwood"
      ipfiremake r8168			KCFG="-kirkwood"
      ipfiremake r8101			KCFG="-kirkwood"
 -    ipfiremake e1000e			KCFG="-kirkwood"
 +#    ipfiremake e1000e			KCFG="-kirkwood"
      ipfiremake igb			KCFG="-kirkwood"
  
    fi
@@@ -462,7 -462,6 +462,7 @@@
    ipfiremake libnet
    ipfiremake libnl
    ipfiremake libidn
 +  ipfiremake nasm
    ipfiremake libjpeg
    ipfiremake libexif
    ipfiremake libpng
@@@ -524,6 -523,7 +524,6 @@@
    ipfiremake logwatch
    ipfiremake misc-progs
    ipfiremake nano
 -  ipfiremake nasm
    ipfiremake URI
    ipfiremake HTML-Tagset
    ipfiremake HTML-Parser
@@@ -768,10 -768,12 +768,16 @@@
    ipfiremake strace
    ipfiremake ipfire-netboot
    ipfiremake lcdproc
 +  ipfiremake bitstream
 +  ipfiremake multicat
 +  ipfiremake keepalived
 +  ipfiremake ipvsadm
+   ipfiremake perl-Carp-Clan
+   ipfiremake perl-Date-Calc
+   ipfiremake perl-Date-Manip
+   ipfiremake perl-File-Tail
+   ipfiremake perl-TimeDate
+   ipfiremake swatch
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -950,7 -952,6 +956,7 @@@ build
  
  	cd $BASEDIR
  	tools/checknewlog.pl
 +	tools/checkwronginitlinks
  	cd $PWD
  
  	beautify build_end