[SCM] libtunepimp/master: Refresh patches.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sat Jan 1 16:17:32 UTC 2011
The following commit has been merged in the master branch:
commit 36db099568ee396b4b38df2425067c8858192dda
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat Jan 1 17:17:18 2011 +0100
Refresh patches.
diff --git a/debian/patches/000-Fix_FTBFS_with_gcc4.3.patch b/debian/patches/000-Fix_FTBFS_with_gcc4.3.patch
index 6e0e905..76bf2a5 100644
--- a/debian/patches/000-Fix_FTBFS_with_gcc4.3.patch
+++ b/debian/patches/000-Fix_FTBFS_with_gcc4.3.patch
@@ -1,8 +1,7 @@
Description: Add missing includes to get it built with gcc4.3.
Author: Martin Michlmayr <tbm at cyrius.com>, Matthias Klose <doko at ubuntu.com>
-diff -Nur libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3.new/include/tunepimp-0.5/metadata.h
---- libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2006-11-18 11:52:08.000000000 +0100
-+++ libtunepimp-0.5.3.new/include/tunepimp-0.5/metadata.h 2008-02-11 22:14:55.180744506 +0100
+--- a/include/tunepimp-0.5/metadata.h
++++ b/include/tunepimp-0.5/metadata.h
@@ -29,6 +29,7 @@
#include <string>
@@ -11,9 +10,8 @@ diff -Nur libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3.ne
#include "defs.h"
#include "tp_c.h"
-diff -Nur libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3.new/lib/c_wrapper.cpp
---- libtunepimp-0.5.3/lib/c_wrapper.cpp 2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/c_wrapper.cpp 2008-02-11 22:14:55.164744157 +0100
+--- a/lib/c_wrapper.cpp
++++ b/lib/c_wrapper.cpp
@@ -29,6 +29,8 @@
#include "tp_c.h"
#include "astrcmp.h"
@@ -23,9 +21,8 @@ diff -Nur libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3.new/lib/c_wrappe
#define DB printf("%s:%d\n", __FILE__, __LINE__);
#define TP_OBJ_CHECK(o) TunePimp *obj = (TunePimp *)o; \
-diff -Nur libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3.new/lib/fileio.cpp
---- libtunepimp-0.5.3/lib/fileio.cpp 2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/fileio.cpp 2008-02-11 22:14:55.136743546 +0100
+--- a/lib/fileio.cpp
++++ b/lib/fileio.cpp
@@ -28,6 +28,8 @@
#include <assert.h>
#include <errno.h>
@@ -35,9 +32,8 @@ diff -Nur libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3.new/lib/fileio.cpp
#ifndef WIN32
#include <unistd.h>
#endif
-diff -Nur libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3.new/lib/metadata.cpp
---- libtunepimp-0.5.3/lib/metadata.cpp 2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/metadata.cpp 2008-02-11 21:48:13.445880987 +0100
+--- a/lib/metadata.cpp
++++ b/lib/metadata.cpp
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <math.h>
@@ -46,9 +42,8 @@ diff -Nur libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3.new/lib/metadata.
#include "metadata.h"
#include "../config.h"
using namespace std;
-diff -Nur libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3.new/lib/protocol.cpp
---- libtunepimp-0.5.3/lib/protocol.cpp 2006-11-28 21:25:04.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/protocol.cpp 2008-02-11 22:14:55.144743721 +0100
+--- a/lib/protocol.cpp
++++ b/lib/protocol.cpp
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -57,9 +52,8 @@ diff -Nur libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3.new/lib/protocol.
#include <map>
#include <expat.h>
#include <curl/curl.h>
-diff -Nur libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3.new/lib/readmeta.cpp
---- libtunepimp-0.5.3/lib/readmeta.cpp 2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/readmeta.cpp 2008-02-11 22:14:55.148743808 +0100
+--- a/lib/readmeta.cpp
++++ b/lib/readmeta.cpp
@@ -41,6 +41,8 @@
#include "watchdog.h"
#include "utf8/utf8util.h"
@@ -69,9 +63,8 @@ diff -Nur libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3.new/lib/readmeta.
const int iDataFieldLen = 255;
#define DB printf("%s:%d\n", __FILE__, __LINE__);
-diff -Nur libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3.new/lib/tunepimp.cpp
---- libtunepimp-0.5.3/lib/tunepimp.cpp 2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/tunepimp.cpp 2008-02-11 22:14:55.172744332 +0100
+--- a/lib/tunepimp.cpp
++++ b/lib/tunepimp.cpp
@@ -31,6 +31,8 @@
#endif
@@ -81,9 +74,8 @@ diff -Nur libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3.new/lib/tunepimp.
#include <map>
using namespace std;
-diff -Nur libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3.new/lib/utf8/utf8util.cpp
---- libtunepimp-0.5.3/lib/utf8/utf8util.cpp 2006-11-18 11:52:26.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/utf8/utf8util.cpp 2008-02-11 21:45:23.209913046 +0100
+--- a/lib/utf8/utf8util.cpp
++++ b/lib/utf8/utf8util.cpp
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
@@ -92,9 +84,8 @@ diff -Nur libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3.new/lib/utf8
#include "utf8util.h"
#include "utf8.h"
#ifdef WIN32
-diff -Nur libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3.new/plugins/mp3/id3_2_3_meta.cpp
---- libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2006-11-18 11:51:07.000000000 +0100
-+++ libtunepimp-0.5.3.new/plugins/mp3/id3_2_3_meta.cpp 2008-02-11 21:52:30.447844534 +0100
+--- a/plugins/mp3/id3_2_3_meta.cpp
++++ b/plugins/mp3/id3_2_3_meta.cpp
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <assert.h>
@@ -103,9 +94,8 @@ diff -Nur libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3.new/p
#include <musicbrainz/mb_c.h>
#include "mp3.h"
#include "id3_2_3_meta.h"
-diff -Nur libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3.new/plugins/mp3/id3_meta.cpp
---- libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2006-11-18 11:51:07.000000000 +0100
-+++ libtunepimp-0.5.3.new/plugins/mp3/id3_meta.cpp 2008-02-11 21:50:13.528681721 +0100
+--- a/plugins/mp3/id3_meta.cpp
++++ b/plugins/mp3/id3_meta.cpp
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <time.h>
@@ -114,9 +104,8 @@ diff -Nur libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3.new/plugi
#include <musicbrainz/mb_c.h>
#include "mp3.h"
#include "id3_meta.h"
-diff -Nur libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3.new/plugins/wma/wma.cpp
---- libtunepimp-0.5.3/plugins/wma/wma.cpp 2006-11-18 11:51:28.000000000 +0100
-+++ libtunepimp-0.5.3.new/plugins/wma/wma.cpp 2008-02-11 22:14:55.196744856 +0100
+--- a/plugins/wma/wma.cpp
++++ b/plugins/wma/wma.cpp
@@ -34,6 +34,8 @@
#include "../../lib/utf8/utf8util.h"
#endif
@@ -126,9 +115,8 @@ diff -Nur libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3.new/plugins/wm
using namespace std;
#ifndef WIN32
-diff -Nur libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3.new/plugins/wma/wmafile.cpp
---- libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2006-11-18 11:51:28.000000000 +0100
-+++ libtunepimp-0.5.3.new/plugins/wma/wmafile.cpp 2008-02-11 22:14:55.188744681 +0100
+--- a/plugins/wma/wmafile.cpp
++++ b/plugins/wma/wmafile.cpp
@@ -24,6 +24,8 @@
#include <wmatag.h>
#include <wmaproperties.h>
diff --git a/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch b/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch
index f0e5ba3..daa5524 100644
--- a/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch
+++ b/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch
@@ -1,10 +1,8 @@
Description: Fix FTBFS invalid conversion from const char* to char*
Author: Jari Aalto <jari.aalto at cante.net>
-diff --git a/lib/fileio.cpp b/lib/fileio.cpp
-index a1602da..ac03a31 100644
--- a/lib/fileio.cpp
+++ b/lib/fileio.cpp
-@@ -122,7 +122,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
+@@ -124,7 +124,8 @@
void tmktempname(const char *path, char *newPath, int newPathLen)
{
diff --git a/debian/patches/020-gcc_4.4_add_include.patch b/debian/patches/020-gcc_4.4_add_include.patch
index cc88812..c27859b 100644
--- a/debian/patches/020-gcc_4.4_add_include.patch
+++ b/debian/patches/020-gcc_4.4_add_include.patch
@@ -1,7 +1,5 @@
Description: Gcc 4.4 add missing #include
Author: Jari Aalto <jari.aalto at cante.net>
-diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h
-index ea08cf5..842704c 100644
--- a/include/tunepimp-0.5/metadata.h
+++ b/include/tunepimp-0.5/metadata.h
@@ -27,6 +27,7 @@
@@ -12,8 +10,6 @@ index ea08cf5..842704c 100644
#include <string>
#include <cstdio>
#include <cstring>
-diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
-index 467362c..3e3f54e 100644
--- a/lib/c_wrapper.cpp
+++ b/lib/c_wrapper.cpp
@@ -24,6 +24,7 @@
@@ -24,8 +20,6 @@ index 467362c..3e3f54e 100644
#include "tunepimp.h"
#include "mutex.h"
#include "tp_c.h"
-diff --git a/lib/fileio.cpp b/lib/fileio.cpp
-index a17a611..8a2aec0 100644
--- a/lib/fileio.cpp
+++ b/lib/fileio.cpp
@@ -25,6 +25,8 @@
@@ -37,8 +31,6 @@ index a17a611..8a2aec0 100644
#include <assert.h>
#include <errno.h>
#include <string>
-diff --git a/lib/metadata.cpp b/lib/metadata.cpp
-index 3429f7d..1ee364c 100644
--- a/lib/metadata.cpp
+++ b/lib/metadata.cpp
@@ -24,6 +24,7 @@
@@ -49,8 +41,6 @@ index 3429f7d..1ee364c 100644
#include <math.h>
#include <stdio.h>
#include <cstdlib>
-diff --git a/lib/protocol.cpp b/lib/protocol.cpp
-index 85c5039..f5d7a5b 100644
--- a/lib/protocol.cpp
+++ b/lib/protocol.cpp
@@ -6,6 +6,7 @@
@@ -61,8 +51,6 @@ index 85c5039..f5d7a5b 100644
#include <stdio.h>
#include <stdlib.h>
#include <string>
-diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp
-index b03ccef..adc01b2 100644
--- a/lib/readmeta.cpp
+++ b/lib/readmeta.cpp
@@ -30,6 +30,7 @@
@@ -73,8 +61,6 @@ index b03ccef..adc01b2 100644
#include <stdio.h>
#ifndef WIN32
#include <unistd.h>
-diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp
-index 2224889..fe8cc89 100644
--- a/lib/tunepimp.cpp
+++ b/lib/tunepimp.cpp
@@ -30,6 +30,7 @@
@@ -85,8 +71,6 @@ index 2224889..fe8cc89 100644
#include <stdio.h>
#include <cstring>
#include <cstdlib>
-diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp
-index 0326bef..9e68ccc 100644
--- a/lib/utf8/utf8util.cpp
+++ b/lib/utf8/utf8util.cpp
@@ -25,6 +25,7 @@
@@ -97,8 +81,6 @@ index 0326bef..9e68ccc 100644
#include <stdio.h>
#include <cstdlib>
#include "utf8util.h"
-diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp
-index cc9fdc7..409b0ab 100644
--- a/plugins/mp3/id3_2_3_meta.cpp
+++ b/plugins/mp3/id3_2_3_meta.cpp
@@ -25,6 +25,7 @@
@@ -109,8 +91,6 @@ index cc9fdc7..409b0ab 100644
#include <stdio.h>
#include <assert.h>
#include <ctype.h>
-diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp
-index 5656f59..511600f 100644
--- a/plugins/mp3/id3_meta.cpp
+++ b/plugins/mp3/id3_meta.cpp
@@ -25,6 +25,7 @@
@@ -121,8 +101,6 @@ index 5656f59..511600f 100644
#include <stdio.h>
#include <time.h>
#include <ctype.h>
-diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp
-index 37de6ea..8da4ec5 100644
--- a/plugins/wma/wma.cpp
+++ b/plugins/wma/wma.cpp
@@ -25,6 +25,7 @@
@@ -133,8 +111,6 @@ index 37de6ea..8da4ec5 100644
#include <string.h>
#include <stdio.h>
#include <wmafile.h>
-diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp
-index 2e9fce4..5e82fd7 100644
--- a/plugins/wma/wmafile.cpp
+++ b/plugins/wma/wmafile.cpp
@@ -19,6 +19,8 @@
diff --git a/debian/patches/030-new-libmpcdec-API.patch b/debian/patches/030-new-libmpcdec-API.patch
index f550d54..e1719fe 100644
--- a/debian/patches/030-new-libmpcdec-API.patch
+++ b/debian/patches/030-new-libmpcdec-API.patch
@@ -2,9 +2,8 @@ Description: port libtunepimp to new libmpcdec API
Author: Yavor Doganov <yavor at gnu.org>
Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476378#39
Bug-Debian: http://bugs.debian.org/476378
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libtunepimp-0.5.3~/lib/plugins.cpp libtunepimp-0.5.3/lib/plugins.cpp
---- libtunepimp-0.5.3~/lib/plugins.cpp 2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3/lib/plugins.cpp 2010-02-20 14:08:42.998179599 +0100
+--- a/lib/plugins.cpp
++++ b/lib/plugins.cpp
@@ -103,12 +103,12 @@
strcat(init_func, "InitPlugin");
@@ -47,9 +46,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
(*i).handle = NULL;
}
}
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libtunepimp-0.5.3~/plugins/mpc/mpcdecode.cpp libtunepimp-0.5.3/plugins/mpc/mpcdecode.cpp
---- libtunepimp-0.5.3~/plugins/mpc/mpcdecode.cpp 2006-11-18 11:51:08.000000000 +0100
-+++ libtunepimp-0.5.3/plugins/mpc/mpcdecode.cpp 2010-02-20 14:08:42.998179599 +0100
+--- a/plugins/mpc/mpcdecode.cpp
++++ b/plugins/mpc/mpcdecode.cpp
@@ -29,8 +29,13 @@
#include <assert.h>
#include <time.h>
--
libtunepimp packaging
More information about the pkg-multimedia-commits
mailing list