From: Christian Schmidt Date: Fri, 23 Jul 2010 07:40:33 +0000 (+0200) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x X-Git-Tag: v2.9-beta1~150 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8e7778a8fca173fede71bde64c06eb48690d8a1f;hp=9254944067a862d84fc1762d2b919bb13801d8a5 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x --- diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 70e3b96f00..b88f4e3fac 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -68,8 +68,8 @@ * clamav-0.96.1 * cmake-2.4.8 * collectd-4.9.1 -* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire -* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire-xen +* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire +* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpio-2.6 diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 59bff2907f..44f0fe9a1e 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.34 +VER = 2.6.34.1 THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3 +$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6 install : $(TARGET)