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

Conflicts:
	make.sh

diff --combined make.sh
index 9d93f071e3c0a8bce7170bba7304c92bd9d2a90d,757acec52f7b4563b66752b6d4dd7ea1d4df7e8b..c6ef5df928bfdc88949465ae907d8207505a8702
--- 1/make.sh
--- 2/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