[SCM] libmpc/master.experimental: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 35d6f467777a16e451ba37228741434caeaa45c9
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 19 13:15:28 2012 +0200

    Refresh

diff --git a/debian/patches/03_mpcchap.patch b/debian/patches/03_mpcchap.patch
index 6ed8bf5..ce4f075 100644
--- a/debian/patches/03_mpcchap.patch
+++ b/debian/patches/03_mpcchap.patch
@@ -1,8 +1,12 @@
-Index: libmpc-0.1~r459/configure.in
-===================================================================
---- libmpc-0.1~r459.orig/configure.in	2010-05-31 16:37:55.690454133 +0200
-+++ libmpc-0.1~r459/configure.in	2010-05-31 16:37:56.834454007 +0200
-@@ -28,6 +28,12 @@
+---
+ configure.in        |    6 ++++++
+ mpcchap/Makefile.am |    5 +++--
+ mpcchap/mpcchap.c   |    6 +++---
+ 3 files changed, 12 insertions(+), 5 deletions(-)
+
+--- libmpc.orig/configure.in
++++ libmpc/configure.in
+@@ -28,6 +28,12 @@ esac
  AC_SUBST([EXTRALIBS])
  
  AC_ARG_ENABLE([mpcchap], [AS_HELP_STRING([--enable-mpcchap], [enable building mpcchap])])
@@ -14,12 +18,10 @@ Index: libmpc-0.1~r459/configure.in
 +
  AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes])
  
- AM_CONDITIONAL([HAVE_VISIBILITY], true)
-Index: libmpc-0.1~r459/mpcchap/Makefile.am
-===================================================================
---- libmpc-0.1~r459.orig/mpcchap/Makefile.am	2010-05-31 16:37:54.118445192 +0200
-+++ libmpc-0.1~r459/mpcchap/Makefile.am	2010-05-31 16:37:56.834454007 +0200
-@@ -4,7 +4,8 @@
+ 
+--- libmpc.orig/mpcchap/Makefile.am
++++ libmpc/mpcchap/Makefile.am
+@@ -4,7 +4,8 @@ bin_PROGRAMS = mpcchap
  
  common_sources = ../common/tags.c ../common/crc32.c
  
@@ -29,16 +31,14 @@ Index: libmpc-0.1~r459/mpcchap/Makefile.am
  
  if HAVE_VISIBILITY
    AM_CFLAGS = -fvisibility=hidden
-@@ -16,4 +17,4 @@
+@@ -16,4 +17,4 @@ dictionary.h iniparser.h
  
  mpcchap_LDADD = $(top_builddir)/libmpcdec/libmpcdec.la \
  	$(top_builddir)/libmpcenc/libmpcenc.a \
 -	-lm -lcuefile
 +	-lm $(LIBCUE_LIBS)
-Index: libmpc-0.1~r459/mpcchap/mpcchap.c
-===================================================================
---- libmpc-0.1~r459.orig/mpcchap/mpcchap.c	2010-05-31 16:37:54.130447137 +0200
-+++ libmpc-0.1~r459/mpcchap/mpcchap.c	2010-05-31 16:39:22.318445340 +0200
+--- libmpc.orig/mpcchap/mpcchap.c
++++ libmpc/mpcchap/mpcchap.c
 @@ -24,7 +24,7 @@
  
  #include <sys/stat.h>
@@ -48,7 +48,7 @@ Index: libmpc-0.1~r459/mpcchap/mpcchap.c
  
  // tags.c
  void    Init_Tags        ( void );
-@@ -153,13 +153,13 @@
+@@ -153,13 +153,13 @@ mpc_status add_chaps_ini(char * mpc_file
  mpc_status add_chaps_cue(char * mpc_file, char * chap_file, mpc_demux * demux, mpc_streaminfo * si)
  {
  	Cd *cd = 0;

-- 
libmpc packaging