[kernel] r20240 - in dists/trunk/linux/debian: . installer/amd64 installer/i386 installer/ia64 installer/modules installer/sh4

[Ben Hutchings]

Author: benh
Date: Tue Jun 11 02:36:53 2013
New Revision: 20240

Log:
Remove obsolete eth1394 and firewire-core-modules dependency from nic-modules

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/installer/amd64/package-list
   dists/trunk/linux/debian/installer/i386/package-list
   dists/trunk/linux/debian/installer/ia64/package-list
   dists/trunk/linux/debian/installer/modules/nic-modules
   dists/trunk/linux/debian/installer/sh4/package-list

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Jun 11 02:31:52 2013	(r20239)
+++ dists/trunk/linux/debian/changelog	Tue Jun 11 02:36:53 2013	(r20240)
@@ -10,6 +10,8 @@
     - [s390] Use symlinks to follow s390x configuration
     - [sparc64] Use symlinks to follow sparc configuration
     - Only list the 'new' firewire modules in firewire-core-modules
+    - Remove obsolete eth1394 and firewire-core-modules dependency from
+      nic-modules
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 03 Jun 2013 13:21:56 +0100
 

Modified: dists/trunk/linux/debian/installer/amd64/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/amd64/package-list	Tue Jun 11 02:31:52 2013	(r20239)
+++ dists/trunk/linux/debian/installer/amd64/package-list	Tue Jun 11 02:36:53 2013	(r20240)
@@ -7,8 +7,5 @@
 Package: fat-modules
 Priority: standard
 
-Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
-
 Package: scsi-modules
 Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules

Modified: dists/trunk/linux/debian/installer/i386/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/i386/package-list	Tue Jun 11 02:31:52 2013	(r20239)
+++ dists/trunk/linux/debian/installer/i386/package-list	Tue Jun 11 02:36:53 2013	(r20240)
@@ -10,8 +10,5 @@
 Package: fat-modules
 Priority: standard
 
-Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
-
 Package: fb-modules
 Depends: kernel-image, i2c-modules

Modified: dists/trunk/linux/debian/installer/ia64/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/ia64/package-list	Tue Jun 11 02:31:52 2013	(r20239)
+++ dists/trunk/linux/debian/installer/ia64/package-list	Tue Jun 11 02:36:53 2013	(r20240)
@@ -10,7 +10,7 @@
 Depends: kernel-image, ide-core-modules, sn-modules
 
 Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules
+Depends: kernel-image, nic-shared-modules, core-modules, crc-modules
 
 Package: serial-modules
 Depends: kernel-image, pcmcia-modules, sn-modules

Modified: dists/trunk/linux/debian/installer/modules/nic-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-modules	Tue Jun 11 02:31:52 2013	(r20239)
+++ dists/trunk/linux/debian/installer/modules/nic-modules	Tue Jun 11 02:36:53 2013	(r20240)
@@ -7,7 +7,6 @@
 tg3 ?
 tulip
 winbond-840
-eth1394 ?
 xen-netfront ?
 
 # PHY driver, may be needed by tg3

Modified: dists/trunk/linux/debian/installer/sh4/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/sh4/package-list	Tue Jun 11 02:31:52 2013	(r20239)
+++ dists/trunk/linux/debian/installer/sh4/package-list	Tue Jun 11 02:36:53 2013	(r20240)
@@ -5,6 +5,3 @@
 #
 Package: kernel-image
 Provides: event-modules, ext3-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules
-
-Package: nic-modules
-Depends: kernel-image, core-modules, firewire-core-modules