[Pkg-cli-apps-commits] r4885 - in /packages/muine/trunk/debian: control patches/correct-glade-signals.diff patches/metadata-crash.diff patches/series rules
sebner-guest at users.alioth.debian.org
sebner-guest at users.alioth.debian.org
Thu Apr 30 20:33:20 UTC 2009
Author: sebner-guest
Date: Thu Apr 30 20:33:20 2009
New Revision: 4885
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4885
Log:
quilt quilt quilt
Added:
packages/muine/trunk/debian/patches/correct-glade-signals.diff
packages/muine/trunk/debian/patches/metadata-crash.diff (with props)
packages/muine/trunk/debian/patches/series
Modified:
packages/muine/trunk/debian/control
packages/muine/trunk/debian/rules
Modified: packages/muine/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/control?rev=4885&op=diff
==============================================================================
--- packages/muine/trunk/debian/control (original)
+++ packages/muine/trunk/debian/control Thu Apr 30 20:33:20 2009
@@ -31,7 +31,7 @@
libmono-cairo2.0-cil (>= 1.1.13),
libnotify-dev,
libmusicbrainz4-dev,
- dpatch
+ quilt
Standards-Version: 3.8.1
Homepage: http://muine-player.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/muine/trunk/
Added: packages/muine/trunk/debian/patches/correct-glade-signals.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/correct-glade-signals.diff?rev=4885&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/correct-glade-signals.diff (added)
+++ packages/muine/trunk/debian/patches/correct-glade-signals.diff Thu Apr 30 20:33:20 2009
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## correct-glade-signals.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix non-working play album/play song buttons (connect events correctly)
+## DP: http://bugzilla.gnome.org/show_bug.cgi?id=560077
+## DP: http://git.gnome.org/cgit/muine/commit/?id=ed0e81a673fbe09fa18622ff437c36075d33984d
+
+ at DPATCH@
+diff -urNad muine-0.8.10~/data/glade/AddWindow.glade muine-0.8.10/data/glade/AddWindow.glade
+--- muine-0.8.10~/data/glade/AddWindow.glade 2008-09-28 16:28:35.000000000 +0100
++++ muine-0.8.10/data/glade/AddWindow.glade 2009-04-30 20:53:48.000000000 +0100
+@@ -19,8 +19,6 @@
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="has_separator">False</property>
+- <signal name="response" handler="OnWindowResponse" last_modification_time="Tue, 04 Jan 2005 17:48:15 GMT"/>
+- <signal name="delete_event" handler="OnWindowDeleteEvent" last_modification_time="Tue, 04 Jan 2005 17:48:11 GMT"/>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+diff -urNad muine-0.8.10~/src/AddWindow.cs muine-0.8.10/src/AddWindow.cs
+--- muine-0.8.10~/src/AddWindow.cs 2008-09-28 16:28:34.000000000 +0100
++++ muine-0.8.10/src/AddWindow.cs 2009-04-30 20:53:48.000000000 +0100
+@@ -23,7 +23,7 @@
+
+ namespace Muine
+ {
+- public abstract class AddWindow : Gtk.Window
++ public abstract class AddWindow : Gtk.Dialog
+ {
+ #region Enums
+ #region Enums.ResponseType
+@@ -116,6 +116,9 @@
+ this.entry_container.Add (this.entry);
+
+ // List
++ this.Response += OnWindowResponse;
++ this.DeleteEvent += OnWindowDeleteEvent;
++
+ this.list.RowActivated += OnRowActivated;
+ this.list.Selection.Changed += OnSelectionChanged;
+ scrolledwindow.Add (this.list);
Added: packages/muine/trunk/debian/patches/metadata-crash.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/metadata-crash.diff?rev=4885&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/metadata-crash.diff (added)
+++ packages/muine/trunk/debian/patches/metadata-crash.diff Thu Apr 30 20:33:20 2009
@@ -1,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## metadata-crash.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix crash when editing tracks externally (possibly some kind of race)
+## DP: http://bugzilla.gnome.org/show_bug.cgi?id=338738
+
+ at DPATCH@
+diff -urNad muine-0.8.10~/src/Metadata.cs muine-0.8.10/src/Metadata.cs
+--- muine-0.8.10~/src/Metadata.cs 2008-09-28 16:28:34.000000000 +0100
++++ muine-0.8.10/src/Metadata.cs 2009-04-30 20:51:10.000000000 +0100
+@@ -50,7 +50,7 @@
+
+ if (error_ptr != IntPtr.Zero) {
+ string error = GLib.Marshaller.PtrToStringGFree (error_ptr);
+- throw new Exception (String.Format (string_error_load, error));
++ throw new MetadataException (String.Format (string_error_load, error));
+ }
+ }
+
+@@ -262,4 +262,9 @@
+ get { return metadata_get_peak (raw); }
+ }
+ }
++
++ public class MetadataException: Exception
++ {
++ public MetadataException(string message) {}
++ }
+ }
+diff -urNad muine-0.8.10~/src/Metadata.cs.orig muine-0.8.10/src/Metadata.cs.orig
+diff -urNad muine-0.8.10~/src/SongDatabase.cs muine-0.8.10/src/SongDatabase.cs
+--- muine-0.8.10~/src/SongDatabase.cs 2008-09-28 16:28:34.000000000 +0100
++++ muine-0.8.10/src/SongDatabase.cs 2009-04-30 20:51:10.000000000 +0100
+@@ -134,6 +134,8 @@
+
+ } catch (InvalidOperationException) {
+ return;
++ } catch (MetadataException e) {
++ return;
+ }
+ }
+
+diff -urNad muine-0.8.10~/src/SongDatabase.cs.orig muine-0.8.10/src/SongDatabase.cs.orig
Propchange: packages/muine/trunk/debian/patches/metadata-crash.diff
------------------------------------------------------------------------------
svn:executable = *
Added: packages/muine/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/series?rev=4885&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/series (added)
+++ packages/muine/trunk/debian/patches/series Thu Apr 30 20:33:20 2009
@@ -1,0 +1,2 @@
+metadata-crash.diff
+correct-glade-signals.diff
Modified: packages/muine/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/rules?rev=4885&op=diff
==============================================================================
--- packages/muine/trunk/debian/rules (original)
+++ packages/muine/trunk/debian/rules Thu Apr 30 20:33:20 2009
@@ -2,7 +2,7 @@
# -*- makefile -*-
include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
More information about the Pkg-cli-apps-commits
mailing list