[kernel] r20235 - in dists/trunk/linux/debian: . installer installer/amd64 installer/armel installer/armhf installer/hppa installer/i386 installer/ia64 installer/m68k installer/mips installer/mipsel installer/powerpc installer/s390 installer/s390x installer/sh4 installer/sparc installer/sparc64
Ben Hutchings
benh at alioth.debian.org
Tue Jun 11 02:19:46 UTC 2013
Author: benh
Date: Tue Jun 11 02:19:45 2013
New Revision: 20235
Log:
udeb: Remove redundant control file overrides
Modified:
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/installer/amd64/package-list
dists/trunk/linux/debian/installer/armel/package-list
dists/trunk/linux/debian/installer/armhf/package-list
dists/trunk/linux/debian/installer/hppa/package-list
dists/trunk/linux/debian/installer/i386/package-list
dists/trunk/linux/debian/installer/ia64/package-list
dists/trunk/linux/debian/installer/m68k/package-list
dists/trunk/linux/debian/installer/mips/package-list
dists/trunk/linux/debian/installer/mipsel/package-list
dists/trunk/linux/debian/installer/package-list
dists/trunk/linux/debian/installer/powerpc/package-list
dists/trunk/linux/debian/installer/s390/package-list
dists/trunk/linux/debian/installer/s390x/package-list
dists/trunk/linux/debian/installer/sh4/package-list
dists/trunk/linux/debian/installer/sparc/package-list
dists/trunk/linux/debian/installer/sparc64/package-list
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/changelog Tue Jun 11 02:19:45 2013 (r20235)
@@ -5,6 +5,7 @@
[ Ben Hutchings ]
* [x86] Enable HYPERVISOR_GUEST
* udeb: Move i2c-algo-bit to i2c-modules
+ * udeb: Remove redundant control file overrides
-- 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:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/amd64/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -12,9 +12,3 @@
Package: scsi-modules
Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
-
-Package: pcmcia-modules
-Depends: kernel-image, core-modules
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/armel/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/armel/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/armel/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -17,10 +17,3 @@
Package: fb-modules
Depends: kernel-image, usb-modules, nls-core-modules
-
-Package: pata-modules
-Depends: kernel-image, ata-modules
-Priority: standard
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/armhf/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/armhf/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/armhf/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -7,18 +7,5 @@
Provides_mx5: rtc-modules
Provides_vexpress: rtc-modules
-# Package: beeper-modules
-# Depends: event-modules
-# Priority: extra
-# Description: Beeper support
-# This package contains beeper drivers for the kernel.
-
-# Package: fb-modules
-# Depends: usb-modules, nls-core-modules
-
Package: pata-modules
-Depends: kernel-image, ata-modules
Priority: extra
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/hppa/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/hppa/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/hppa/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -14,6 +14,3 @@
Package: pata-modules
Depends: kernel-image, scsi-core-modules
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/i386/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/i386/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/i386/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -13,14 +13,5 @@
Package: nic-modules
Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
-Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
-
-Package: pcmcia-modules
-Depends: kernel-image, core-modules
-
-Package: nbd-modules
-Depends: kernel-image
-
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:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/ia64/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -12,9 +12,6 @@
Package: nic-modules
Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules
-Package: pcmcia-modules
-Depends: kernel-image, core-modules
-
Package: serial-modules
Depends: kernel-image, pcmcia-modules, sn-modules
@@ -24,8 +21,5 @@
Description: SN modules
This package contains SN modules for Altix systems
-Package: nbd-modules
-Depends: kernel-image
-
Package: kernel-image
Provides: efi-modules
Modified: dists/trunk/linux/debian/installer/m68k/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/m68k/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/m68k/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -6,7 +6,3 @@
Package: kernel-image
Provides: loop-modules, ext2-modules, ext3-modules
#Provides_mac: loop-modules, ext2-modules, ext3-modules, hfs-modules
-
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/mips/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/mips/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/mips/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -7,6 +7,3 @@
Provides: ext2-modules, ext3-modules, ext4-modules, rtc-modules
Provides_4kc-malta: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
Provides_sb1-bcm91250a: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/mipsel/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/mipsel/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/mipsel/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -8,6 +8,3 @@
Provides_r5k-cobalt: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
Provides_4kc-malta: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
Provides_loongson-2f: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -308,7 +308,7 @@
This package contains common PCMCIA NIC drivers for the kernel.
Package: pcmcia-modules
-Depends: kernel-image
+Depends: kernel-image, core-modules
Priority: standard
Description: Common PCMCIA drivers
This package contains common PCMCIA drivers for the kernel.
Modified: dists/trunk/linux/debian/installer/powerpc/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/powerpc/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/powerpc/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -7,12 +7,6 @@
Package: pata-modules
Depends: kernel-image, ata-modules, core-modules
-Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
-
-Package: pcmcia-modules
-Depends: kernel-image, core-modules
-
Package: nic-pcmcia-modules
Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, core-modules
@@ -29,6 +23,3 @@
Description: Apple powermac fancontrol modules
Contains drivers for macintosh i2c bus as well as for the monitoring devices
connected to it. This allows to control the fans during installation.
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/s390/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/s390/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/s390/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -3,7 +3,6 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
Package: dasd-modules
Depends: kernel-image
@@ -18,6 +17,3 @@
This package contains the module for dasd DIAG support. The udeb is
not loaded by default as the installer does not actually support this.
It can however be useful to have available in rescue situations.
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/s390x/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/s390x/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/s390x/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -3,7 +3,6 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
Package: dasd-modules
Depends: kernel-image
@@ -18,6 +17,3 @@
This package contains the module for dasd DIAG support. The udeb is
not loaded by default as the installer does not actually support this.
It can however be useful to have available in rescue situations.
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/sh4/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/sh4/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/sh4/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -8,9 +8,3 @@
Package: nic-modules
Depends: kernel-image, core-modules, firewire-core-modules
-
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/sparc/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/sparc/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/sparc/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -3,7 +3,6 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
Package: nic-modules
Priority: standard
@@ -14,6 +13,3 @@
.
Do not install this package on a real Debian system! You probably
want a kernel-image package instead.
-
-Package: nbd-modules
-Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/sparc64/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/sparc64/package-list Tue Jun 11 02:07:24 2013 (r20234)
+++ dists/trunk/linux/debian/installer/sparc64/package-list Tue Jun 11 02:19:45 2013 (r20235)
@@ -3,7 +3,6 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
Package: nic-modules
Priority: standard
@@ -14,6 +13,3 @@
.
Do not install this package on a real Debian system! You probably
want a kernel-image package instead.
-
-Package: nbd-modules
-Depends: kernel-image
More information about the Kernel-svn-changes
mailing list