[svn-commits] seanbright: branch 1.6.0 r121598 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Jun 10 13:36:29 2008
New Revision: 121598

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121598
Log:
Merged revisions 121597 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r121597 | seanbright | 2008-06-10 14:35:37 -0400 (Tue, 10 Jun 2008) | 14 lines

Merged revisions 121596 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r121596 | seanbright | 2008-06-10 14:34:45 -0400 (Tue, 10 Jun 2008) | 6 lines

Fixes a problem with some buggy versions of GNU awk (3.1.3) not liking carriage returns in scripts.

(closes issue #12749)
Reported by: alinux
Tested by: Laureano (on #asterisk-dev), juggie

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/get_ilbc_source.sh

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/get_ilbc_source.sh
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/get_ilbc_source.sh?view=diff&rev=121598&r1=121597&r2=121598
==============================================================================
--- branches/1.6.0/contrib/scripts/get_ilbc_source.sh (original)
+++ branches/1.6.0/contrib/scripts/get_ilbc_source.sh Tue Jun 10 13:36:29 2008
@@ -22,7 +22,7 @@
 
 wget -P codecs/ilbc http://www.ietf.org/rfc/rfc3951.txt
 
-wget -P codecs/ilbc http://www.ilbcfreeware.org/documentation/extract-cfile.awk
+wget -q -O - http://www.ilbcfreeware.org/documentation/extract-cfile.awk | sed -e 's/\r//g' > codecs/ilbc/extract-cfile.awk
 
 (cd codecs/ilbc && awk -f extract-cfile.awk rfc3951.txt)