Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:
	tools/make-packages

diff --cc tools/make-include
Simple merge

diff --cc tools/make-interactive
Simple merge

diff --cc tools/make-packages
index 8af06d5a9bf57406738c485b4cbe49290e27f926,db5f5ff1251ddd6a67aa47ac863bd6b76475d5ab..537d2b8d70ea9176a7b39e22fc47832bb6129bd4
--- 1/tools/make-packages
--- 2/tools/make-packages
+++ b/tools/make-packages
@@@ -93,24 -96,32 +93,30 @@@ pkg_info() 
  }
  
  pkg_info_wiki() {
 -      (
 -              unset NAME VERSION
 -              eval $(pkg_info ${1})
 +      (       eval $(pkg_info ${1})
  
 -              [ "$NAME" = "" ] && exit
 +              [ "$PKG_NAME" = "" ] && exit
  
                # Output everything in wiki format
 -              echo "^  $NAME  ^^"
 -              echo "| **Version:**  | $VERSION  |"
 -              echo "| **Release:**  | $RELEASE  |"
 -              echo "| **Group:**  | $GROUP  |"
 -              echo "| **License:**  | $LICENSE  |"
 -              echo "| **Maintainer:**  | $MAINTAINER  |"
 +              echo "^  $PKG_NAME  ^^"
-               echo "| Version:  | $PKG_VER  |"
-               echo "| Release:  | $PKG_REL  |"
-               echo "| Group:  | $PKG_GROUP  |"
-               echo "| License:  | $PKG_LICENSE  |"
-               echo "| Maintainer:  | $PKG_MAINTAINER  |"
-               echo "| Dependencies: | $(for dep in $PKG_DEPS; do echo \"[[$dep]]\"; done) |"
++              echo "| **Version:**  | $PKG_VER  |"
++              echo "| **Release:**  | $PKG_REL  |"
++              echo "| **Group:**  | $PKG_GROUP  |"
++              echo "| **License:**  | $PKG_LICENSE  |"
++              echo "| **Maintainer:**  | $PKG_MAINTAINER  |"
+ 
+               # Dependencies
+               echo -n "| **Dependencies:** | "
+               for dep in $DEPS; do
+                       echo -n "[[$dep]] "
+               done; echo "|"
+ 
 -              echo "| $(echo $DESC) ||"
 -              echo "| **Website:**  | $URL  |"
 -              if [ "$DEBUG" = "yes" ]; then
 +              echo "| $(echo $PKG_DESC) ||"
-               echo "| Website:  | $PKG_URL  |"
++              echo "| **Website:**  | $PKG_URL  |"
 +              if [ "$PKG_DEBUG" = "yes" ]; then
                        echo "<color red>This is a debug-package.</color>"
                fi
 -              if [ "$EXTRA" = "yes" ]; then
 +              if [ "$PKG_EXTRA" = "yes" ]; then
                        echo "<color green>This is an extra package.</color>"
                fi
                echo