[SCM] easytag/master: Remove ID3 patch, applied upstream

amigadave-guest at users.alioth.debian.org amigadave-guest at users.alioth.debian.org
Mon Dec 1 08:46:16 UTC 2014


The following commit has been merged in the master branch:
commit 269d814f08b3be6d09e8f05d47fbc02605398976
Author: David King <amigadave at amigadave.com>
Date:   Mon Dec 1 08:08:51 2014 +0000

    Remove ID3 patch, applied upstream

diff --git a/debian/patches/0001-Set-the-GError-when-failing-to-read-ID3-tags.patch b/debian/patches/0001-Set-the-GError-when-failing-to-read-ID3-tags.patch
deleted file mode 100644
index 45e908d..0000000
--- a/debian/patches/0001-Set-the-GError-when-failing-to-read-ID3-tags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cef074fd5f2bd538817577d5ca93d6d4e3c3c20e Mon Sep 17 00:00:00 2001
-From: David King <amigadave at amigadave.com>
-Date: Sun, 2 Nov 2014 18:48:42 +0000
-Subject: [PATCH] Set the GError when failing to read ID3 tags
-
----
- src/tags/id3v24_tag.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
-index 76ab6f2..b18de6a 100644
---- a/src/tags/id3v24_tag.c
-+++ b/src/tags/id3v24_tag.c
-@@ -227,6 +227,8 @@ id3tag_read_file_tag (GFile *gfile,
-     if ((file = id3_file_open (filename, ID3_FILE_MODE_READONLY)) == NULL)
-     {
-         g_free (filename);
-+        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
-+                     _("Error reading tags from file"));
-         return FALSE;
-     }
- 
-@@ -236,6 +238,8 @@ id3tag_read_file_tag (GFile *gfile,
-     ||   (tag->nframes == 0))
-     {
-         id3_file_close(file);
-+        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
-+                     _("Error reading tags from file"));
-         return FALSE;
-     }
- 
--- 
-2.1.3
-
diff --git a/debian/patches/series b/debian/patches/series
index d9d0dbc..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Set-the-GError-when-failing-to-read-ID3-tags.patch

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list