tags 494730 patch
thanks
Hi,
I attached a diff for the new version based on the one applied on
Ubuntu.
I hope it can help you upgrading the package.
Thanks.
Regards,
Julien Lavergne
--- gnomad2-2.9.4.orig/src/filesystem.c
+++ gnomad2-2.9.4/src/filesystem.c
@@ -74,6 +74,11 @@
GList *metalist;
} metadata_set_args_t;
+static gboolean call_gtk_widget_destroy(gpointer w) {
+ gtk_widget_destroy(w);
+ return FALSE;
+}
+
static gboolean draw_label(gpointer p) {
draw_label_args_t *args = (draw_label_args_t *) p;
@@ -653,7 +658,7 @@
metarg->metalist = metalist;
g_idle_add(update_metadata,metarg);
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
g_free(args->path);
g_free(args);
return NULL;
--- gnomad2-2.9.4.orig/src/jukebox.c
+++ gnomad2-2.9.4/src/jukebox.c
@@ -168,6 +168,11 @@
return current; /* I.E. type == LIBMTP_FILETYPE_UNKNOWN */
}
+static gboolean call_gtk_widget_destroy(gpointer w) {
+ gtk_widget_destroy(w);
+ return FALSE;
+}
+
static const mtp_filetype_description_t*
get_mtp_filetype_description_by_codec(const gchar *name) {
const mtp_filetype_description_t *current;
@@ -1810,7 +1815,7 @@
g_print("Building playlist tree...\n");
}
g_idle_add(call_build_playlist_tree, (gpointer) args->pltreestore);
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
jukebox_locked = FALSE;
return NULL;
@@ -1995,7 +2000,7 @@
clean_up_and_return:
jukebox_locked = FALSE;
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
g_idle_add(call_fill_in_dir, GINT_TO_POINTER((gint)HD_LIST));
/* Free the memory used by the list */
destroy_metalist(args->metalist);
@@ -2079,7 +2084,7 @@
destroy_metalist(args->metalist);
jukebox_locked = FALSE;
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
g_idle_add(call_fill_in_dir, GINT_TO_POINTER((gint)HDDATA_LIST));
g_free(args);
return NULL;
@@ -2288,7 +2293,7 @@
rmdir(tmpdirname);
}
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
if (args->playlists != NULL) {
g_idle_add(call_build_playlist_tree, (gpointer) args->pltreestore);
}
@@ -2407,7 +2412,7 @@
hd2jb_data_cleanup:
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
jukebox_locked = FALSE;
destroy_metalist(args->metalist);
g_free(args);
@@ -3553,7 +3558,7 @@
}
// Let the main loop destroy the dialog
- g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
+ g_idle_add(call_gtk_widget_destroy, args->dialog);
g_mutex_lock(play_thread_mutex);
// Free the playlist
destroy_metalist(playlist);
--- gnomad2-2.9.4.orig/debian/docs
+++ gnomad2-2.9.4/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- gnomad2-2.9.4.orig/debian/manpages
+++ gnomad2-2.9.4/debian/manpages
@@ -0,0 +1 @@
+gnomad2.1
--- gnomad2-2.9.4.orig/debian/compat
+++ gnomad2-2.9.4/debian/compat
@@ -0,0 +1 @@
+4
--- gnomad2-2.9.4.orig/debian/rules
+++ gnomad2-2.9.4/debian/rules
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ $(MAKE)
+ touch $@
+
+install: build
+ dh_clean -k
+ $(MAKE) DESTDIR=$(CURDIR)/debian/gnomad2 install
+
+clean:
+ rm -f build-stamp
+ dh_clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+# -$(MAKE) distclean
+
+binary-indep:
+
+binary-arch: install
+ dh_installchangelogs -a ChangeLog
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installman -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_strip -a
+ dh_makeshlibs -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+
+.PHONY: build install clean binary-indep binary-arch binary
--- gnomad2-2.9.4.orig/debian/control
+++ gnomad2-2.9.4/debian/control
@@ -0,0 +1,15 @@
+Source: gnomad2
+Section: x11
+Priority: optional
+Maintainer: Manuel Garcia <[email protected]>
+Build-Depends: libgnomeui-dev, libnjb-dev (>> 2.2), libid3tag0-dev, libxml-parser-perl, debhelper (>= 4), libmtp-dev (>= 0.2.2), libtagc0-dev, libtag1-dev, intltool (>= 0.35.0)
+Standards-Version: 3.8.0
+
+Package: gnomad2
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Manage a Creative Labs Nomad Jukebox
+ Gnomad 2 is a GUI built on top of GTK/GNOME 2, id3lib and libnjb that
+ makes it possible to transfer tracks and files from/to a Creative
+ Nomad Jukebox (all brands). It is designed much like an ordinary
+ graphical FTP program.
--- gnomad2-2.9.4.orig/debian/copyright
+++ gnomad2-2.9.4/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Shaun Jackman <[email protected]> on
+2004-05-25 and adopted by Manuel Garcia <[email protected]> on
+2006-08-28.
+
+It was downloaded from http://gnomad2.sourceforge.net/
+
+Upstream Author: Linus Walleij <[email protected]>
+
+Copyright:
+
+Copyright 2006 Linus Walleij
+Copyright 2001 Cedric Tefft
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL
+or obtained from the Free Software Foundation.
--- gnomad2-2.9.4.orig/debian/changelog
+++ gnomad2-2.9.4/debian/changelog
@@ -0,0 +1,166 @@
+gnomad2 (2.9.4-0.1) unstable; urgency=low
+
+ * NMU
+ * New upstream release (Closes: #494730)
+ * debian/control: Add build-depends on intltool (>= 0.35.0).
+ * debian/watch: Update to handle Sourceforge location.
+ * Drop patch in src/jukebox.c, src/tagfile.c, and gnomad2.desktop.in.
+ There are merged upstream.
+ * Include inline patch in src/filesystem.c and src/jukebox.c to fix a 100%
+ CPU use. Thanks Chris Vine for the patch
+
+ -- Julien Lavergne <[email protected]> Tue, 14 Jul 2009 14:34:33 +0200
+
+gnomad2 (2.9.1-1.2) unstable; urgency=low
+
+ * NMU for helping with the libmtp7 -> libmtp8 transition, with the
+ authorization of the Release Team
+ (http://lists.debian.org/debian-release/2009/03/msg00085.html)
+ * src/jukebox.c: updates from upstream revno 1.123 to support libtmp8
+ (closes: #516563). This patch was taken from Ubuntu, thanks to
+ Riccardo Coccioli.
+
+ -- Rafael Laboissiere <[email protected]> Sun, 08 Mar 2009 22:52:41 +0100
+
+gnomad2 (2.9.1-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * fix segfault due to missing Vorbis comment headers (double free).
+ Thanks to Steve Kemp for the patch (Closes: #509288)
+ * debian/changelog: fix syntax error ("urgiency" typo in past entry)
+ * gnomad2.desktop{,.in}: get rid of deprecated "Encoding" key
+ (file is UTF-8 safe)
+ * debian/control: bump Standards-Version, no changes needed
+
+ -- Stefano Zacchiroli <[email protected]> Fri, 26 Dec 2008 09:53:11 +0100
+
+gnomad2 (2.9.1-1) unstable; urgency=low
+
+ * New upstream release. Closes: #446812.
+
+ -- Manuel Garcia <[email protected]> Fri, 08 Feb 2008 18:35:32 -0430
+
+gnomad2 (2.9.0-1) unstable; urgency=low
+
+ * New upstream release. Closes: #435166, #446812.
+ * Add libtag1-dev and libtagc0-dev as dependencies.
+ * Updates libmtp-dev dependencies to 0.2.2 version.
+
+ -- Manuel Garcia <[email protected]> Thu, 15 Nov 2007 15:35:33 -0400
+
+gnomad2 (2.8.12-2) unstable; urgency=low
+
+ * Changing from experimental to unstable.
+ * New upstream release. Closes: #418775, #428155, #351792.
+
+ -- Manuel Garcia <[email protected]> Wed, 20 Jun 2007 12:47:42 -0400
+
+gnomad2 (2.8.12-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Manuel Garcia <[email protected]> Fri, 13 Apr 2007 16:45:26 -0400
+
+gnomad2 (2.8.11-2) experimental; urgency=low
+
+ * Add libmtp as dependency. Closes: #396369.
+
+ -- Manuel Garcia Fernandez <[email protected]> Wed, 14 Mar 2007 12:19:37 -0400
+
+gnomad2 (2.8.11-1) experimental; urgency=low
+
+ * New upstream release. Closes: #409200
+
+ -- Manuel Garcia <[email protected]> Thu, 15 Feb 2007 13:35:56 -0400
+
+gnomad2 (2.8.8-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use $(CURDIR) instead of $(PWD) in debian/rules (closes: #390390).
+ * Added version to debhelper build-dependency to match debian/compat.
+
+ -- martin f. krafft <[email protected]> Sat, 7 Oct 2006 17:54:56 +0200
+
+gnomad2 (2.8.8-1) unstable; urgency=low
+
+ * New maintainer. Closes: #316771.
+ * New upstream release.
+ * Update the Debian policy to version 3.7.2.1. No changes necessary.
+
+ -- Manuel Garcia <[email protected]> Mon, 28 Aug 2006 16:22:56 -0400
+
+gnomad2 (2.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update the Debian policy to version 3.6.2.2. No changes necessary.
+ * Update the watch file.
+ * Update the copyright file.
+
+ -- Shaun Jackman <[email protected]> Sat, 8 Apr 2006 15:58:16 -0600
+
+gnomad2 (2.8.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix bug affecting file names starting with numbers. Closes: #324865.
+
+ -- Shaun Jackman <[email protected]> Sat, 17 Sep 2005 20:50:20 -0600
+
+gnomad2 (2.8.0-2) unstable; urgency=low
+
+ * Add a versioned dependency for libnjb-dev (>> 2.2). Closes: #324036.
+
+ -- Shaun Jackman <[email protected]> Fri, 19 Aug 2005 16:09:28 -0700
+
+gnomad2 (2.8.0-1) unstable; urgency=low
+
+ * New upstream release. Closes: #319022.
+ * Display a detailed error message if unable to connect. Closes: #279008.
+ * Update the German translation. Closes: #314083.
+ * Build using libnjb5.
+
+ -- Shaun Jackman <[email protected]> Tue, 16 Aug 2005 11:50:27 -0700
+
+gnomad2 (2.6.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Rebuild against libnjb4.
+
+ -- Shaun Jackman <[email protected]> Thu, 10 Mar 2005 07:47:43 -0800
+
+gnomad2 (2.6.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Rebuild against libnjb2.
+ * Update watch file.
+
+ -- Shaun Jackman <[email protected]> Thu, 30 Dec 2004 01:04:33 -0800
+
+gnomad2 (2.5.0-2) unstable; urgency=low
+
+ * Add libxml-parser-perl to the build dependencies (closes: #277367) because
+ intltool requires it. Perhaps this can be run in advance to avoid the
+ dependency.
+
+ -- Shaun Jackman <[email protected]> Mon, 25 Oct 2004 10:24:21 -0700
+
+gnomad2 (2.5.0-1) unstable; urgency=low
+
+ * New upstream release (closes: #277337).
+ * Depend on libid3tag0-dev (>= 0.14.2b-4). Remove dependency on
+ libid3-dev.
+
+ -- Shaun Jackman <[email protected]> Tue, 19 Oct 2004 08:37:01 -0700
+
+gnomad2 (2.4.4-2) unstable; urgency=low
+
+ * Rebuild with g++ 3.3 (closes: #269745).
+ * Move from experimental to unstable.
+
+ -- Shaun Jackman <[email protected]> Fri, 3 Sep 2004 08:56:28 -0700
+
+gnomad2 (2.4.4-1) experimental; urgency=low
+
+ * Initial Release.
+
+ -- Shaun Jackman <[email protected]> Tue, 25 May 2004 19:55:56 -0700
+
--- gnomad2-2.9.4.orig/debian/README.Debian
+++ gnomad2-2.9.4/debian/README.Debian
@@ -0,0 +1,3 @@
+Thanks to Javier Fern�ndez-Sanguino Pe�a <[email protected]>
+you have to add (statically or through an udev rule) the user that
+runs gnomad2 to plugdev's group.
--- gnomad2-2.9.4.orig/debian/watch
+++ gnomad2-2.9.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/gnomad2/gnomad2-(.+)\.tar\.gz debian uupdate
