[SCM] idjc packaging branch, master, updated. debian/0.8.2-4-9-g9d0ec1a

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9d0ec1aa0547e03d007a9eaab509d43e125c93da
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 26 12:04:50 2010 +0200

    Refresh idjc-twolame.patch patch.

diff --git a/debian/patches/idjc-twolame.patch b/debian/patches/idjc-twolame.patch
index ab21e42..4aff451 100644
--- a/debian/patches/idjc-twolame.patch
+++ b/debian/patches/idjc-twolame.patch
@@ -6,9 +6,9 @@ Forwarded: no
 ---
  c/live_mp3_encoder.c |   31 +++++++++++++++++--------------
  c/live_mp3_encoder.h |    4 ++--
- configure            |   27 ++++++++++++++-------------
+ configure            |   24 ++++++++++++------------
  configure.in         |    4 ++--
- 4 files changed, 35 insertions(+), 31 deletions(-)
+ 4 files changed, 33 insertions(+), 30 deletions(-)
 
 --- idjc.orig/c/live_mp3_encoder.c
 +++ idjc/c/live_mp3_encoder.c
@@ -98,25 +98,25 @@ Forwarded: no
     int lame_quality;
 --- idjc.orig/configure
 +++ idjc/configure
-@@ -5511,13 +5511,13 @@ fi
+@@ -5376,13 +5376,13 @@ fi
  
  
  if test $makelame != "no" ; then
--{ $as_echo "$as_me:$LINENO: checking for lame_init in -lmp3lame -lm" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_init in -lmp3lame -lm" >&5
 -$as_echo_n "checking for lame_init in -lmp3lame -lm... " >&6; }
--if test "${ac_cv_lib_mp3lame__lm_lame_init+set}" = set; then
-+{ $as_echo "$as_me:$LINENO: checking for twolame_init in -ltwolame -lm" >&5
+-if test "${ac_cv_lib_mp3lame__lm_lame_init+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for twolame_init in -ltwolame -lm" >&5
 +$as_echo_n "checking for twolame_init in -ltwolame -lm... " >&6; }
-+if test "${ac_cv_lib_twolame__lm_twolame_init+set}" = set; then
++if test "${ac_cv_lib_twolame__lm_twolame_init+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lmp3lame -lm  $LIBS"
 +LIBS="-ltwolame -lm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5531,11 +5531,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -5392,28 +5392,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -130,32 +130,25 @@ Forwarded: no
    ;
    return 0;
  }
-@@ -5561,12 +5561,12 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_mp3lame__lm_lame_init=yes
 +  ac_cv_lib_twolame__lm_twolame_init=yes
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_mp3lame__lm_lame_init=no
-+	ac_cv_lib_twolame__lm_twolame_init=no
+-  ac_cv_lib_mp3lame__lm_lame_init=no
++  ac_cv_lib_twolame__lm_twolame_init=no
  fi
- 
- rm -rf conftest.dSYM
-@@ -5574,10 +5574,10 @@ rm -f core conftest.err conftest.$ac_obj
-       conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mp3lame__lm_lame_init" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp3lame__lm_lame_init" >&5
 -$as_echo "$ac_cv_lib_mp3lame__lm_lame_init" >&6; }
--if test "x$ac_cv_lib_mp3lame__lm_lame_init" = x""yes; then
+-if test "x$ac_cv_lib_mp3lame__lm_lame_init" = x""yes; then :
 -  LIBMP3LAME=-lmp3lame
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_twolame__lm_twolame_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_twolame__lm_twolame_init" >&5
 +$as_echo "$ac_cv_lib_twolame__lm_twolame_init" >&6; }
-+if test "x$ac_cv_lib_twolame__lm_twolame_init" = x""yes; then
++if test "x$ac_cv_lib_twolame__lm_twolame_init" = x""yes; then :
 +  LIBMP3LAME=-ltwolame
  
  else

-- 
idjc packaging