From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Feb 2009 10:25:20 +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=45b414a01bf4393dc51f350a404dc89e254d4645;p=ipfire-3.x.git

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

45b414a01bf4393dc51f350a404dc89e254d4645
diff --cc lfs/glib2
index bc0241d3f,7c6679e5a..bf21f2e86
--- a/lfs/glib2
+++ b/lfs/glib2
@@@ -35,10 -35,10 +35,10 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
  
  MAINTAINER =
 -GROUP      = System/Libaries
 +GROUP      = System/Libraries
  EXTRA      = no
  DEBUG      = no
- DEPS       = pkg-config
+ DEPS       = pcre pkg-config
  
  URL        = http://www.gtk.org
  LICENSE    = LGPLv2+
diff --cc make.sh
index 808b8dc4a,4c2be7e06..164a66094
--- a/make.sh
+++ b/make.sh
@@@ -321,10 -321,7 +322,9 @@@ ipfire_build() 
  	ipfire_make cpio
  	ipfire_make cdrtools
  	ipfire_make python-parted
 +	ipfire_make python-pyblock
 +	ipfire_make libbdevid
  	ipfire_make memtest86+
- 	#ipfire_make pakfire
  	ipfire_make quagga
  	#ipfire_make mISDN
  	#ipfire_make wireless