Bug#677246: patch for goobox / musicbrainz5
Version: 3.1.1-1 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#677246: patch for goobox / musicbrainz5
Hello Jon, On Sun, Jun 24, 2012 at 03:49:07PM +0100, Jon Dowland wrote: > On Tue, Jun 19, 2012 at 07:48:27PM +0200, Helge Kreutzmann wrote: > > It's a tad bit unfortunate that this is discovered only such recently > > before the release. Are there any bug reports showing the problems? > > There (was) a fairly old bug about the issue on sound-juicer which has just > been > closed. Essentially, what has happened is that libmb3 uses the 'version 1' > web Thanks for the explanation. > > If you are willing to subscribe to the package until release and fix > > any issues popping up due to the NMU, I'm fine with it. I just don't > > have any time atm to monitor this change this late in the cycle. > > I'm more than happy to do that. One good thing about this is I discovered > goobox which looks pretty cool :) I'll prepare and upload the NMU on Tuesday. > I > will plan to use a DELAYED queue but not one that misses the wheezy deadline. Please direct your upload directly to unstable, no need to used the deleayed queue (and this gives an earlier exposure to users which is IMHO only a good thing). Thanks for taking care and sorry that I cannot be of better help atm. Greetings Helge -- Dr. Helge Kreutzmann deb...@helgefjell.de Dipl.-Phys. http://www.helgefjell.de/debian.php 64bit GNU powered gpg signed mail preferred Help keep free software "libre": http://www.ffii.de/ signature.asc Description: Digital signature
Bug#677246: patch for goobox / musicbrainz5
Hi Helge, On Tue, Jun 19, 2012 at 07:48:27PM +0200, Helge Kreutzmann wrote: > It's a tad bit unfortunate that this is discovered only such recently > before the release. Are there any bug reports showing the problems? There (was) a fairly old bug about the issue on sound-juicer which has just been closed. Essentially, what has happened is that libmb3 uses the 'version 1' web services API. At some point upstream made a big schema change to 'next generation schema' or NGS - they then adapted their version 1 API to work on top of NGS as best as possible, but with difficulty since it was fairly tightly coupled to the old schema. As a consequence, some things (such as multi-disc releases) are not handled properly. The NGS change was brought in May 2011, so the problem has been around since then. It's fixed by using libmb4, which uses version 2 of the API, which is coupled to the NGS. The timing is basically my fault, here. A few weeks ago I finally got sick enough of this bug in sound-juicer to try and chase it down for good. In doing so, I made a list of libmb3 users, and that's how I discovered goobox - I hadn't heard of it before then. The MB4 library came out in January so anyone who noticed could have scratched the itch at any time in the last 6 months. > If you are willing to subscribe to the package until release and fix > any issues popping up due to the NMU, I'm fine with it. I just don't > have any time atm to monitor this change this late in the cycle. I'm more than happy to do that. One good thing about this is I discovered goobox which looks pretty cool :) I'll prepare and upload the NMU on Tuesday. I will plan to use a DELAYED queue but not one that misses the wheezy deadline. Thanks -- Jon Dowland -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#677246: patch for goobox / musicbrainz5
Hello Jon, On Mon, Jun 18, 2012 at 10:16:12PM +0100, Jon Dowland wrote: > On Mon, Jun 18, 2012 at 09:49:21PM +0200, Helge Kreutzmann wrote: > > thanks for your work. Just to inform you: I'm listening, but due to > > the close freeze and me having little time atm this is clearly a post > > Wheezy issue. > > > > (If there is a hidden last minute removal or some such please inform > > me, I'hope not, though). > > I've been hoping that we'll have no mb3 packages in wheezy, since mb3 doesn't > really work ;), but it's not an official release goal or anything like that. It's a tad bit unfortunate that this is discovered only such recently before the release. Are there any bug reports showing the problems? > If you are too busy what do you think about an NMU? If you are willing to subscribe to the package until release and fix any issues popping up due to the NMU, I'm fine with it. I just don't have any time atm to monitor this change this late in the cycle. Greetings Helge -- Dr. Helge Kreutzmann deb...@helgefjell.de Dipl.-Phys. http://www.helgefjell.de/debian.php 64bit GNU powered gpg signed mail preferred Help keep free software "libre": http://www.ffii.de/ signature.asc Description: Digital signature
Bug#677246: patch for goobox / musicbrainz5
Hi, On Mon, Jun 18, 2012 at 09:49:21PM +0200, Helge Kreutzmann wrote: > thanks for your work. Just to inform you: I'm listening, but due to > the close freeze and me having little time atm this is clearly a post > Wheezy issue. > > (If there is a hidden last minute removal or some such please inform > me, I'hope not, though). I've been hoping that we'll have no mb3 packages in wheezy, since mb3 doesn't really work ;), but it's not an official release goal or anything like that. If you are too busy what do you think about an NMU? Thanks -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#677246: patch for goobox / musicbrainz5
Hello Jon, thanks for your work. Just to inform you: I'm listening, but due to the close freeze and me having little time atm this is clearly a post Wheezy issue. (If there is a hidden last minute removal or some such please inform me, I'hope not, though). Greetings Helge -- Dr. Helge Kreutzmann deb...@helgefjell.de Dipl.-Phys. http://www.helgefjell.de/debian.php 64bit GNU powered gpg signed mail preferred Help keep free software "libre": http://www.ffii.de/ signature.asc Description: Digital signature
Bug#677246: patch for goobox / musicbrainz5
tags 677246 +patch
thanks
Please find attached.
(Sorry this is a re-send, my work smtp server ate my first mail).
Patch has two sub-patches:
⢠a backport of upstream's mb3 â mb4 patch
⢠a subsequent mb4 â mb5 patch
I've adjusted the rules file to preserve configure and aclocal.m4,
to keep dpkg/source/3 happy.
diff -Nru goobox-3.0.1/debian/changelog goobox-3.0.1/debian/changelog
--- goobox-3.0.1/debian/changelog 2012-04-20 19:37:30.0 +0100
+++ goobox-3.0.1/debian/changelog 2012-06-14 09:43:46.0 +0100
@@ -1,3 +1,11 @@
+goobox (3.0.1-2) unstable; urgency=low
+
+ * Update to use libmusicbrainz5. Rework packaging to preserve
+upstream configure and aclocal.m4 files during build process.
+Closes: #677246.
+
+ -- Jon Dowland Thu, 14 Jun 2012 09:43:08 +0100
+
goobox (3.0.1-1) unstable; urgency=low
* New upstream release
diff -Nru goobox-3.0.1/debian/patches/goobox-mb4.patch goobox-3.0.1/debian/patches/goobox-mb4.patch
--- goobox-3.0.1/debian/patches/goobox-mb4.patch 1970-01-01 01:00:00.0 +0100
+++ goobox-3.0.1/debian/patches/goobox-mb4.patch 2012-06-14 09:29:16.0 +0100
@@ -0,0 +1,563 @@
+From b8046894e5d543048afbe7dd630aebc7c29d77a8 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega
+Date: Sat, 02 Jun 2012 19:17:47 +
+Subject: ported to libmusicbrainz4
+
+---
+diff --git a/configure.ac b/configure.ac
+index e7316f3..3c5e85c 100644
+--- a/configure.ac
b/configure.ac
+@@ -19,7 +19,7 @@ GLIB_REQUIRED=2.30
+ GTK_REQUIRED=3.2.0
+ GSTREAMER_REQUIRED=0.10.12
+ LIBNOTIFY_REQUIRED=0.4.3
+-LIBMUSICBRAINZ3_REQUIRED=3.0.0
++LIBMUSICBRAINZ4_REQUIRED=4.0.0
+
+ dnl ===
+
+@@ -33,7 +33,7 @@ PKG_CHECK_MODULES(GOO, [
+ gtk+-3.0 >= $GTK_REQUIRED
+ gstreamer-0.10 >= $GSTREAMER_REQUIRED
+ libbrasero-media3
+- libmusicbrainz3 >= $LIBMUSICBRAINZ3_REQUIRED
++ libmusicbrainz4 >= $LIBMUSICBRAINZ4_REQUIRED
+ libdiscid
+ ])
+ AC_SUBST(GOO_CFLAGS)
+diff --git a/src/album-info.c b/src/album-info.c
+index 6e461cc..0bd20b9 100644
+--- a/src/album-info.c
b/src/album-info.c
+@@ -155,7 +155,7 @@ album_info_set_artist (AlbumInfo *album,
+ const char *artist,
+ const char *artist_id)
+ {
+- if (artist == NULL) {
++ if ((artist == NULL) || (artist[0] == 0)) {
+ g_free (album->artist);
+ album->artist = NULL /*g_strdup (_("Unknown Artist"))*/;
+ g_free (album->artist_id);
+diff --git a/src/goo-error.h b/src/goo-error.h
+index 3102f7d..3753b17 100644
+--- a/src/goo-error.h
b/src/goo-error.h
+@@ -23,11 +23,15 @@
+ #ifndef __GOO_ERROR_H__
+ #define __GOO_ERROR_H__
+
+-
+ #include
+
+ #define GOO_ERROR goo_error_quark ()
+-GQuark goo_error_quark (void);
+
++enum {
++ GOO_ERROR_GENERIC,
++ GOO_ERROR_METADATA
++};
++
++GQuark goo_error_quark (void);
+
+ #endif /* __GOO_ERROR_H__ */
+diff --git a/src/metadata.c b/src/metadata.c
+index a79a23d..312208d 100644
+--- a/src/metadata.c
b/src/metadata.c
+@@ -24,33 +24,74 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include "album-info.h"
+ #include "glib-utils.h"
++#include "goo-error.h"
+ #include "metadata.h"
+
+
++#define QUERY_AGENT (PACKAGE_NAME "-" PACKAGE_VERSION)
++
++
+ static TrackInfo *
+-get_track_info (MbTrack mb_track,
+- int n_track)
++get_track_info (Mb4Track mb_track,
++ int n_track)
+ {
+- TrackInfo *track;
+- char data[1024];
+- char data2[1024];
+- MbArtist mb_artist;
++ TrackInfo *track;
++ Mb4Recording recording;
++ intrequired_size = 0;
++ char *title = NULL;
++ Mb4ArtistCreditartist_credit;
++ Mb4NameCreditList name_credit_list;
++ inti;
+
+ track = track_info_new (n_track, 0, 0);
+
+- mb_track_get_title (mb_track, data, 1024);
+- track_info_set_title (track, data);
++ /* title */
++
++ recording = mb4_track_get_recording (mb_track);
++ if (recording != NULL) {
++ required_size = mb4_recording_get_title (recording, title, 0);
++ title = g_new (char, required_size + 1);
++ mb4_recording_get_title (recording, title, required_size + 1);
++ }
++ else {
++ required_size = mb4_track_get_title (mb_track, title, 0);
++ title = g_new (char, required_size + 1);
++ mb4_track_get_title (mb_track, title, required_size + 1);
++ }
++ track_info_set_title (track, title);
++ debug (DEBUG_INFO, "==> [MB] TRACK %d: %s\n", n_track, title);
++
++ g_free (title);
++
++ /* artist */
++
++ artist_credit = mb4_track_get_artistcredit (mb_track);
++ name_credit_list = mb4_artistcredit_get_namecreditlist (artist_credit);
++ for (i = 0; i < mb4_namecredit_list_size (name_credit_list); i++) {
++ Mb4NameCredit name_credit = mb4_namecredit_list_item (name_credit_list, i);
++ Mb4Artist artist;
++ char *artist_name = NULL;
++ char *artist_id = NULL;
++
++ artist = mb4_namecredit_get_artist (name_credit);
++
++ required_size = mb4_artist_get_name (artist, artist_name, 0);
++ artist_name
