Sat May 4 20:12:47 UTC 2013

Author: benh
Date: Sat May  4 20:12:46 2013
New Revision: 20018

Log:
udeb: Merge redundant configuration for ext{2,3} dependency on mbcache

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/installer/amd64/modules/amd64/core-modules
   dists/sid/linux/debian/installer/amd64/package-list
   dists/sid/linux/debian/installer/armel/modules/armel-iop32x/core-modules
   dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/core-modules
   dists/sid/linux/debian/installer/armel/modules/armel-orion5x/core-modules
   dists/sid/linux/debian/installer/armel/modules/armel-versatile/core-modules
   dists/sid/linux/debian/installer/armel/package-list
   dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/core-modules
   dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/core-modules
   dists/sid/linux/debian/installer/armhf/package-list
   dists/sid/linux/debian/installer/i386/modules/i386/core-modules
   dists/sid/linux/debian/installer/i386/package-list
   dists/sid/linux/debian/installer/ia64/modules/ia64/core-modules
   dists/sid/linux/debian/installer/ia64/package-list
   dists/sid/linux/debian/installer/modules/core-modules
   dists/sid/linux/debian/installer/package-list
   dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules
   dists/sid/linux/debian/installer/powerpc/modules/powerpc/core-modules
   dists/sid/linux/debian/installer/powerpc/package-list
   dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules
   dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/core-modules
   dists/sid/linux/debian/installer/powerpcspe/package-list
   dists/sid/linux/debian/installer/ppc64/modules/ppc64/core-modules
   dists/sid/linux/debian/installer/ppc64/package-list
   dists/sid/linux/debian/installer/s390/modules/s390x/core-modules
   dists/sid/linux/debian/installer/s390/package-list
   dists/sid/linux/debian/installer/s390x/modules/s390x/core-modules
   dists/sid/linux/debian/installer/s390x/package-list
   dists/sid/linux/debian/installer/sh4/package-list
   dists/sid/linux/debian/installer/sparc/modules/sparc/core-modules
   dists/sid/linux/debian/installer/sparc/package-list
   dists/sid/linux/debian/installer/sparc64/modules/sparc64/core-modules
   dists/sid/linux/debian/installer/sparc64/package-list

Modified: dists/sid/linux/debian/changelog
==============================================================================

--- dists/sid/linux/debian/changelog	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/changelog	Sat May  4 20:12:46 2013	(r20018)
@@ -113,6 +113,7 @@
       on it
     - Make xfs-modules depends on crc-modules
     - Move pps_core and ptp to nic-common-modules or nic-modules as appropriate
+  * udeb: Merge redundant configuration for ext{2,3} dependency on mbcache
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 May 2013 03:45:10 +0100
 

Modified: dists/sid/linux/debian/installer/amd64/modules/amd64/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/amd64/modules/amd64/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/amd64/modules/amd64/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/amd64/package-list
==============================================================================
--- dists/sid/linux/debian/installer/amd64/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/amd64/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -4,12 +4,6 @@
 # It overwrites specifications from /usr/share/kernel-wedge/package-list.
 #
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: fat-modules
 Priority: standard
 

Modified: dists/sid/linux/debian/installer/armel/modules/armel-iop32x/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-iop32x/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armel/modules/armel-iop32x/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/armel/modules/armel-orion5x/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-orion5x/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armel/modules/armel-orion5x/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/armel/modules/armel-versatile/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-versatile/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armel/modules/armel-versatile/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/armel/package-list
==============================================================================
--- dists/sid/linux/debian/installer/armel/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armel/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -9,12 +9,6 @@
 Provides_orion5x: rtc-modules
 Provides_versatile: rtc-modules
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: beeper-modules
 Depends: event-modules
 Priority: extra

Modified: dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/armhf/package-list
==============================================================================
--- dists/sid/linux/debian/installer/armhf/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/armhf/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -7,12 +7,6 @@
 Provides_mx5: rtc-modules
 Provides_vexpress: rtc-modules
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 # Package: beeper-modules
 # Depends: event-modules
 # Priority: extra

Modified: dists/sid/linux/debian/installer/i386/modules/i386/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/i386/modules/i386/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/i386/package-list
==============================================================================
--- dists/sid/linux/debian/installer/i386/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/i386/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -7,12 +7,6 @@
 Package: kernel-image
 Provides: rtc-modules
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: fat-modules
 Priority: standard
 

Modified: dists/sid/linux/debian/installer/ia64/modules/ia64/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/ia64/modules/ia64/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/ia64/modules/ia64/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/ia64/package-list
==============================================================================
--- dists/sid/linux/debian/installer/ia64/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/ia64/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -24,12 +24,6 @@
 Description: SN modules
  This package contains SN modules for Altix systems
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: nbd-modules
 Depends: kernel-image
 

Modified: dists/sid/linux/debian/installer/modules/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/modules/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/modules/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1,3 @@
 bitrev ?
 led-class ?
+mbcache

Modified: dists/sid/linux/debian/installer/package-list
==============================================================================
--- dists/sid/linux/debian/installer/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -140,13 +140,13 @@
  This package contains the BTRFS filesystem module for the kernel.
 
 Package: ext2-modules
-Depends: kernel-image
+Depends: kernel-image, core-modules
 Priority: standard
 Description: EXT2 filesystem support
  This package contains the EXT2 filesystem module for the kernel.
 
 Package: ext3-modules
-Depends: kernel-image
+Depends: kernel-image, core-modules
 Priority: standard
 Description: EXT3 filesystem support
  This package contains the EXT3 filesystem module for the kernel.

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc-miboot/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,3 +1,2 @@
 #include <core-modules>
-mbcache
 bestcomm-core ?

Modified: dists/sid/linux/debian/installer/powerpc/package-list
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/powerpc/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -3,11 +3,6 @@
 # architecture, which is derived from the files in the modules directory.
 # It overwrites specifications from /usr/share/kernel-wedge/package-list.
 #
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
 
 Package: pata-modules
 Depends: kernel-image, ata-modules, core-modules

Modified: dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1 @@
 #include <core-modules>
-mbcache

Modified: dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/powerpcspe/modules/powerpcspe/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,3 +1,2 @@
 #include <core-modules>
-mbcache
 bestcomm-core ?

Modified: dists/sid/linux/debian/installer/powerpcspe/package-list
==============================================================================
--- dists/sid/linux/debian/installer/powerpcspe/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/powerpcspe/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -3,11 +3,6 @@
 # architecture, which is derived from the files in the modules directory.
 # It overwrites specifications from /usr/share/kernel-wedge/package-list.
 #
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
 
 Package: pata-modules
 Depends: kernel-image, ata-modules, core-modules

Modified: dists/sid/linux/debian/installer/ppc64/modules/ppc64/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/ppc64/modules/ppc64/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/ppc64/modules/ppc64/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,3 +1,2 @@
 #include <core-modules>
-mbcache
 bestcomm-core ?

Modified: dists/sid/linux/debian/installer/ppc64/package-list
==============================================================================
--- dists/sid/linux/debian/installer/ppc64/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/ppc64/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -3,11 +3,6 @@
 # architecture, which is derived from the files in the modules directory.
 # It overwrites specifications from /usr/share/kernel-wedge/package-list.
 #
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
 
 Package: pata-modules
 Depends: kernel-image, ata-modules, core-modules

Modified: dists/sid/linux/debian/installer/s390/modules/s390x/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/s390/modules/s390x/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/s390/modules/s390x/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1,2 @@
+#include <core-modules>
 vmcp ?
-mbcache

Modified: dists/sid/linux/debian/installer/s390/package-list
==============================================================================
--- dists/sid/linux/debian/installer/s390/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/s390/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -19,11 +19,5 @@
  not loaded by default as the installer does not actually support this.
  It can however be useful to have available in rescue situations.
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: nbd-modules
 Depends: kernel-image

Modified: dists/sid/linux/debian/installer/s390x/modules/s390x/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/s390x/modules/s390x/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/s390x/modules/s390x/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1,2 +1,2 @@
+#include <core-modules>
 vmcp ?
-mbcache

Modified: dists/sid/linux/debian/installer/s390x/package-list
==============================================================================
--- dists/sid/linux/debian/installer/s390x/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/s390x/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -19,11 +19,5 @@
  not loaded by default as the installer does not actually support this.
  It can however be useful to have available in rescue situations.
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: nbd-modules
 Depends: kernel-image

Modified: dists/sid/linux/debian/installer/sh4/package-list
==============================================================================
--- dists/sid/linux/debian/installer/sh4/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/sh4/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -6,9 +6,6 @@
 Package: kernel-image
 Provides: event-modules, ext3-modules, fb-modules, input-modules, mouse-modules, nic-shared-modules, rtc-modules, uinput-modules, usb-modules
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
 Package: nic-modules
 Depends: kernel-image, core-modules, firewire-core-modules
 

Modified: dists/sid/linux/debian/installer/sparc/modules/sparc/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/sparc/modules/sparc/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/sparc/modules/sparc/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1 +1 @@
-mbcache
+#include <core-modules>

Modified: dists/sid/linux/debian/installer/sparc/package-list
==============================================================================
--- dists/sid/linux/debian/installer/sparc/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/sparc/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -5,12 +5,6 @@
 #
 Package: kernel-image
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: nic-modules
 Priority: standard
 Description: Network card modules for Sparc kernels

Modified: dists/sid/linux/debian/installer/sparc64/modules/sparc64/core-modules
==============================================================================
--- dists/sid/linux/debian/installer/sparc64/modules/sparc64/core-modules	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/sparc64/modules/sparc64/core-modules	Sat May  4 20:12:46 2013	(r20018)
@@ -1 +1 @@
-mbcache
+#include <core-modules>

Modified: dists/sid/linux/debian/installer/sparc64/package-list
==============================================================================
--- dists/sid/linux/debian/installer/sparc64/package-list	Sat May  4 19:53:01 2013	(r20017)
+++ dists/sid/linux/debian/installer/sparc64/package-list	Sat May  4 20:12:46 2013	(r20018)
@@ -5,12 +5,6 @@
 #
 Package: kernel-image
 
-Package: ext2-modules
-Depends: kernel-image, core-modules
-
-Package: ext3-modules
-Depends: kernel-image, core-modules
-
 Package: nic-modules
 Priority: standard
 Description: Network card modules for Sparc kernels

