Comment 2 for bug 1703307

Revision history for this message
Simon Quigley (tsimonq2) wrote :

As said before, the fix is in 0.3.0-2, but here's the diff between 0.3.0-1 and 0.3.0-2: http://launchpadlibrarian.net/318978332/lxterminal_0.3.0-1_0.3.0-2.diff.gz

Part of this diff was released in 0.3.0-1ubuntu0.1 as a security update. This was tracked in bug 1690416. The remaining delta (excluding the changelog) is as follows:

diff -Nru lxterminal-0.3.0/debian/patches/02-fix-tab-name-dialog.diff lxterminal-0.3.0/debian/patches/02-fix-tab-name-dialog.diff
--- lxterminal-0.3.0/debian/patches/02-fix-tab-name-dialog.diff 1970-01-01 00:00:00.000000000 +0000
+++ lxterminal-0.3.0/debian/patches/02-fix-tab-name-dialog.diff 2017-05-09 04:13:07.000000000 +0000
@@ -0,0 +1,22 @@
+From: Yao Wei (魏銘廷) <email address hidden>
+Subject: fix: tab name renaming
+
+* fix: display dialog buttons for changing tab name
+
+Origin: upstream, https://git.lxde.org/gitweb/?p=lxde/lxterminal.git;a=commit;h=e2ad448556ee0f78ebdd0e36dc16e96702326fb6
+Bug: https://github.com/lxde/lxterminal/issues/30
+Bug-Debian: http://bugs.debian.org/862096
+
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -573,8 +573,8 @@
+ _("Name Tab"),
+ GTK_WINDOW(terminal->window),
+ 0,
+- NULL, GTK_RESPONSE_CANCEL,
+- NULL, GTK_RESPONSE_OK,
++ _("_Cancel"), GTK_RESPONSE_CANCEL,
++ _("_OK"), GTK_RESPONSE_OK,
+ NULL);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "lxterminal"))
diff -Nru lxterminal-0.3.0/debian/patches/series lxterminal-0.3.0/debian/patches/series
--- lxterminal-0.3.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ lxterminal-0.3.0/debian/patches/series 2017-05-09 04:13:07.000000000 +0000
@@ -0,0 +1,2 @@
01-cve-2016-10369.diff
+02-fix-tab-name-dialog.diff

I think the best option at this point is to force sync 0.3.0-2 from Buster (not Sid as 0.3.0-3 was uploaded and that is outside the scope of this SRU) to Zesty. It wouldn't necessarily make a difference (I believe) if we were to force sync versus just increasing the delta, but it seems cleaner to me.

Thoughts?