From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 May 2011 18:45:55 +0000 (+0200)
Subject: Merge branch 'master' into python
X-Git-Tag: v2.9-core50~4^2~19^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac073fba8c61fa675f7144523c26de3f55c01eac;p=ipfire-2.x.git

Merge branch 'master' into python

Conflicts:
	make.sh
---

ac073fba8c61fa675f7144523c26de3f55c01eac
diff --cc make.sh
index 671989b899,b89c77a4a9..eb1b89ad99
--- a/make.sh
+++ b/make.sh
@@@ -689,13 -689,7 +689,13 @@@ buildipfire() 
    ipfiremake swig
    ipfiremake python-m2crypto
    ipfiremake crda
+   ipfiremake libsatsolver
 +  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