Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Sat, 14 Mar 2009 13:01:32 +0000 (14:01 +0100)
committerPeter Pfeiffer <peterman@ipfire.org>
Sat, 14 Mar 2009 13:01:32 +0000 (14:01 +0100)
config/rootfiles/common/kqemu
config/rootfiles/common/linux
config/rootfiles/core/27/files
config/rootfiles/core/28/files
doc/packages-list.txt

index b48376a968a885095f7652fe9ac2438779fa55d6..88244ee2581b43a1e0b59798f59b4d1bc0c38485 100644 (file)
@@ -1,2 +1,2 @@
-#lib/modules/2.6.25.19-ipfire/misc
-lib/modules/2.6.25.19-ipfire/misc/kqemu.ko
+#lib/modules/KVER-ipfire/misc
+lib/modules/KVER-ipfire/misc/kqemu.ko
index 0a7d0ca2102c53ae6796a4a4f7456ae3db7325ca..a5f1f729aef2579c280ee2f6f556c11c90e353ac 100644 (file)
@@ -1490,14 +1490,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/source
 sbin/gen_init_cpio
 #usr/include/linux/mISDNif.h
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/l1oip.ko
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_kb1ec.ko
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_mec2.ko
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_mg2ec.ko
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_octwareec.ko
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_oslec.ko
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/octvqe
-#lib/modules/2.6.25.19-ipfire/kernel/drivers/isdn/hardware/mISDN/octvqe/octvqe.ko
-#lib/modules/2.6.25.19-ipfire/modules.alias.bin
-#lib/modules/2.6.25.19-ipfire/modules.dep.bin
-#lib/modules/2.6.25.19-ipfire/modules.symbols.bin
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/l1oip.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_kb1ec.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_mec2.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_mg2ec.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_octwareec.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDN_dsp_oslec.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/octvqe
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/octvqe/octvqe.ko
+#lib/modules/KVER-ipfire/modules.alias.bin
+#lib/modules/KVER-ipfire/modules.dep.bin
+#lib/modules/KVER-ipfire/modules.symbols.bin
index 97aef8eff09422ceaa53f67acd5a6b99c57f7893..12dcde1d26e6ce5a109a5da892d4dc2befb5dbfb 100644 (file)
@@ -30,7 +30,7 @@ srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/cachemgr.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 var/ipfire/langs
-lib/modules/2.6.25.19-ipfire/kernel/drivers/net/imq.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko
 var/ipfire/qos/bin/makeqosscripts.pl
 etc/init.d/network
 bin/ntfs-3g
index 0013f33327279b0eb8320922e57fee06584cebc8..ef3f0ce0a8dced40b209e6b8cbbf70d64cb602d5 100644 (file)
@@ -17,7 +17,7 @@ usr/sbin/sshd
 usr/lib/libcurl.so
 usr/lib/libcurl.so.4
 usr/lib/libcurl.so.4.1.1
-lib/modules/KVER/misc/kqemu.ko
+lib/modules/KVER-ipfire/misc/kqemu.ko
 usr/local/bin/setaliases
 srv/web/ipfire/cgi-bin/aliases.cgi
 var/ipfire/menu.d/30-network.menu
index b5230f6dd3c6aa480a5d3366022c9acdca854c07..839fbf5d00f4aee7eebef530fe108c03441b8c47 100644 (file)
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.17
-* alsa-lib-1.0.17-kmod-2.6.25.19
+* alsa-lib-1.0.17-kmod-2.6.25.20
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.18
-* atl2-2.0.5-kmod-2.6.25.19
+* atl2-2.0.5-kmod-2.6.25.20
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
 * jpegsrc.v6b
 * kbd-1.12
 * klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.25.19
+* kqemu-1.4.0pre1-kmod-2.6.25.20
 * kudzu-1.2.64
 * l7-protocols-2008-04-23
 * lame-3.97
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.25.19
+* linux-2.6.25.20
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * lm_sensors-3.0.3
 * lzo-2.02
 * m4-1.4.4
 * mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
-* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.25.19
+* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.25.20
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
 * openmailadmin-1.0.0
 * openssh-5.2p1
 * openssl-0.9.8j
-* openswan-2.6.18
-* openswan-2.6.18-kmod-VER
+* openswan-2.6.20
+* openswan-2.6.20-kmod-VER
 * openvpn-2.0.9
 * p7zip_4.61
 * pam_mysql-0.7RC1
 * urlgrabber-3.1.0
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-e9a442d3b53a-kmod-2.6.25.19
+* v4l-dvb-e9a442d3b53a-kmod-2.6.25.20
 * vdr-1.6.0
 * vdradmin-am-3.6.4
 * vim-7.0