Merge remote-tracking branch 'jlentfer/swatch' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Jun 2013 08:36:21 +0000 (10:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Jun 2013 08:36:21 +0000 (10:36 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -768,10 -768,12 +768,16 @@@ buildipfire() 
    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