[SCM] idjc/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a09979051adc8b384d72a2c9c88192926725a796
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 19 16:39:19 2010 +0200

    Refresh patches.

diff --git a/debian/patches/idjc-twolame.patch b/debian/patches/idjc-twolame.patch
index 4aff451..9542844 100644
--- a/debian/patches/idjc-twolame.patch
+++ b/debian/patches/idjc-twolame.patch
@@ -7,8 +7,8 @@ Forwarded: no
  c/live_mp3_encoder.c |   31 +++++++++++++++++--------------
  c/live_mp3_encoder.h |    4 ++--
  configure            |   24 ++++++++++++------------
- configure.in         |    4 ++--
- 4 files changed, 33 insertions(+), 30 deletions(-)
+ configure.ac         |    6 +++---
+ 4 files changed, 34 insertions(+), 31 deletions(-)
 
 --- idjc.orig/c/live_mp3_encoder.c
 +++ idjc/c/live_mp3_encoder.c
@@ -98,7 +98,7 @@ Forwarded: no
     int lame_quality;
 --- idjc.orig/configure
 +++ idjc/configure
-@@ -5376,13 +5376,13 @@ fi
+@@ -5526,13 +5526,13 @@ fi
  
  
  if test $makelame != "no" ; then
@@ -116,7 +116,7 @@ Forwarded: no
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -5392,28 +5392,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -5542,28 +5542,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -153,9 +153,9 @@ Forwarded: no
  
  else
  
---- idjc.orig/configure.in
-+++ idjc/configure.in
-@@ -146,8 +146,8 @@ AC_ARG_ENABLE(lame,
+--- idjc.orig/configure.ac
++++ idjc/configure.ac
+@@ -146,12 +146,12 @@ AC_ARG_ENABLE(lame,
     AC_HELP_STRING([--disable-lame],[remove capability to stream/record mp3 format]),[makelame=$enableval],[makelame="maybe"])
  
  if test $makelame != "no" ; then
@@ -166,3 +166,8 @@ Forwarded: no
            AC_DEFINE(DYN_LAME, 1, [LAME to be linked dynamically])
            DYNAMIC="1"
            if test $makelame = "yes" ; then
+-             AC_MSG_ERROR([libmp3lame not detected but specifically requested in configure options])
++             AC_MSG_ERROR([libtwolame not detected but specifically requested in configure options])
+           fi)
+ else
+    AC_DEFINE(DYN_LAME, 1, [LAME to be linked dynamically])
diff --git a/debian/patches/idjc_script.patch b/debian/patches/idjc_script.patch
index a6174c7..b7543d6 100644
--- a/debian/patches/idjc_script.patch
+++ b/debian/patches/idjc_script.patch
@@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/572271
 
 --- idjc.orig/idjc_
 +++ idjc/idjc_
-@@ -84,7 +84,7 @@ python=
+@@ -88,7 +88,7 @@ python=
  export python
  which $python > /dev/null
  if [ $? == "0" ] ; then
diff --git a/debian/patches/series b/debian/patches/series
index ea92ff8..afb8c3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 desktop_file.patch
 idjc_script.patch
 server_window_size.patch
-fix-bashism-in-configure.patch
+# fix-bashism-in-configure.patch
 idjc-twolame.patch
diff --git a/debian/patches/server_window_size.patch b/debian/patches/server_window_size.patch
index b8af856..58d5ffd 100644
--- a/debian/patches/server_window_size.patch
+++ b/debian/patches/server_window_size.patch
@@ -4,7 +4,7 @@
 
 --- idjc.orig/idjcpython/sourceclientgui.py
 +++ idjc/idjcpython/sourceclientgui.py
-@@ -745,7 +745,7 @@ class MetadataBar(gtk.HBox):
+@@ -858,7 +858,7 @@ class MetadataBar(gtk.HBox):
     def __init__(self, parent, qty, default_text=""):
        self.source_client_gui = parent
        gtk.HBox.__init__(self)

-- 
idjc packaging