[SCM] easytag/master: Drop upstream patches
amigadave-guest at users.alioth.debian.org
amigadave-guest at users.alioth.debian.org
Sat Apr 12 11:16:14 UTC 2014
The following commit has been merged in the master branch:
commit 16f4825b31e43ceae744cc3e1178a534b623ce22
Author: David King <amigadave at amigadave.com>
Date: Sat Apr 12 09:31:24 2014 +0100
Drop upstream patches
diff --git a/debian/patches/avoid-unknown-image-save-crash.patch b/debian/patches/avoid-unknown-image-save-crash.patch
deleted file mode 100644
index 3b7c0da..0000000
--- a/debian/patches/avoid-unknown-image-save-crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Avoid crash when saving unknown image types
-Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=6563a0989a6d35d618a950262bd81d2ac50ed0ed
-Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=6563a0989a6d35d618a950262bd81d2ac50ed0ed
-From: David King <amigadave at amigadave.com>
----
-diff --git a/src/picture.c b/src/picture.c
-index b6b8f26..8e74b93 100644
---- a/src/picture.c
-+++ b/src/picture.c
-@@ -988,7 +988,8 @@ const gchar *Picture_Mime_Type_String (Picture_Format format)
- case PICTURE_FORMAT_PNG:
- return "image/png";
- default:
-- return NULL;
-+ g_debug ("%s", "Unrecognised image MIME type");
-+ return "application/octet-stream";
- }
- }
-
---
-cgit v0.9.2
diff --git a/debian/patches/fix-close-button-crash.patch b/debian/patches/fix-close-button-crash.patch
deleted file mode 100644
index 2ae8074..0000000
--- a/debian/patches/fix-close-button-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix crash when clicking the window close button
-Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=5442958d1ea34a992007bbb2bc047a9a5515387d
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=725568
-Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1071563
-Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=5442958d1ea34a992007bbb2bc047a9a5515387d
-From: David King <amigadave at amigadave.com>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/src/easytag.c b/src/easytag.c
-index 29eeb82..7f6ecc7 100644
---- a/src/easytag.c
-+++ b/src/easytag.c
-@@ -156,6 +156,17 @@ static gboolean et_tag_field_on_key_press_event (GtkEntry *entry,
- GdkEventKey *event,
- gpointer user_data);
-
-+static gboolean
-+on_main_window_delete_event (GtkWidget *window,
-+ GdkEvent *event,
-+ gpointer user_data)
-+{
-+ Quit_MainWindow ();
-+
-+ /* Handled the event, so stop propagation. */
-+ return TRUE;
-+}
-+
- /*
- * common_init:
- * @application: the application
-@@ -225,8 +236,8 @@ common_init (GApplication *application)
- // This part is needed to set correctly the position of handle panes
- gtk_window_set_default_size(GTK_WINDOW(MainWindow),MAIN_WINDOW_WIDTH,MAIN_WINDOW_HEIGHT);
-
-- g_signal_connect(G_OBJECT(MainWindow),"delete_event",G_CALLBACK(Quit_MainWindow),NULL);
-- g_signal_connect(G_OBJECT(MainWindow),"destroy",G_CALLBACK(Quit_MainWindow),NULL);
-+ g_signal_connect (MainWindow, "delete-event",
-+ G_CALLBACK (on_main_window_delete_event), NULL);
-
- /* Minimised window icon */
- gtk_widget_realize(MainWindow);
---
-cgit v0.9.2
diff --git a/debian/patches/fix-decline-delete-file-crash.patch b/debian/patches/fix-decline-delete-file-crash.patch
deleted file mode 100644
index 0b47812..0000000
--- a/debian/patches/fix-decline-delete-file-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Avoid crash when declining deleting a file
-Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=17afda799f95c97263e52ab41fa8c9676aba3021
-Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=17afda799f95c97263e52ab41fa8c9676aba3021
-From: David King <amigadave at amigadave.com>
----
-diff --git a/src/easytag.c b/src/easytag.c
-index 40dbeec..52a1619 100644
---- a/src/easytag.c
-+++ b/src/easytag.c
-@@ -2637,9 +2637,14 @@ Delete_Selected_Files_With_Answer (void)
- ET_Remove_File_From_File_List(ETFile);
- break;
- case 0:
-- Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
-- error->message);
-- g_error_free (error);
-+ /* Distinguish between the file being skipped, and there being
-+ * an error during deletion. */
-+ if (error)
-+ {
-+ Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
-+ error->message);
-+ g_clear_error (&error);
-+ }
- break;
- case -1:
- // Stop deleting files + reinit progress bar
---
-cgit v0.9.2
diff --git a/debian/patches/fix-load-text-file-dialog-crash.patch b/debian/patches/fix-load-text-file-dialog-crash.patch
deleted file mode 100644
index 3d00855..0000000
--- a/debian/patches/fix-load-text-file-dialog-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix load from text file dialogue response
-Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=e0c7574ef2ea5a6a3cc8ff92bd03d72d3f73e739
-Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=e0c7574ef2ea5a6a3cc8ff92bd03d72d3f73e739
-From: David King <amigadave at amigadave.com>
----
-diff --git a/src/misc.c b/src/misc.c
-index af68db0..721b081 100644
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -2724,7 +2724,7 @@ void Open_Load_Filename_Window (void)
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_APPLY,
-- GTK_RESPONSE_ACCEPT,
-+ GTK_RESPONSE_APPLY,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (LoadFilenameWindow),
- GTK_RESPONSE_ACCEPT);
---
-cgit v0.9.2
diff --git a/debian/patches/series b/debian/patches/series
index 18e8dc0..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +0,0 @@
-fix-close-button-crash.patch
-fix-decline-delete-file-crash.patch
-avoid-unknown-image-save-crash.patch
-fix-load-text-file-dialog-crash.patch
--
easytag packaging
More information about the pkg-multimedia-commits
mailing list