Package: gnome-sushi Version: 0.4.1-3 Severity: wishlist Tags: patch See attached packaging. Briefly tested on a sid/experimental system with GNOME 3.4 versions of gtksourceview and nautilus (I haven't packaged GNOME 3.6 versions of those yet).
Regards,
S
--- gnome-sushi-0.4.1/debian/changelog 2012-06-19 20:50:00.000000000 +0100 +++ gnome-sushi-3.6.0/debian/changelog 2012-10-18 18:38:27.000000000 +0100 @@ -1,3 +1,119 @@ +gnome-sushi (3.6.0-0+g36+1) experimental; urgency=low + + * Local package + * Merge from Ubuntu back to Debian + + -- Simon McVittie <[email protected]> Thu, 18 Oct 2012 18:35:06 +0100 + +gnome-sushi (3.6.0-0ubuntu1) quantal; urgency=low + + * New upstream version (LP: #1055853) + + -- Matthew Fischer <[email protected]> Mon, 24 Sep 2012 16:56:03 -0600 + +gnome-sushi (3.5.92-0ubuntu1) quantal; urgency=low + + * New upstream bugfix release. + + -- Jeremy Bicha <[email protected]> Mon, 17 Sep 2012 23:49:13 -0400 + +gnome-sushi (3.5.91-0ubuntu3) quantal; urgency=low + + * debian/gnome-sushi.gsettings-override: + - Dropped, override moved to ubuntu-default-settings + + -- Jeremy Bicha <[email protected]> Tue, 11 Sep 2012 23:41:18 -0400 + +gnome-sushi (3.5.91-0ubuntu2) quantal; urgency=low + + * debian/control.in: + - Depend on gstreamer1.0-plugins-good (LP: #1048356) + - Suggest gstreamer1.0-libav + + -- Jeremy Bicha <[email protected]> Sun, 09 Sep 2012 19:26:09 -0400 + +gnome-sushi (3.5.91-0ubuntu1) quantal; urgency=low + + [ Robert Ancell ] + * debian/control.in: + - Build-depend on libclutter-gst-2.0-dev + - Build-depend on libgstreamer1.0-dev + + [ Jeremy Bicha ] + * New upstream release (LP: #1039704). + - Even though the version numbering format changed, this is + just another minor GNOME 3.6 development snapshot + * debian/control.in: + - Build-depend on libmusicbrainz5-dev instead of libmusicbrainz4-dev + + -- Jeremy Bicha <[email protected]> Sat, 08 Sep 2012 23:35:14 -0400 + +gnome-sushi (0.5.4-0ubuntu2) quantal; urgency=low + + * Build against libmusicbrainz5. + + -- Timo Aaltonen <[email protected]> Tue, 14 Aug 2012 09:34:39 +0300 + +gnome-sushi (0.5.4-0ubuntu1) quantal; urgency=low + + * New upstream release + * debian/control: + - Bump build-depends on libclutter-1.0-dev + - Add build-depends on libfreetype6-dev + + -- Robert Ancell <[email protected]> Tue, 17 Jul 2012 10:39:33 +1200 + +gnome-sushi (0.5.2-0ubuntu2) quantal-proposed; urgency=low + + * Rebuild against latest libevince-dev + + -- Jeremy Bicha <[email protected]> Wed, 27 Jun 2012 23:06:56 -0400 + +gnome-sushi (0.5.2-0ubuntu1) quantal; urgency=low + + * New upstream release. + + -- Jeremy Bicha <[email protected]> Mon, 04 Jun 2012 13:56:37 -0400 + +gnome-sushi (0.5.1-0ubuntu1) quantal; urgency=low + + * New upstream release. + * debian/control.in: + - Build-depend on libmusicbrainz4-dev + * Dropped all patches except 02-no-gettext.patch as they are in the + new upstream version + * debian/watch: Watch for unstable releases + + -- Jeremy Bicha <[email protected]> Fri, 25 May 2012 23:01:05 -0400 + +gnome-sushi (0.4.1-0ubuntu1) precise; urgency=low + + * New upstream release. + - Fix a crash when fetching album cover art (LP: #927555) + - Move the window to the current desktop workspace when shown + (LP: #897559) + - Avoid maximization and window snapping + - Plug some memory leaks + * debian/control.in: Bump minimum clutter to 1.10 + * debian/90-make-fullscreen-button-placement-consistent.patch: + - Git patch to move evince-viewer's fullscreen button to the right + like other viewers (LP: #896987) + * debian/91-add-client-decorations-preference.patch: + - Git patch to add gsettings option to use native window + management buttons + * debian/gnome-sushi.gsettings-override: + - Use native window management buttons by default (LP: #876805, + LP: #880262) + + -- Jeremy Bicha <[email protected]> Sat, 21 Apr 2012 23:48:30 -0400 + +gnome-sushi (0.4.0-1ubuntu1) precise; urgency=low + + * 03-revert-main-window-use-a-ClutterBoxLayout.patch: + - Dropped, Ubuntu 12.04 has the new clutter + + -- Jeremy Bicha <[email protected]> Sun, 01 Apr 2012 09:44:11 -0400 + gnome-sushi (0.4.1-3) unstable; urgency=low * Port to libmusicbrainz5. Closes: #677235 --- gnome-sushi-0.4.1/debian/control 2012-06-19 20:53:33.000000000 +0100 +++ gnome-sushi-3.6.0/debian/control 2012-10-18 18:40:58.000000000 +0100 @@ -7,7 +7,7 @@ Section: gnome Priority: extra Maintainer: Debian GNOME Maintainers <[email protected]> -Uploaders: Brandon Snider <[email protected]>, Michael Biebl <[email protected]>, Sjoerd Simons <[email protected]> +Uploaders: Brandon Snider <[email protected]>, Jeremy Bicha <[email protected]> Build-Depends: debhelper (>= 8.0.0), autotools-dev, cdbs (>= 0.4.90~), @@ -15,14 +15,15 @@ gnome-pkg-tools (>= 0.11), gobject-introspection (>= 0.9.6), intltool, - libclutter-1.0-dev (>= 1.10.0), - libclutter-gst-dev, + libclutter-1.0-dev (>= 1.11.4), + libclutter-gst-2.0-dev, libclutter-gtk-1.0-dev (>= 1.0.1), libdiscid0-dev, libevince-dev, + libfreetype6-dev, libgjs-dev (>= 0.7.7), libglib2.0-dev (>= 2.29.14), - libgstreamer0.10-dev, + libgstreamer1.0-dev, libgtk-3-dev (>= 3.4.0), libgtksourceview-3.0-dev, libmusicbrainz5-dev, @@ -39,8 +40,10 @@ ${misc:Depends}, ${gir:Depends}, nautilus (>= 3.2), - gir1.2-clutter-gst-1.0, - gir1.2-gtkclutter-1.0 + gir1.2-clutter-gst-2.0, + gir1.2-gtkclutter-1.0, + gstreamer1.0-plugins-good +Suggests: gstreamer1.0-libav Breaks: gnome-sushi-common (<< 0.4.0-1) Replaces: gnome-sushi-common (<< 0.4.0-1) Description: sushi is a quick previewer for nautilus --- gnome-sushi-0.4.1/debian/control.in 2012-06-01 18:07:24.000000000 +0100 +++ gnome-sushi-3.6.0/debian/control.in 2012-10-18 18:38:27.000000000 +0100 @@ -10,14 +10,15 @@ gnome-pkg-tools (>= 0.11), gobject-introspection (>= 0.9.6), intltool, - libclutter-1.0-dev (>= 1.10.0), - libclutter-gst-dev, + libclutter-1.0-dev (>= 1.11.4), + libclutter-gst-2.0-dev, libclutter-gtk-1.0-dev (>= 1.0.1), libdiscid0-dev, libevince-dev, + libfreetype6-dev, libgjs-dev (>= 0.7.7), libglib2.0-dev (>= 2.29.14), - libgstreamer0.10-dev, + libgstreamer1.0-dev, libgtk-3-dev (>= 3.4.0), libgtksourceview-3.0-dev, libmusicbrainz5-dev, @@ -34,8 +35,10 @@ ${misc:Depends}, ${gir:Depends}, nautilus (>= 3.2), - gir1.2-clutter-gst-1.0, - gir1.2-gtkclutter-1.0 + gir1.2-clutter-gst-2.0, + gir1.2-gtkclutter-1.0, + gstreamer1.0-plugins-good +Suggests: gstreamer1.0-libav Breaks: gnome-sushi-common (<< 0.4.0-1) Replaces: gnome-sushi-common (<< 0.4.0-1) Description: sushi is a quick previewer for nautilus --- gnome-sushi-0.4.1/debian/patches/01-privlib.patch 2012-04-26 21:17:19.000000000 +0100 +++ gnome-sushi-3.6.0/debian/patches/01-privlib.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,91 +0,0 @@ -From a19ffc2727c0a75bd44128bfe942437386288a21 Mon Sep 17 00:00:00 2001 -From: Michael Biebl <[email protected]> -Date: Sun, 1 Apr 2012 03:53:17 +0200 -Subject: [PATCH] build: move libsushi out of $libdir - -Don't install our private introspected library in the system libdir, -since it's not supposed to be used outside of sushi. - -https://bugzilla.gnome.org/show_bug.cgi?id=673269 ---- - src/Makefile-sushi.am | 5 ++++- - src/Makefile.am | 6 +++--- - src/sushi.in | 10 ++++++++-- - 3 files changed, 15 insertions(+), 6 deletions(-) - -Index: sushi-0.4.1/src/Makefile-sushi.am -=================================================================== ---- sushi-0.4.1.orig/src/Makefile-sushi.am 2012-04-16 17:15:30.000000000 +0200 -+++ sushi-0.4.1/src/Makefile-sushi.am 2012-04-26 22:16:05.195593573 +0200 -@@ -53,11 +53,14 @@ - cp xgen-betc sushi-enum-types.c && \ - rm -f xgen-betc - --lib_LTLIBRARIES += libsushi-1.0.la -+pkglib_LTLIBRARIES += libsushi-1.0.la - - libsushi_1_0_la_LIBADD = \ - $(SUSHI_LIBS) - -+libsushi_1_0_la_LDFLAGS = \ -+ -avoid-version -+ - libsushi_1_0_la_CPPFLAGS = \ - $(sushi_cflags) - -Index: sushi-0.4.1/src/Makefile.am -=================================================================== ---- sushi-0.4.1.orig/src/Makefile.am 2012-04-16 17:15:30.000000000 +0200 -+++ sushi-0.4.1/src/Makefile.am 2012-04-26 22:16:05.199593573 +0200 -@@ -8,13 +8,13 @@ - -DSUSHI_TOP_SRCDIR=\"$(abs_top_srcdir)\" \ - -DSUSHI_BUILDDIR=\"$(abs_top_builddir)\" - --girdir = $(datadir)/gir-1.0 --typelibdir = $(libdir)/girepository-1.0 -+girdir = $(pkgdatadir)/gir-1.0 -+typelibdir = $(pkglibdir)/girepository-1.0 - - BUILT_SOURCES = - EXTRA_DIST = - CLEANFILES = --lib_LTLIBRARIES = -+pkglib_LTLIBRARIES = - INTROSPECTION_GIRS = - gir_DATA = - typelib_DATA = -Index: sushi-0.4.1/src/sushi.in -=================================================================== ---- sushi-0.4.1.orig/src/sushi.in 2012-04-16 17:15:30.000000000 +0200 -+++ sushi-0.4.1/src/sushi.in 2012-04-26 22:16:05.199593573 +0200 -@@ -7,9 +7,15 @@ - fi - - if test x"$GI_TYPELIB_PATH" = x ; then -- export GI_TYPELIB_PATH=@libdir@/girepository-1.0 -+ export GI_TYPELIB_PATH=@pkglibdir@/girepository-1.0 - else -- export GI_TYPELIB_PATH=@libdir@/girepository-1.0:$GI_TYPELIB_PATH -+ export GI_TYPELIB_PATH=@pkglibdir@/girepository-1.0:$GI_TYPELIB_PATH -+fi -+ -+if test x"$LD_LIBRARY_PATH" = x ; then -+ export LD_LIBRARY_PATH=@pkglibdir@ -+else -+ export LD_LIBRARY_PATH=@pkglibdir@:$LD_LIBRARY_PATH - fi - - if test x"$GJS_DEBUG_OUTPUT" = x ; then -Index: sushi-0.4.1/configure.ac -=================================================================== ---- sushi-0.4.1.orig/configure.ac 2012-04-16 17:17:58.000000000 +0200 -+++ sushi-0.4.1/configure.ac 2012-04-26 22:17:10.595591260 +0200 -@@ -47,7 +47,7 @@ - GJS_JS_DIR=`$PKG_CONFIG --variable=datadir gjs-1.0`/gjs-1.0 - AC_SUBST(GJS_JS_DIR) - --CLUTTER_MIN_VERSION=1.10.0 -+CLUTTER_MIN_VERSION=1.6.0 - GLIB_MIN_VERSION=2.29.14 - GTK_MIN_VERSION=3.0.0 - GJS_MIN_VERSION=0.7.7 --- gnome-sushi-0.4.1/debian/patches/03-mb5.patch 2012-06-19 20:43:48.000000000 +0100 +++ gnome-sushi-3.6.0/debian/patches/03-mb5.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,116 +0,0 @@ -Description: Use libmusicbrainz5 -Based on http://git.gnome.org/browse/sushi/commit/?id=9afbcc1ed -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677235 -Index: sushi-0.4.1/configure.ac -=================================================================== ---- sushi-0.4.1.orig/configure.ac 2012-06-19 21:43:43.733177991 +0200 -+++ sushi-0.4.1/configure.ac 2012-06-19 21:43:43.749178148 +0200 -@@ -66,7 +66,7 @@ - gstreamer-0.10 - gstreamer-pbutils-0.10 - gstreamer-tag-0.10 -- libmusicbrainz3 -+ libmusicbrainz5 - evince-document-3.0 - evince-view-3.0 - gtksourceview-3.0 -Index: sushi-0.4.1/src/libsushi/sushi-cover-art.c -=================================================================== ---- sushi-0.4.1.orig/src/libsushi/sushi-cover-art.c 2012-04-16 17:15:30.000000000 +0200 -+++ sushi-0.4.1/src/libsushi/sushi-cover-art.c 2012-06-19 21:43:43.749178148 +0200 -@@ -27,7 +27,7 @@ - - #include "sushi-cover-art.h" - --#include <musicbrainz3/mb_c.h> -+#include <musicbrainz5/mb5_c.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - - G_DEFINE_TYPE (SushiCoverArtFetcher, sushi_cover_art_fetcher, G_TYPE_OBJECT); -@@ -212,43 +212,51 @@ - gpointer user_data) - { - FetchUriJob *job = user_data; -- MbQuery query; -- MbReleaseFilter filter; -- MbRelease release; -- MbResultList results; -- gint results_len = 0, idx; -+ Mb5Metadata metadata; -+ Mb5Query query; -+ Mb5Release release; -+ Mb5ReleaseList release_list; - gchar *retval = NULL; -+ gchar **param_names = NULL; -+ gchar **param_values = NULL; - -- query = mb_query_new (NULL, NULL); -+ query = mb5_query_new ("sushi", NULL, 0); - -- filter = mb_release_filter_new (); -- filter = mb_release_filter_title (filter, job->album); -- filter = mb_release_filter_artist_name (filter, job->artist); -+ param_names = g_new (gchar*, 3); -+ param_values = g_new (gchar*, 3); - -- results = mb_query_get_releases (query, filter); -- mb_query_free (query); -- mb_release_filter_free (filter); -+ param_names[0] = g_strdup ("query"); -+ param_values[0] = g_strdup_printf ("artist:\"%s\" AND release:\"%s\"", job->artist, job->album); - -- if (results) -- results_len = mb_result_list_get_size (results); -+ param_names[1] = g_strdup ("limit"); -+ param_values[1] = g_strdup ("1"); - -- for (idx = 0; idx < results_len; idx++) { -- gchar asin[255]; -+ param_names[2] = NULL; -+ param_values[2] = NULL; - -- release = mb_result_list_get_release (results, idx); -- mb_release_get_asin (release, asin, 255); -+ metadata = mb5_query_query (query, "release", "", "", -+ 2, param_names, param_values); - -- mb_release_free (release); -+ mb5_query_delete (query); - -- if (asin != NULL && -+ if (metadata) { -+ release_list = mb5_metadata_get_releaselist (metadata); -+ int i; -+ int release_list_length = mb5_release_list_size (release_list); -+ for (i = 0; i < release_list_length; i++) { -+ gchar asin[255]; -+ -+ release = mb5_release_list_item (release_list, i); -+ mb5_release_get_asin (release, asin, 255); -+ -+ if (asin != NULL && - asin[0] != '\0') { -- retval = g_strdup (asin); -- break; -+ retval = g_strdup (asin); -+ break; -+ } - } - } -- -- if (results) -- mb_result_list_free (results); -+ mb5_metadata_delete (metadata); - - if (retval == NULL) { - /* FIXME: do we need a better error? */ -@@ -264,7 +272,8 @@ - g_io_scheduler_job_send_to_mainloop_async (sched_job, - fetch_uri_job_callback, - job, NULL); -- -+ g_strfreev (param_names); -+ g_strfreev (param_values); - return FALSE; - } - --- gnome-sushi-0.4.1/debian/patches/04-increase-limit.patch 2012-06-19 20:46:37.000000000 +0100 +++ gnome-sushi-3.6.0/debian/patches/04-increase-limit.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -Description: Increase the limit of responses - The sushi code is written to support receiving multiple matches for its query - to MB: it loops through and picks the first match which has an ASIN. - . - However, when the actual query is made, the limit on responses is set to one, - so only one result is ever returned. - . - In the case of many albums, there are multiple matches, sometimes with bootlegs - or just with records which aren't fleshed out with an ASIN. -Author: Jon Dowland <[email protected]> -Forwarded: No -Index: sushi-0.4.1/src/libsushi/sushi-cover-art.c -=================================================================== ---- sushi-0.4.1.orig/src/libsushi/sushi-cover-art.c 2012-06-19 21:43:43.749178148 +0200 -+++ sushi-0.4.1/src/libsushi/sushi-cover-art.c 2012-06-19 21:44:54.721874708 +0200 -@@ -229,7 +229,7 @@ - param_values[0] = g_strdup_printf ("artist:\"%s\" AND release:\"%s\"", job->artist, job->album); - - param_names[1] = g_strdup ("limit"); -- param_values[1] = g_strdup ("1"); -+ param_values[1] = g_strdup ("10"); - - param_names[2] = NULL; - param_values[2] = NULL; --- gnome-sushi-0.4.1/debian/patches/series 2012-06-19 20:44:33.000000000 +0100 +++ gnome-sushi-3.6.0/debian/patches/series 2012-10-18 18:38:27.000000000 +0100 @@ -1,4 +1 @@ -01-privlib.patch 02-no-gettext.patch -03-mb5.patch -04-increase-limit.patch
gnome-sushi_3.6.0-0+g36+1.debian.tar.gz
Description: Binary data
