Sat May 4 19:53:02 UTC 2013

Author: benh
Date: Sat May  4 19:53:01 2013
New Revision: 20017

Log:
udeb: Move modules and adjust dependencies to avoid duplicates (Closes: #706646)

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules
   dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules
   dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules
   dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules
   dists/sid/linux/debian/installer/armhf/package-list
   dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules
   dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules
   dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules
   dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules
   dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules
   dists/sid/linux/debian/installer/modules/crc-modules
   dists/sid/linux/debian/installer/package-list
   dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules
   dists/sid/linux/debian/installer/powerpc/package-list
   dists/sid/linux/debian/installer/powerpcspe/package-list
   dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules
   dists/sid/linux/debian/installer/ppc64/package-list
   dists/sid/linux/debian/installer/sparc/modules/sparc/nic-modules
   dists/sid/linux/debian/installer/sparc64/modules/sparc64/nic-modules

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

--- dists/sid/linux/debian/changelog	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/changelog	Sat May  4 19:53:01 2013	(r20017)
@@ -107,6 +107,12 @@
     - ftruncate() supports sb_{start,end}_write()
     - replace mnt_drop_write_file() by __mnt_drop_write()
     - support for vfs_truncate()
+  * udeb: Move modules and adjust dependencies to avoid duplicates
+    (Closes: #706646)
+    - Move crc16 to crc-modules; make ext4-modules and nic-usb-modules depend
+      on it
+    - Make xfs-modules depends on crc-modules
+    - Move pps_core and ptp to nic-common-modules or nic-modules as appropriate
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 May 2013 03:45:10 +0100
 

Modified: dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/amd64/modules/amd64/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,3 +1,5 @@
 8390
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armel/modules/armel-iop32x/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armel/modules/armel-kirkwood/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armel/modules/armel-orion5x/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1 +1,3 @@
 mii
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armel/modules/armel-versatile/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 #libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/armhf/package-list
==============================================================================
--- dists/sid/linux/debian/installer/armhf/package-list	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/armhf/package-list	Sat May  4 19:53:01 2013	(r20017)
@@ -26,7 +26,5 @@
 Depends: kernel-image, ata-modules
 Priority: extra
 
-Package: ext4-modules
-
 Package: nbd-modules
 Depends: kernel-image

Modified: dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/i386/modules/i386/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,3 +1,5 @@
 8390
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/ia64/modules/ia64/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,3 +1,5 @@
 8390
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/mips/modules/mips-sb1-bcm91250a/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1 +1,3 @@
 mii
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/mips/modules/mips/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-loongson-2f/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1 +1,3 @@
 mii
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-r5k-cobalt/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,2 +1,4 @@
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/mipsel/modules/mipsel-sb1-bcm91250a/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1 +1,3 @@
 mii
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/modules/crc-modules
==============================================================================
--- dists/sid/linux/debian/installer/modules/crc-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/modules/crc-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -2,3 +2,4 @@
 libcrc32c
 crc32c
 crc-itu-t
+crc16

Modified: dists/sid/linux/debian/installer/package-list
==============================================================================
--- dists/sid/linux/debian/installer/package-list	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/package-list	Sat May  4 19:53:01 2013	(r20017)
@@ -152,7 +152,7 @@
  This package contains the EXT3 filesystem module for the kernel.
 
 Package: ext4-modules
-Depends: kernel-image, core-modules
+Depends: kernel-image, core-modules, crc-modules
 Priority: standard
 Description: EXT4 filesystem support
  This package contains the EXT4 filesystem module for the kernel.
@@ -188,7 +188,7 @@
  This package contains the Reiser filesystem module for the kernel.
 
 Package: xfs-modules
-Depends: kernel-image
+Depends: kernel-image, crc-modules
 Priority: standard
 Description: XFS filesystem support
  This package contains the XFS filesystem module for the kernel.
@@ -314,7 +314,7 @@
  This package contains common PCMCIA drivers for the kernel.
 
 Package: nic-usb-modules
-Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules, core-modules
+Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules, core-modules, crc-modules
 Priority: standard
 Description: USB NIC drivers
  This package contains USB network adapter drivers for the kernel.

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc-powerpc64/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,3 +1,5 @@
 8390
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/powerpc/package-list
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/package-list	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/powerpc/package-list	Sat May  4 19:53:01 2013	(r20017)
@@ -9,9 +9,6 @@
 Package: ext3-modules
 Depends: kernel-image, core-modules
 
-Package: ext4-modules
-Depends: kernel-image, core-modules
-
 Package: pata-modules
 Depends: kernel-image, ata-modules, core-modules
 

Modified: dists/sid/linux/debian/installer/powerpcspe/package-list
==============================================================================
--- dists/sid/linux/debian/installer/powerpcspe/package-list	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/powerpcspe/package-list	Sat May  4 19:53:01 2013	(r20017)
@@ -9,9 +9,6 @@
 Package: ext3-modules
 Depends: kernel-image, core-modules
 
-Package: ext4-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/nic-shared-modules
==============================================================================
--- dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/ppc64/modules/ppc64/nic-shared-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -1,3 +1,5 @@
 8390
 mii
 libphy
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/ppc64/package-list
==============================================================================
--- dists/sid/linux/debian/installer/ppc64/package-list	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/ppc64/package-list	Sat May  4 19:53:01 2013	(r20017)
@@ -9,9 +9,6 @@
 Package: ext3-modules
 Depends: kernel-image, core-modules
 
-Package: ext4-modules
-Depends: kernel-image, core-modules
-
 Package: pata-modules
 Depends: kernel-image, ata-modules, core-modules
 

Modified: dists/sid/linux/debian/installer/sparc/modules/sparc/nic-modules
==============================================================================
--- dists/sid/linux/debian/installer/sparc/modules/sparc/nic-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/sparc/modules/sparc/nic-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -45,3 +45,6 @@
 
 # Support for virtual network devices under Sun Logical Domains.
 sunvnet ?
+
+pps_core
+ptp

Modified: dists/sid/linux/debian/installer/sparc64/modules/sparc64/nic-modules
==============================================================================
--- dists/sid/linux/debian/installer/sparc64/modules/sparc64/nic-modules	Sat May  4 18:41:46 2013	(r20016)
+++ dists/sid/linux/debian/installer/sparc64/modules/sparc64/nic-modules	Sat May  4 19:53:01 2013	(r20017)
@@ -45,3 +45,6 @@
 
 # Support for virtual network devices under Sun Logical Domains.
 sunvnet ?
+
+pps_core
+ptp

