diff -Nru sakura-3.6.0/debian/changelog sakura-3.6.0/debian/changelog --- sakura-3.6.0/debian/changelog 2018-08-22 19:57:12.000000000 +0000 +++ sakura-3.6.0/debian/changelog 2018-09-27 17:40:14.000000000 +0000 @@ -1,8 +1,16 @@ -sakura (3.6.0-1ubuntu1) cosmic; urgency=medium +sakura (3.6.0-3) unstable; urgency=medium - * Add missing build-dependency on libpcre2-dev. + * Refresh patches + * Add patch to fix building with libvte 0.54 (Closes: #909744) - -- Steve Langasek Wed, 22 Aug 2018 12:57:12 -0700 + -- Andreas Rönnquist Thu, 27 Sep 2018 19:40:14 +0200 + +sakura (3.6.0-2) unstable; urgency=medium + + * Build-dep on libpcre2-dev (Closes: #906984) + * Remove a newline at end of d/changelog + + -- Andreas Rönnquist Wed, 22 Aug 2018 22:20:27 +0200 sakura (3.6.0-1) unstable; urgency=medium @@ -298,4 +306,3 @@ * Initial release (LP: #384711) -- Andrew Starr-Bochicchio Tue, 23 Jun 2009 23:58:16 -0400 - diff -Nru sakura-3.6.0/debian/control sakura-3.6.0/debian/control --- sakura-3.6.0/debian/control 2018-08-22 19:57:12.000000000 +0000 +++ sakura-3.6.0/debian/control 2018-09-27 15:00:59.000000000 +0000 @@ -1,8 +1,7 @@ Source: sakura Section: x11 Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Andrew Starr-Bochicchio +Maintainer: Andrew Starr-Bochicchio Uploaders: Andreas Rönnquist Build-Depends: cmake, debhelper (>= 11), diff -Nru sakura-3.6.0/debian/patches/0001-Add-Keywords-field-to-desktop-file.patch sakura-3.6.0/debian/patches/0001-Add-Keywords-field-to-desktop-file.patch --- sakura-3.6.0/debian/patches/0001-Add-Keywords-field-to-desktop-file.patch 2017-09-14 15:13:13.000000000 +0000 +++ sakura-3.6.0/debian/patches/0001-Add-Keywords-field-to-desktop-file.patch 2018-09-27 15:01:37.000000000 +0000 @@ -1,4 +1,3 @@ -From c21b3cba8d005b31b66888af1b3150cf027a7d24 Mon Sep 17 00:00:00 2001 From: Andrew Starr-Bochicchio Date: Sat, 6 Sep 2014 17:36:23 -0400 Subject: [PATCH] Add Keywords field to desktop file. @@ -7,9 +6,11 @@ sakura.desktop | 1 + 1 file changed, 1 insertion(+) +diff --git a/sakura.desktop b/sakura.desktop +index fb3f5b3..b91fa32 100644 --- a/sakura.desktop +++ b/sakura.desktop -@@ -95,5 +95,6 @@ +@@ -95,5 +95,6 @@ Exec=sakura Icon=terminal-tango Type=Application Categories=GTK;Utility;TerminalEmulator;System; diff -Nru sakura-3.6.0/debian/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch sakura-3.6.0/debian/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch --- sakura-3.6.0/debian/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch 1970-01-01 00:00:00.000000000 +0000 +++ sakura-3.6.0/debian/patches/0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch 2018-09-27 15:01:37.000000000 +0000 @@ -0,0 +1,69 @@ +From: Egmont Kobingler +Date: Thu, 27 Sep 2018 16:21:28 +0200 +Subject: * Bug #1790317 fixed: Crash with vte 0.54 + +--- + src/sakura.c | 29 +++-------------------------- + 1 file changed, 3 insertions(+), 26 deletions(-) + +diff --git a/src/sakura.c b/src/sakura.c +index e72a9aa..5eab95a 100644 +--- a/src/sakura.c ++++ b/src/sakura.c +@@ -339,6 +339,7 @@ struct terminal { + bool label_set_byuser; + GtkBorder padding; /* inner-property data */ + int colorset; ++ gulong exit_handler_id; + }; + + +@@ -984,31 +985,6 @@ sakura_eof (GtkWidget *widget, void *data) + if (npages==1) { + sakura_config_done(); + } +- +- /* Workaround for libvte strange behaviour. There is not child-exited signal for +- the last terminal, so we need to kill it here. Check with libvte authors about +- child-exited/eof signals */ +- if (gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook))==0) { +- +- term = sakura_get_page_term(sakura, 0); +- +- if (option_hold==TRUE) { +- SAY("hold option has been activated"); +- return; +- } +- +- //SAY("waiting for terminal pid (in eof) %d", term->pid); +- //waitpid(term->pid, &status, WNOHANG); +- /* TODO: check wait return */ +- /* Child should be automatically reaped because we don't use G_SPAWN_DO_NOT_REAP_CHILD flag */ +- g_spawn_close_pid(term->pid); +- +- sakura_del_tab(0); +- +- npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)); +- if (npages==0) +- sakura_destroy(); +- } + } + + /* This handler is called when window title changes, and is used to change window and notebook pages titles */ +@@ -3167,7 +3143,7 @@ sakura_add_tab() + g_signal_connect(G_OBJECT(term->vte), "bell", G_CALLBACK(sakura_beep), NULL); + g_signal_connect(G_OBJECT(term->vte), "increase-font-size", G_CALLBACK(sakura_increase_font), NULL); + g_signal_connect(G_OBJECT(term->vte), "decrease-font-size", G_CALLBACK(sakura_decrease_font), NULL); +- g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL); ++ term->exit_handler_id = g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL); + g_signal_connect(G_OBJECT(term->vte), "eof", G_CALLBACK(sakura_eof), NULL); + g_signal_connect(G_OBJECT(term->vte), "window-title-changed", G_CALLBACK(sakura_title_changed), NULL); + g_signal_connect_swapped(G_OBJECT(term->vte), "button-press-event", G_CALLBACK(sakura_button_press), sakura.menu); +@@ -3366,6 +3342,7 @@ sakura_del_tab(gint page) + } + + gtk_widget_hide(term->hbox); ++ g_signal_handler_disconnect (term->vte, term->exit_handler_id); + gtk_notebook_remove_page(GTK_NOTEBOOK(sakura.notebook), page); + + /* Find the next page, if it exists, and grab focus */ diff -Nru sakura-3.6.0/debian/patches/series sakura-3.6.0/debian/patches/series --- sakura-3.6.0/debian/patches/series 2018-05-02 21:48:13.000000000 +0000 +++ sakura-3.6.0/debian/patches/series 2018-09-27 17:37:36.000000000 +0000 @@ -1 +1,2 @@ 0001-Add-Keywords-field-to-desktop-file.patch +0002-Fixed-crash-with-vte-0.54-Bug-1790317.patch