Bug#771358: unblock: roxterm/2.9.5-1
tags 771358 - moreinfo thanks On 30/11/2014 11:46, Ivo De Decker wrote: Please go ahead, and remove the moreinfo tag from this bug once the upload is in ustable. OK, it's been sponsored (thanks Gregor Herrmann) and is now in unstable. Thanks for allowing the unblock. -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/547bb1df.7040...@realh.co.uk
Bug#771358: unblock: roxterm/2.9.5-1
tags 771358 - moreinfo thanks On 28/11/14 19:46, Jonathan Wiltshire wrote: Control: tag -1 moreinfo On Fri, Nov 28, 2014 at 07:27:21PM +, Tony Houghton wrote: Please unblock package roxterm; I have uploaded version 2.9.5-1 to mentors.debian.net for sponsorship. I can't unblock anything that's not in sid. OK. I did things in the wrong order, but it's turned out to have a positive outcome because a potential sponsor would like to see your decision before accepting it into unstable (#771361). I'm certainly willing to consider new upstream releases case-by-case, but the debdiff output you sent is for the binary packages, not the source. Please attach a source debdiff (i.e. against the .dscs, not the .changes) and remove the moreinfo tag, and I'll happily take a look. Sorry about that. Correct debdiff attached. diff -Nru roxterm-2.9.4/AppInfo.xml roxterm-2.9.5/AppInfo.xml --- roxterm-2.9.4/AppInfo.xml 2014-09-17 15:33:31.0 +0100 +++ roxterm-2.9.5/AppInfo.xml 2014-11-28 18:27:26.0 + @@ -3,7 +3,7 @@ Run text-based programs (command prompt) A medium-weight terminal emulator with a flexible GUI -2.9.4 (2014-09-17) + 2.9.5 (2014-11-28) Tony Houghton <h...@realh.co.uk> GNU General Public License http://roxterm.sourceforge.net diff -Nru roxterm-2.9.4/ChangeLog roxterm-2.9.5/ChangeLog --- roxterm-2.9.4/ChangeLog 2014-09-17 15:48:42.0 +0100 +++ roxterm-2.9.5/ChangeLog 2014-11-28 18:21:48.0 + @@ -1,6 +1,12 @@ +Version 2.9.5 +Author: Tony Houghton +Date: Fri, 28 Nov 2014 18:21:07 + + * Recognise _NET_WM_DESKTOP value 0x + * Check for unset $EDITOR when editing shortcuts + Version 2.9.4 Author: Tony Houghton -Date: Wed, 17 Sep 2014 15:47:06 +0100 +Date: Wed, 17 Sep 2014 17:17:35 +0100 * Fixed metadata_license and screenshot in appdata * Defer writing AppInfo.xml to mscript.py dist * Output translation files correctly diff -Nru roxterm-2.9.4/debian/changelog roxterm-2.9.5/debian/changelog --- roxterm-2.9.4/debian/changelog 2014-09-17 17:17:14.0 +0100 +++ roxterm-2.9.5/debian/changelog 2014-11-28 18:29:10.0 + @@ -1,3 +1,11 @@ +roxterm (2.9.5-1) unstable; urgency=medium + + * Recognise _NET_WM_DESKTOP special value 0x correctly. + * Don't crash if EDITOR env variable is unset when editing shortcuts +(Closes: #771022). + + -- Tony Houghton Fri, 28 Nov 2014 18:20:06 + + roxterm (2.9.4-1) unstable; urgency=low * Fixed metadata_license and non-default screenshot in appdata. diff -Nru roxterm-2.9.4/Help/Changes roxterm-2.9.5/Help/Changes --- roxterm-2.9.4/Help/Changes 2014-09-17 15:48:42.0 +0100 +++ roxterm-2.9.5/Help/Changes 2014-11-28 18:21:48.0 + @@ -1,6 +1,12 @@ +Version 2.9.5 +Author: Tony Houghton +Date: Fri, 28 Nov 2014 18:21:07 + + * Recognise _NET_WM_DESKTOP value 0x + * Check for unset $EDITOR when editing shortcuts + Version 2.9.4 Author: Tony Houghton -Date: Wed, 17 Sep 2014 15:47:06 +0100 +Date: Wed, 17 Sep 2014 17:17:35 +0100 * Fixed metadata_license and screenshot in appdata * Defer writing AppInfo.xml to mscript.py dist * Output translation files correctly diff -Nru roxterm-2.9.4/po/es.po roxterm-2.9.5/po/es.po --- roxterm-2.9.4/po/es.po 2014-09-17 15:48:46.0 +0100 +++ roxterm-2.9.5/po/es.po 2014-11-28 18:21:58.0 + @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: roxterm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-06 19:48+0100\n" +"POT-Creation-Date: 2014-09-29 16:59+0100\n" "PO-Revision-Date: 2013-05-23 15:18+\n" "Last-Translator: Tony Houghton \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/roxterm/language/"; @@ -1132,154 +1132,154 @@ msgid "Invalid geometry specification" msgstr "" -#: ../src/roxterm.c:4705 +#: ../src/roxterm.c:4706 msgid "" "Closing this ROXTerm tab may cause loss of data. Are you sure you want to " "continue?" msgstr "" -#: ../src/roxterm.c:4709 +#: ../src/roxterm.c:4710 msgid "" "You are about to close a ROXTerm window; this may cause loss of data. Are " "you sure you want to continue?" msgstr "" -#: ../src/roxterm.c:4713 +#: ../src/roxterm.c:4714 msgid "" "You are about to close a window containing multiple ROXTerm tabs; this may " "cause loss of data. Are you sure you want to continue?" msgstr "" -#: ../src/roxterm.c:4722 +#: ../src/roxterm.c:4723 msgid "ROXTerm: Confirm close" msgstr "" -#: ../src/roxterm.c:4726 +#: ../src/roxterm.c:4727 msgid "_Don't show this again" msgstr "" -#: ../src/roxterm.c:4734 +#: ../src/roxterm.c:4735 msgid "Only warn i
Bug#771358: unblock: roxterm/2.9.5-1
Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package roxterm; I have uploaded version 2.9.5-1 to
mentors.debian.net for sponsorship.
This release includes a fix for #771022 which I think is important, or
more severe, because crashing roxterm can cause loss of data in any
applications running in its terminals.
I see that new upstream releases are not normally unblocked, but I hope
that it can be considered in this case, although I am prepared to follow
the rules to the letter if deemed necessary. I am the upstream
maintainer as well as for the Debian package, and the changes are also
necessary upstream and have been committed to the main git branch for
some time. I think having two different version numbers for what is
effectively the same version would be more confusing for users and make
preparing the package a more complicated process for me.
The other change, although not related to a Debian bug, fixes a problem
with workspace handling reported upstream, and involves a small,
unobtrusive code modification. Again, I think trying to leave this
change out would cause more complication in preparing the package than
to leave it in.
debdiff output:
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second set of .debs but not in first
-
-rw-r--r-- root/root
/usr/lib/debug/.build-id/26/936947ed3879eef5b3dde8270eb801b36f9f39.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/44/4b78c6124ee00425fb2622e90872d7fbb1d800.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/a1/d275a3c797b3be2e7fb89ac82b378cb0635172.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/de/ade18468b44efecf87e3974f7731a7b3a5099a.debug
Files in first set of .debs but not in second
-
-rw-r--r-- root/root
/usr/lib/debug/.build-id/6a/1bda729e9d8223a914e170d19e5add35bbb65c.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/85/759ff0d63a91554bfbfbd32205f5e5ea9a1159.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/c6/91bd8c96d27fe7ad89f6e82ffea4858a2c7c4d.debug
-rw-r--r-- root/root
/usr/lib/debug/.build-id/c8/1167229518ae6281d2a5fb896252542258d2e7.debug
Control files of package roxterm: lines which differ (wdiff format)
---
Depends: roxterm-gtk3 (>= [-2.9.4-1)-] {+2.9.5-1)+}
Installed-Size: [-40-] {+64+}
Version: [-2.9.4-1-] {+2.9.5-1+}
Control files of package roxterm-common: lines which differ (wdiff format)
--
Installed-Size: [-887-] {+1095+}
Version: [-2.9.4-1-] {+2.9.5-1+}
Control files of package roxterm-gtk2: lines which differ (wdiff format)
Depends: librsvg2-common, roxterm-common (= [-2.9.4-1),-] {+2.9.5-1),+}
libc6 (>= 2.14), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.78),
libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.37.3), libgtk2.0-0
(>= 2.24.0), libice6 (>= 1:1.0.0), libpango-1.0-0 (>= 1.14.0), libsm6,
libvte9 (>= 1:0.28.0), libx11-6
Installed-Size: [-395-] {+431+}
Version: [-2.9.4-1-] {+2.9.5-1+}
Control files of package roxterm-gtk2-dbg: lines which differ (wdiff format)
Depends: roxterm-gtk2 (= [-2.9.4-1)-] {+2.9.5-1)+}
Installed-Size: [-568-] {+611+}
Version: [-2.9.4-1-] {+2.9.5-1+}
Control files of package roxterm-gtk3: lines which differ (wdiff format)
Depends: librsvg2-common, roxterm-common (= [-2.9.4-1),-] {+2.9.5-1),+}
libc6 (>= 2.14), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.78),
libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.37.3), libgtk-3-0 (>=
3.9.12), libice6 (>= 1:1.0.0), libpango-1.0-0 (>= 1.14.0), libsm6,
libvte-2.90-9 (>= 1:0.27.90), libx11-6
Installed-Size: [-391-] {+427+}
Version: [-2.9.4-1-] {+2.9.5-1+}
Control files of package roxterm-gtk3-dbg: lines which differ (wdiff format)
Depends: roxterm-gtk3 (= [-2.9.4-1)-] {+2.9.5-1)+}
Installed-Size: [-494-] {+538+}
Version: [-2.9.4-1-] {+2.9.5-1+}
unblock roxterm/2.9.5-1
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/5478cc99.5040...@realh.co.uk
Freeze exception for roxterm 1.18.5-3
Hi, Please could a freeze exception be made for roxterm 1.18.5-3 which fixes bug 598971. Although there are no reported symptoms in Debian the faulty code contributed to quite a serious problem in Ubuntu ie a terminal emulator failing to set TERM to something useful. And as the fix is very small I think the safer option is to include this new version in Squeeze. NB the package has already been sponsored and uploaded to unstable by Kumar Appaiah. -- TH * http://www.realh.co.uk -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4cb470eb.5030...@realh.co.uk
Re: Freeze exception for roxterm 1.18.5-2
On Thu, 26 Aug 2010 22:29:08 +0200 Mehdi Dogguy wrote: > Are you confident enough with the patch now? Did it get some testing? > Any new issues? It's been working without issues for me since I finalised the current version of the patch. -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100826215214.5e3fa...@toddler
Re: Freeze exception for roxterm 1.18.5-2
I'm so sorry and embarrassed, but I've already found another, more serious, bug in roxterm introduced by the supposed "fix". This time I'll try to be more imaginative in testing it to destruction before uploading a new version. -- TH * http://www.realh.co.uk -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20100815210008.0a374...@realh.co.uk
Re: Freeze exception for roxterm 1.18.5-2
On Sun, 15 Aug 2010 14:06:43 +0100
Tony Houghton wrote:
> Shortly after the freeze a bug was found in roxterm 1.18.5 and I would
> like to have it fixed in squeeze by allowing the inclusion of 1.18.5-2.
> The Debian bug is 592984
> <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592984>.
Inevitably, after thinking everything was fixed and posting the above, I
found a use case that wasn't being handled correctly (incorrect resizing
when removing a tab from a window), and while testing that I found
another small problem with window titles not being set up on new windows
created for dragged out tabs. I've included the svn logs and diffs below
and attached the new quilt patch, and updated the package on
mentors.d.n.
Apologies to anyone who already started reviewing the old patch.
r815 | realh | 2010-08-15 16:11:30 +0100 (Sun, 15 Aug 2010) | 5 lines
Always cache/restore size when removing a tab.
There was a spurious resize even if the presence or not
of the tab bar was unchanged.
Index: src/multitab.c
===
--- src/multitab.c (revision 814)
+++ src/multitab.c (revision 815)
@@ -1688,12 +1688,12 @@
}
else
{
+multi_win_cache_size(win);
if (win->ntabs == 1)
{
tab = win->tabs->data;
if (!win->always_show_tabs)
{
-multi_win_cache_size(win);
multi_win_hide_tabs(win);
}
if (win->tab_pos != GTK_POS_LEFT && win->tab_pos != GTK_POS_RIGHT)
And on testing that I found another small problem:
r816 | realh | 2010-08-15 16:35:11 +0100 (Sun, 15 Aug 2010) | 2 lines
Initialise titles correctly on new windows for dragged out tabs.
Index: src/multitab.c
===
--- src/multitab.c (revision 815)
+++ src/multitab.c (revision 816)
@@ -646,6 +646,13 @@
multi_win_set_fullscreen(win, TRUE);
else if (multi_win_is_maximised(old_win))
gtk_window_maximize(GTK_WINDOW(win->gtkwin));
+if (!win->tabs)
+{
+win->default_title_template = old_win->default_title_template ?
+g_strdup(old_win->default_title_template) : NULL;
+win->title_template = old_win->default_title_template ?
+g_strdup(old_win->default_title_template) : NULL;
+}
multi_tab_remove_from_parent(tab, FALSE);
multi_win_add_tab(win, tab, position, FALSE);
multi_win_set_geometry_hints_for_tab(win, tab);
--
TH * http://www.realh.co.uk
From: Tony Houghton
Description: Fix issues with tab initialisation and sizing etc.
The next upstream release will also include new features, so this patch
cherry-picks the bug fixes which affect Debian to make them more eligible for
inclusion in Squeeze post-freeze.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592984
Bug: https://sourceforge.net/tracker/?func=detail&aid=3041926&group_id=124080&atid=698428
Bug: https://sourceforge.net/tracker/?func=detail&aid=2996296&group_id=124080&atid=698428
Origin: upstream,
<http://roxterm.svn.sourceforge.net/viewvc/roxterm/trunk/roxterm/>,
revisions 792-298,801-810
Index: roxterm-1.18.5/src/multitab.c
===
--- roxterm-1.18.5.orig/src/multitab.c 2010-08-15 13:30:55.872914427 +0100
+++ roxterm-1.18.5/src/multitab.c 2010-08-15 17:00:31.360255404 +0100
@@ -81,13 +81,6 @@
gboolean show_menu_bar;
Options *shortcuts;
GtkAccelGroup *accel_group;
-int child_width, child_height; /* Need to store size of child widget before
- removing or adding a tab so we can
- correct size afterwards */
-int ignore_size_allocate; /* 0 = Don't ignore
- 1 = Ignore
- 2 = Special case after tab label has
- changed */
MultiTabSelectionHandler tab_selection_handler;
gboolean menu_bar_set;/* Menu bar can be configured either from
profile when opening a window, or when user
@@ -108,6 +101,8 @@
gboolean composite;
#endif
char *display_name;
+int cached_width, cached_height;
+gulong size_alloc_tag;
};
static double multi_win_zoom_factors[] = {
@@ -204,8 +199,7 @@
multi_tab_get_show_close_button = get_show_close_button;
}
-MultiTab *multi_tab_new0(MultiWin * parent,
Freeze exception for roxterm 1.18.5-2
Hi,
I am the upstream developer and sponsored Debian maintainer of roxterm;
the current release in testing and unstable is 1.18.5-1.
Shortly after the freeze a bug was found in roxterm 1.18.5 and I would
like to have it fixed in squeeze by allowing the inclusion of 1.18.5-2.
The Debian bug is 592984
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592984>.
Unfortunately there was no satisfactory quick fix and I had to rewrite a
considerable amount of code. On the positive side I think the new code
is simpler and "cleaner" than the new code. I have some other changes in
the pipeline for the next upstream release, and on consulting
debian-mentors we decided the best action was to backport the bug fixes
alone to 1.18.5.
I've attached the diff and the new package is waiting to be sponsored on
mentors.debian.net:
- URL: http://mentors.debian.net/debian/pool/main/r/roxterm
- Source repository: deb-src http://mentors.debian.net/debian unstable main
contrib non-free
- dget http://mentors.debian.net/debian/pool/main/r/roxterm/roxterm_1.18.5-2.dsc
Please Cc all replies to my sponsor - George Danchev -
and me; if and when it gets approved here he'll upload it to unstable.
--
TH * http://www.realh.co.uk
From: Tony Houghton
Description: Fix issues with tab initialisation and sizing etc.
The next upstream release will also include new features, so this patch
cherry-picks the bug fixes which affect Debian to make them more eligible for
inclusion in Squeeze post-freeze.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592984
Bug: https://sourceforge.net/tracker/?func=detail&aid=3041926&group_id=124080&atid=698428
Bug: https://sourceforge.net/tracker/?func=detail&aid=2996296&group_id=124080&atid=698428
Origin: upstream,
<http://roxterm.svn.sourceforge.net/viewvc/roxterm/trunk/roxterm/>,
revisions 792-298,801-810
Index: roxterm-1.18.5/src/multitab.c
===
--- roxterm-1.18.5.orig/src/multitab.c 2010-08-14 21:14:14.518532321 +0100
+++ roxterm-1.18.5/src/multitab.c 2010-08-15 13:30:00.416242990 +0100
@@ -81,13 +81,6 @@
gboolean show_menu_bar;
Options *shortcuts;
GtkAccelGroup *accel_group;
-int child_width, child_height; /* Need to store size of child widget before
- removing or adding a tab so we can
- correct size afterwards */
-int ignore_size_allocate; /* 0 = Don't ignore
- 1 = Ignore
- 2 = Special case after tab label has
- changed */
MultiTabSelectionHandler tab_selection_handler;
gboolean menu_bar_set;/* Menu bar can be configured either from
profile when opening a window, or when user
@@ -108,6 +101,8 @@
gboolean composite;
#endif
char *display_name;
+int cached_width, cached_height;
+gulong size_alloc_tag;
};
static double multi_win_zoom_factors[] = {
@@ -204,8 +199,7 @@
multi_tab_get_show_close_button = get_show_close_button;
}
-MultiTab *multi_tab_new0(MultiWin * parent, gpointer user_data_template,
-gboolean make_current)
+MultiTab *multi_tab_new(MultiWin * parent, gpointer user_data_template)
{
MultiTab *tab = g_new0(MultiTab, 1);
@@ -216,8 +210,7 @@
g_object_set_data(G_OBJECT(tab->widget), "roxterm_tab", tab);
multi_win_add_tab(parent, tab, -1, FALSE);
-if (make_current)
-multi_win_select_tab(parent, tab);
+multi_win_select_tab(parent, tab);
return tab;
}
@@ -273,13 +266,11 @@
{
MultiWin *win = tab->parent;
-win->ignore_size_allocate = 1;
win->ignore_tabs_moving = TRUE;
multi_tab_delete_without_notifying_parent(tab, TRUE);
if (!multi_win_notify_tab_removed(win, tab))
{
win->ignore_tabs_moving = FALSE;
-win->ignore_size_allocate = 0;
}
}
@@ -293,6 +284,100 @@
return tab->parent ? tab->parent->display_name : NULL;
}
+void multi_win_set_geometry_hints(MultiWin *win, GtkWidget *child,
+GdkGeometry *geometry, GdkWindowHints geom_mask)
+{
+gtk_window_set_geometry_hints(GTK_WINDOW(win->gtkwin), child,
+geometry, geom_mask);
+}
+
+static void multi_win_set_geometry_hints_for_tab(MultiWin * win, MultiTab * tab)
+{
+GdkGeometry geom;
+GdkWindowHints hints;
+
+if (multi_win_geometry_func)
+{
+(*multi_win_geometry_func) (tab->user_data, &geom, &hints);
+multi_win_set_geometry_hints(win, tab->active_widget, &geom, hints);
+}
+}
+
+static void multi_win_restore_cached_size(GtkWidget *widget,
+GtkAllocation *alloc, MultiWin *win)
+{
+/*
+int px, py;
+GdkGeometry dummy_geom;
+*/
+int w = win->cached_width;
+
