[SCM] ices2/master: Add patch 1002 to fix bogus mentions of OSS in comment lines of ALSA config. Closes: bug#514489. Thanks to Kingsley G. Morse Jr.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5e5c0db3227ed825e63d36a631140b1f79be5229
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 1 21:10:02 2011 +0100

    Add patch 1002 to fix bogus mentions of OSS in comment lines of ALSA config. Closes: bug#514489. Thanks to Kingsley G. Morse Jr.

diff --git a/debian/patches/1002_fix_OSS-ALSA_confusion_in_comments.patch b/debian/patches/1002_fix_OSS-ALSA_confusion_in_comments.patch
new file mode 100644
index 0000000..580a113
--- /dev/null
+++ b/debian/patches/1002_fix_OSS-ALSA_confusion_in_comments.patch
@@ -0,0 +1,24 @@
+Description: Fix bogus mentions of OSS in comment lines of ALSA config
+Author: Jonas Smedegaard <dr at jones.dk>
+--- a/conf/ices-alsa.xml
++++ b/conf/ices-alsa.xml
+@@ -27,8 +27,8 @@
+ 
+         <!--    Input module.
+ 
+-            This example uses the 'oss' module. It takes input from the
+-            OSS audio device (e.g. line-in), and processes it for live
++            This example uses the 'alsa' module. It takes input from the
++            ALSA audio device (e.g. line-in), and processes it for live
+             encoding.  -->
+         <input>
+             <module>alsa</module>
+@@ -70,7 +70,7 @@
+             <!--    Live encoding/reencoding:
+ 
+                 channels and samplerate currently MUST match the channels
+-                and samplerate given in the parameters to the oss input
++                and samplerate given in the parameters to the alsa input
+                 module above or the remsaple/downmix section below.  -->
+ 
+             <encode>  
diff --git a/debian/patches/series b/debian/patches/series
index 9898905..5c16dfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_sync_20090819.patch
 1001_allow_repeat.patch
+1002_fix_OSS-ALSA_confusion_in_comments.patch

-- 
ices2 packaging