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/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=bca7488392f50882571118a969d804d377d9b3dd

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

Conflicts:
	make.sh
---

bca7488392f50882571118a969d804d377d9b3dd
diff --cc make.sh
index 9d93f071e,757acec52..c6ef5df92
--- a/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