Wed Nov 30 07:44:24 UTC 2005

Author: horms
Date: Wed Nov 30 07:44:13 2005
New Revision: 4931

Modified:
   dists/sid/linux-2.6/debian/arch/alpha/config
   dists/sid/linux-2.6/debian/arch/amd64/config
   dists/sid/linux-2.6/debian/arch/arm/config.footbridge
   dists/sid/linux-2.6/debian/arch/config
   dists/sid/linux-2.6/debian/arch/hppa/config
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/arch/powerpc/config
   dists/sid/linux-2.6/debian/arch/sparc/config.sparc64
   dists/sid/linux-2.6/debian/arch/sparc/config.sparc64-smp
   dists/sid/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
   dists/trunk/linux-2.6/debian/changelog
Log:

  * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
    as alsa snd-usb-audio still isn't quite there.
    I expect this to be re-disabled at some stage,
    possibly soon if it proves to be a source of bugs.
    (closes: #340388)


Modified: dists/sid/linux-2.6/debian/arch/alpha/config
==============================================================================

--- dists/sid/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/sid/linux-2.6/debian/arch/alpha/config	Wed Nov 30 07:44:13 2005
@@ -1461,7 +1461,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config	Wed Nov 30 07:44:13 2005
@@ -1392,7 +1392,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.footbridge	Wed Nov 30 07:44:13 2005
@@ -1134,7 +1134,6 @@
 #
 # USB Device Class drivers
 #
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m

Modified: dists/sid/linux-2.6/debian/arch/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/config	(original)
+++ dists/sid/linux-2.6/debian/arch/config	Wed Nov 30 07:44:13 2005
@@ -618,7 +618,6 @@
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_9P_FS=m
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 CONFIG_FUSION_SAS=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_INET_DCCP_DIAG=m
@@ -704,3 +703,5 @@
 CONFIG_UNIX=y
 CONFIG_PACKET_MMAP=y
 CONFIG_MKISS=m
+# CONFIG_USB_MIDI is not set
+CONFIG_OBSOLETE_OSS_USB_DRIVER=y

Modified: dists/sid/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/sid/linux-2.6/debian/arch/hppa/config	Wed Nov 30 07:44:13 2005
@@ -814,7 +814,6 @@
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config	Wed Nov 30 07:44:13 2005
@@ -1646,7 +1646,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	Wed Nov 30 07:44:13 2005
@@ -1133,7 +1133,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config	Wed Nov 30 07:44:13 2005
@@ -1022,7 +1022,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/sid/linux-2.6/debian/arch/sparc/config.sparc64	(original)
+++ dists/sid/linux-2.6/debian/arch/sparc/config.sparc64	Wed Nov 30 07:44:13 2005
@@ -330,7 +330,6 @@
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- dists/sid/linux-2.6/debian/arch/sparc/config.sparc64-smp	(original)
+++ dists/sid/linux-2.6/debian/arch/sparc/config.sparc64-smp	Wed Nov 30 07:44:13 2005
@@ -334,7 +334,6 @@
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Nov 30 07:44:13 2005
@@ -11,8 +11,13 @@
   [ Simon Horman ]
   * Add recommends libc6-i686 to 686 and k7 image packages
     (closes: #278729)
+  * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
+    as alsa snd-usb-audio still isn't quite there.
+    I expect this to be re-disabled at some stage, 
+    possibly soon if it proves to be a source of bugs.
+    (closes: #340388)
 
- -- Simon Horman <horms at verge.net.au>  Wed, 30 Nov 2005 16:12:01 +0900
+ -- Simon Horman <horms at verge.net.au>  Wed, 30 Nov 2005 16:40:49 +0900
 
 linux-2.6 (2.6.14-4) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Wed Nov 30 07:44:13 2005
@@ -1459,7 +1459,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Wed Nov 30 07:44:13 2005
@@ -1390,7 +1390,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Wed Nov 30 07:44:13 2005
@@ -1133,7 +1133,6 @@
 #
 # USB Device Class drivers
 #
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Wed Nov 30 07:44:13 2005
@@ -614,7 +614,6 @@
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_9P_FS=m
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 CONFIG_FUSION_SAS=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_INET_DCCP_DIAG=m
@@ -737,3 +736,5 @@
 CONFIG_UNIX=y
 CONFIG_PACKET_MMAP=y
 CONFIG_MKISS=m
+# CONFIG_USB_MIDI is not set
+CONFIG_OBSOLETE_OSS_USB_DRIVER=y

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Wed Nov 30 07:44:13 2005
@@ -814,7 +814,6 @@
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Wed Nov 30 07:44:13 2005
@@ -1644,7 +1644,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Wed Nov 30 07:44:13 2005
@@ -1131,7 +1131,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Wed Nov 30 07:44:13 2005
@@ -1022,7 +1022,6 @@
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	Wed Nov 30 07:44:13 2005
@@ -330,7 +330,6 @@
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	Wed Nov 30 07:44:13 2005
@@ -334,7 +334,6 @@
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Nov 30 07:44:13 2005
@@ -15,8 +15,13 @@
   [ Simon Horman ]
   * Add recommends libc6-i686 to 686 and k7 image packages
     (closes: #278729)
+  * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
+    as alsa snd-usb-audio still isn't quite there.
+    I expect this to be re-disabled at some stage,
+    possibly soon if it proves to be a source of bugs.
+    (closes: #340388)
 
- -- Simon Horman <horms at verge.net.au>  Wed, 30 Nov 2005 16:12:35 +0900
+ -- Simon Horman <horms at verge.net.au>  Wed, 30 Nov 2005 16:42:57 +0900
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

