[d-i-commits] r32129 - in trunk/packages/kernel/linux-kernel-di-i386-2.6: . debian modules/i386

[Joey Hess]

Author: joeyh
Date: 2005-11-15 22:12:34 +0000 (Tue, 15 Nov 2005)
New Revision: 32129

Modified:
   trunk/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
   trunk/packages/kernel/linux-kernel-di-i386-2.6/kernel-versions
   trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/fb-modules
   trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-extra-modules
   trunk/packages/kernel/linux-kernel-di-i386-2.6/package-list
Log:
* vesafb is no modular anymore.
* pcmcia-modules needs to depend on firmware-modules now.
* Rebuilt with 2.7.14-2.

Modified: trunk/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
===================================================================
--- trunk/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog	2005-11-15 22:09:39 UTC (rev 32128)
+++ trunk/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog	2005-11-15 22:12:34 UTC (rev 32129)
@@ -6,8 +6,11 @@
   * de600 and de620 are removed in 2.6.14, mark as optional.
   * Add cassini (really for x86 hardware?), cxgb, sis190, skge, uli526x to
     nic-extra-modules, added in 2.6.14.
+  * vesafb is no modular anymore.
+  * pcmcia-modules needs to depend on firmware-modules now.
+  * Rebuilt with 2.7.14-2.
 
- -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 15:11:04 -0500
+ -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 16:58:17 -0500
 
 linux-kernel-di-i386-2.6 (1.12) unstable; urgency=low
 

Modified: trunk/packages/kernel/linux-kernel-di-i386-2.6/kernel-versions
===================================================================
--- trunk/packages/kernel/linux-kernel-di-i386-2.6/kernel-versions	2005-11-15 22:09:39 UTC (rev 32128)
+++ trunk/packages/kernel/linux-kernel-di-i386-2.6/kernel-versions	2005-11-15 22:12:34 UTC (rev 32129)
@@ -1,2 +1,2 @@
 # arch   version  flavour       installedname        suffix build-depends
-i386     2.6.12-1 386           2.6.12-1-386         -      linux-image-2.6.12-1-386
+i386     2.6.14-1 386           2.6.14-1-386         -      linux-image-2.6.14-1-386

Modified: trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/fb-modules
===================================================================
--- trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/fb-modules	2005-11-15 22:09:39 UTC (rev 32128)
+++ trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/fb-modules	2005-11-15 22:12:34 UTC (rev 32129)
@@ -1,3 +1,3 @@
 fbcon
-vesafb
+vesafb ?
 vga16fb

Modified: trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-extra-modules
===================================================================
--- trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-extra-modules	2005-11-15 22:09:39 UTC (rev 32128)
+++ trunk/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/nic-extra-modules	2005-11-15 22:12:34 UTC (rev 32129)
@@ -5,7 +5,7 @@
 b44
 de2104x
 de600 ?
-de620
+de620 ?
 defxx
 e1000
 hp

Modified: trunk/packages/kernel/linux-kernel-di-i386-2.6/package-list
===================================================================
--- trunk/packages/kernel/linux-kernel-di-i386-2.6/package-list	2005-11-15 22:09:39 UTC (rev 32128)
+++ trunk/packages/kernel/linux-kernel-di-i386-2.6/package-list	2005-11-15 22:12:34 UTC (rev 32129)
@@ -23,3 +23,6 @@
 
 Package: ppp-modules
 Depends: serial-modules, kernel-image, crc-modules
+
+Package: pcmcia-modules
+Depends: kernel-image, isa-pnp-modules, firmware-modules