[kernel] r19132 - in dists/sid/linux/debian: . installer installer/amd64 installer/amd64/modules/amd64 installer/i386 installer/i386/modules/i386 installer/modules

[Ben Hutchings]

Author: benh
Date: Tue Jun 12 05:37:18 2012
New Revision: 19132

Log:
[ia64,powerpc] udeb: Add crc-itu-t to crc-modules (fixes FTBFS)

Fix firewire-core-modules to depend on crc-modules.
Remove the overrides for firewire-core-modules on amd64 and i386.

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/installer/amd64/modules/amd64/crc-modules
   dists/sid/linux/debian/installer/amd64/package-list
   dists/sid/linux/debian/installer/i386/modules/i386/crc-modules
   dists/sid/linux/debian/installer/i386/package-list
   dists/sid/linux/debian/installer/modules/crc-modules
   dists/sid/linux/debian/installer/package-list

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/changelog	Tue Jun 12 05:37:18 2012	(r19132)
@@ -1,3 +1,11 @@
+linux (3.2.20-2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [ia64,powerpc] udeb: Add crc-itu-t to crc-modules; make
+    firewire-core-modules depend on it (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 12 Jun 2012 06:21:34 +0100
+
 linux (3.2.20-1) unstable; urgency=low
 
   * The "Confused? You Won't Be" release

Modified: dists/sid/linux/debian/installer/amd64/modules/amd64/crc-modules
==============================================================================
--- dists/sid/linux/debian/installer/amd64/modules/amd64/crc-modules	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/installer/amd64/modules/amd64/crc-modules	Tue Jun 12 05:37:18 2012	(r19132)
@@ -1,2 +1 @@
 #include <crc-modules>
-crc-itu-t

Modified: dists/sid/linux/debian/installer/amd64/package-list
==============================================================================
--- dists/sid/linux/debian/installer/amd64/package-list	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/installer/amd64/package-list	Tue Jun 12 05:37:18 2012	(r19132)
@@ -28,8 +28,5 @@
 Package: pcmcia-modules
 Depends: kernel-image, core-modules
 
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
 Package: nbd-modules
 Depends: kernel-image

Modified: dists/sid/linux/debian/installer/i386/modules/i386/crc-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/crc-modules	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/installer/i386/modules/i386/crc-modules	Tue Jun 12 05:37:18 2012	(r19132)
@@ -1,2 +1 @@
 #include <crc-modules>
-crc-itu-t ?

Modified: dists/sid/linux/debian/installer/i386/package-list
==============================================================================
--- dists/sid/linux/debian/installer/i386/package-list	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/installer/i386/package-list	Tue Jun 12 05:37:18 2012	(r19132)
@@ -31,8 +31,5 @@
 Package: pcmcia-modules
 Depends: kernel-image, core-modules
 
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
 Package: nbd-modules
 Depends: kernel-image

Modified: dists/sid/linux/debian/installer/modules/crc-modules
==============================================================================
--- dists/sid/linux/debian/installer/modules/crc-modules	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/installer/modules/crc-modules	Tue Jun 12 05:37:18 2012	(r19132)
@@ -1,3 +1,4 @@
 crc-ccitt
 libcrc32c
 crc32c
+crc-itu-t

Modified: dists/sid/linux/debian/installer/package-list
==============================================================================
--- dists/sid/linux/debian/installer/package-list	Tue Jun 12 04:53:45 2012	(r19131)
+++ dists/sid/linux/debian/installer/package-list	Tue Jun 12 05:37:18 2012	(r19132)
@@ -84,7 +84,7 @@
  This package contains esoteric CDROM drivers for the kernel.
 
 Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules
+Depends: kernel-image, scsi-core-modules, crc-modules
 Priority: standard
 Description: Core FireWire drivers
  This package contains core FireWire drivers for the kernel.