[SCM] easytag/master: Remove id3lib patch, which was applied upstream

[amigadave-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6c7fa9e7df9264ba98360b66d0ebcce8d6a99c28
Author: David King <amigadave at amigadave.com>
Date:   Thu Mar 12 10:06:42 2015 +0000

    Remove id3lib patch, which was applied upstream

diff --git a/debian/patches/fix-id3lib-wrapper.patch b/debian/patches/fix-id3lib-wrapper.patch
deleted file mode 100644
index a719b07..0000000
--- a/debian/patches/fix-id3lib-wrapper.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fix compilation of id3lib wrapper
- Debian carries a patch against id3lib to add the API that EasyTAG also adds in
- its internal id3lib C wrapper.
-Author: David King <amigadave at amigadave.com>
-Origin: upstream
-Last-Update: 2015-02-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.ac
-+++ b/configure.ac
-@@ -277,7 +277,12 @@ AS_IF([test "x$have_mp3" = "xyes" -a "x$enable_id3v23" != "xno"],
- 
-        AC_SUBST([ID3LIB_LIBS], [$ac_cv_search_ID3Tag_Link])
-        AC_DEFINE([ENABLE_ID3LIB], [], [Define for ID3v2.3 support])
--       ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"],
-+       ID3LIB_VERSION="(id3lib-$ID3LIB_MAJOR.$ID3LIB_MINOR.$ID3LIB_PATCH)"
-+       AC_CHECK_DECLS([ID3Field_SetEncoding,
-+                       ID3Field_GetEncoding,
-+                       ID3Field_IsEncodable],
-+                       [], [],
-+                      [[#include <id3.h>]])],
-       [have_id3lib=no])
- 
- 
-diff --git a/src/tags/id3lib/id3_bugfix.h b/src/tags/id3lib/id3_bugfix.h
-index f21f9ed..5eb39cf 100644
---- a/src/tags/id3lib/id3_bugfix.h
-+++ b/src/tags/id3lib/id3_bugfix.h
-@@ -28,13 +28,19 @@
- 
- G_BEGIN_DECLS
- 
--  ID3_C_EXPORT bool                  CCONV ID3Field_SetEncoding    (ID3Field *field, ID3_TextEnc enc);
--  ID3_C_EXPORT ID3_TextEnc           CCONV ID3Field_GetEncoding    (const ID3Field *field);
--  ID3_C_EXPORT bool                  CCONV ID3Field_IsEncodable    (const ID3Field *field);
--  ID3_C_EXPORT ID3_FieldType         CCONV ID3Field_GetType        (const ID3Field *field);
--  //ID3_C_EXPORT ID3_FieldID           CCONV ID3Field_GetID          (const ID3Field *field);
--
--  ID3_C_EXPORT const Mp3_Headerinfo* CCONV ID3Tag_GetMp3HeaderInfo (ID3Tag *tag);
-+#if !HAVE_DECL_ID3FIELD_SETENCODING
-+ID3_C_EXPORT bool                  CCONV ID3Field_SetEncoding    (ID3Field *field, ID3_TextEnc enc);
-+#endif /* !HAVE_DECL_ID3FIELD_SETENCODING */
-+#if !HAVE_DECL_ID3FIELD_GETENCODING
-+ID3_C_EXPORT ID3_TextEnc           CCONV ID3Field_GetEncoding    (const ID3Field *field);
-+#endif /* !HAVE_DECL_ID3FIELD_GETENCODING */
-+#if !HAVE_DECL_ID3FIELD_ISENCODABLE
-+ID3_C_EXPORT bool                  CCONV ID3Field_IsEncodable    (const ID3Field *field);
-+#endif /* !HAVE_DECL_ID3FIELD_ISENCODABLE */
-+ID3_C_EXPORT ID3_FieldType         CCONV ID3Field_GetType        (const ID3Field *field);
-+//ID3_C_EXPORT ID3_FieldID           CCONV ID3Field_GetID          (const ID3Field *field);
-+
-+ID3_C_EXPORT const Mp3_Headerinfo* CCONV ID3Tag_GetMp3HeaderInfo (ID3Tag *tag);
-   
- G_END_DECLS
- 
--- 
-2.2.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 6727f42..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix-id3lib-wrapper.patch

-- 
easytag packaging