Merge branch 'master' into next

Conflicts:
	make.sh

diff --combined make.sh
index ba25ec3b476000140df7e2d024c62ff5d4dceeb8,1d760a204eaa18908d7c25bf689744be1e952e4a..6d1e423905537ee788afe62917f7515ac4d35376
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.9"                                                 # Version number
 +VERSION="2.10"                                                        # Version number
  CORE="50"                                                     # Core Level (Filename)
  PAKFIRE_CORE="49"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -358,7 -358,6 +358,7 @@@ buildipfire() 
    ipfiremake which
    ipfiremake xz
    ipfiremake linux-firmware
 +  ipfiremake zd1211-firmware
    ipfiremake linux                    XEN=1
    ipfiremake kqemu                    XEN=1
    ipfiremake v4l-dvb                  XEN=1
@@@ -418,6 -417,8 +418,8 @@@
    ipfiremake pam
    ipfiremake openssl
    ipfiremake curl
+   ipfiremake tcl
+   ipfiremake sqlite
    ipfiremake python
    ipfiremake fireinfo
    ipfiremake libnet
@@@ -651,7 -652,6 +653,6 @@@
    ipfiremake splix
    ipfiremake streamripper
    ipfiremake sshfs
-   ipfiremake sqlite
    ipfiremake taglib
    ipfiremake mediatomb
    ipfiremake sslh
@@@ -682,7 -682,6 +683,6 @@@
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
-   ipfiremake tcl
    ipfiremake imspector
    ipfiremake miniupnpd
    ipfiremake client175
@@@ -690,10 -689,15 +690,16 @@@
    ipfiremake parted
    ipfiremake swig
    ipfiremake python-m2crypto
 +  ipfiremake wireless-regdb
    ipfiremake crda
    ipfiremake libsatsolver
    ipfiremake python-satsolver
+   ipfiremake python-distutils-extra
+   ipfiremake python-lzma
+   ipfiremake python-progressbar
+   ipfiremake python-xattr
+   ipfiremake intltool
+   ipfiremake pakfire3-deps
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -703,7 -707,7 +709,7 @@@
    echo >> $BASEDIR/build/var/ipfire/firebuild
    cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
    echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 -  if [ "$GIT_BRANCH" = "master" ]; then
 +  if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
    else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release