From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Mar 2009 15:49:02 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e81bbc0c12dc3a02f94a8b0c69c42149d9e5b506;p=ipfire-3.x.git

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

Conflicts:
	tools/make-packages
---

e81bbc0c12dc3a02f94a8b0c69c42149d9e5b506
diff --cc tools/make-packages
index 8af06d5a9,db5f5ff12..537d2b8d7
--- a/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