diff -Nru gnome-terminal-3.6.2/debian/changelog gnome-terminal-3.6.2/debian/changelog --- gnome-terminal-3.6.2/debian/changelog 2013-12-16 02:32:20.000000000 +0400 +++ gnome-terminal-3.6.2/debian/changelog 2015-02-16 12:39:45.000000000 +0300 @@ -1,3 +1,12 @@ +gnome-terminal (3.6.2-0ubuntu1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/20_add_alt_screen_toggle_ui.patch: dropped since + it does nothing with vte3 >= 0.34.9. The alternate screen scroll + is always enabled in vte3 since that version. + + -- Vlad Orlov Mon, 16 Feb 2015 12:36:46 +0300 + gnome-terminal (3.6.2-0ubuntu1) trusty; urgency=medium * New upstream release: diff -Nru gnome-terminal-3.6.2/debian/patches/20_add_alt_screen_toggle_ui.patch gnome-terminal-3.6.2/debian/patches/20_add_alt_screen_toggle_ui.patch --- gnome-terminal-3.6.2/debian/patches/20_add_alt_screen_toggle_ui.patch 2013-12-16 02:32:20.000000000 +0400 +++ gnome-terminal-3.6.2/debian/patches/20_add_alt_screen_toggle_ui.patch 1970-01-01 03:00:00.000000000 +0300 @@ -1,148 +0,0 @@ -Description: Hook new vte alternate screen scrolling toggle via UI -Author: ? - -Index: gnome-terminal-3.6.2/src/gnome-terminal.schemas.in -=================================================================== ---- gnome-terminal-3.6.2.orig/src/gnome-terminal.schemas.in 2013-12-16 11:22:52.388435875 +1300 -+++ gnome-terminal-3.6.2/src/gnome-terminal.schemas.in 2013-12-16 11:22:52.380435875 +1300 -@@ -418,6 +418,23 @@ - - - -+ /schemas/apps/gnome-terminal/profiles/Default/alternate_screen_scroll -+ /apps/gnome-terminal/profiles/Default/alternate_screen_scroll -+ gnome-terminal -+ bool -+ true -+ -+ -+ Whether to send keystrokes for alternate screen scrolling -+ -+ -+ If true, send Up/Down keystrokes for scrolling when using alternate -+ screen or when scrolling is restricted. -+ -+ -+ -+ -+ - /schemas/apps/gnome-terminal/profiles/Default/exit_action - /apps/gnome-terminal/profiles/Default/exit_action - gnome-terminal -Index: gnome-terminal-3.6.2/src/profile-editor.c -=================================================================== ---- gnome-terminal-3.6.2.orig/src/profile-editor.c 2013-12-16 11:22:52.388435875 +1300 -+++ gnome-terminal-3.6.2/src/profile-editor.c 2013-12-16 11:22:52.380435875 +1300 -@@ -279,6 +279,10 @@ - SET_SENSITIVE ("scroll-on-output-checkbutton", - !terminal_profile_property_locked (profile, TERMINAL_PROFILE_SCROLL_ON_OUTPUT)); - -+ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)) -+ SET_SENSITIVE ("alternate-screen-scroll-checkbutton", -+ !terminal_profile_property_locked (profile, TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)); -+ - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_EXIT_ACTION)) - SET_SENSITIVE ("exit-action-combobox", - !terminal_profile_property_locked (profile, TERMINAL_PROFILE_EXIT_ACTION)); -@@ -914,6 +918,7 @@ - CONNECT ("scrollbar-position-combobox", TERMINAL_PROFILE_SCROLLBAR_POSITION); - CONNECT ("scroll-on-keystroke-checkbutton", TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE); - CONNECT ("scroll-on-output-checkbutton", TERMINAL_PROFILE_SCROLL_ON_OUTPUT); -+ CONNECT ("alternate-screen-scroll-checkbutton", TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL); - CONNECT ("show-menubar-checkbutton", TERMINAL_PROFILE_DEFAULT_SHOW_MENUBAR); - CONNECT ("solid-radiobutton", TERMINAL_PROFILE_BACKGROUND_TYPE); - CONNECT ("system-font-checkbutton", TERMINAL_PROFILE_USE_SYSTEM_FONT); -Index: gnome-terminal-3.6.2/src/profile-preferences.glade -=================================================================== ---- gnome-terminal-3.6.2.orig/src/profile-preferences.glade 2013-12-16 11:22:52.388435875 +1300 -+++ gnome-terminal-3.6.2/src/profile-preferences.glade 2013-12-16 11:22:52.380435875 +1300 -@@ -2417,6 +2417,27 @@ - - - -+ -+ -+ True -+ True -+ Use keystrokes to scroll on _alternate screen -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ 2 -+ 5 -+ 6 -+ -+ -+ -+ - - - True -Index: gnome-terminal-3.6.2/src/terminal-profile.c -=================================================================== ---- gnome-terminal-3.6.2.orig/src/terminal-profile.c 2013-12-16 11:22:52.388435875 +1300 -+++ gnome-terminal-3.6.2/src/terminal-profile.c 2013-12-16 11:22:52.380435875 +1300 -@@ -77,6 +77,7 @@ - PROP_SCROLLBAR_POSITION, - PROP_SCROLL_ON_KEYSTROKE, - PROP_SCROLL_ON_OUTPUT, -+ PROP_ALTERNATE_SCREEN_SCROLL, - PROP_SILENT_BELL, - PROP_TITLE, - PROP_TITLE_MODE, -@@ -117,6 +118,7 @@ - #define KEY_SCROLLBAR_POSITION "scrollbar_position" - #define KEY_SCROLL_ON_KEYSTROKE "scroll_on_keystroke" - #define KEY_SCROLL_ON_OUTPUT "scroll_on_output" -+#define KEY_ALTERNATE_SCREEN_SCROLL "alternate_screen_scroll" - #define KEY_SILENT_BELL "silent_bell" - #define KEY_TITLE_MODE "title_mode" - #define KEY_TITLE "title" -@@ -157,6 +159,7 @@ - #define DEFAULT_SCROLLBAR_POSITION (TERMINAL_SCROLLBAR_RIGHT) - #define DEFAULT_SCROLL_ON_KEYSTROKE (TRUE) - #define DEFAULT_SCROLL_ON_OUTPUT (FALSE) -+#define DEFAULT_ALTERNATE_SCREEN_SCROLL (FALSE) - #define DEFAULT_SILENT_BELL (FALSE) - #define DEFAULT_TITLE_MODE (TERMINAL_TITLE_REPLACE) - #define DEFAULT_TITLE (N_("Terminal")) -@@ -1315,6 +1318,7 @@ - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLLBACK_UNLIMITED, DEFAULT_SCROLLBACK_UNLIMITED, KEY_SCROLLBACK_UNLIMITED); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_KEYSTROKE, DEFAULT_SCROLL_ON_KEYSTROKE, KEY_SCROLL_ON_KEYSTROKE); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_OUTPUT, DEFAULT_SCROLL_ON_OUTPUT, KEY_SCROLL_ON_OUTPUT); -+ TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALTERNATE_SCREEN_SCROLL, DEFAULT_ALTERNATE_SCREEN_SCROLL, KEY_ALTERNATE_SCREEN_SCROLL); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (SILENT_BELL, DEFAULT_SILENT_BELL, KEY_SILENT_BELL); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (UPDATE_RECORDS, DEFAULT_UPDATE_RECORDS, KEY_UPDATE_RECORDS); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_CUSTOM_COMMAND, DEFAULT_USE_CUSTOM_COMMAND, KEY_USE_CUSTOM_COMMAND); -Index: gnome-terminal-3.6.2/src/terminal-profile.h -=================================================================== ---- gnome-terminal-3.6.2.orig/src/terminal-profile.h 2013-12-16 11:22:52.388435875 +1300 -+++ gnome-terminal-3.6.2/src/terminal-profile.h 2013-12-16 11:22:52.380435875 +1300 -@@ -94,6 +94,7 @@ - #define TERMINAL_PROFILE_SCROLLBAR_POSITION "scrollbar-position" - #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE "scroll-on-keystroke" - #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT "scroll-on-output" -+#define TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL "alternate-screen-scroll" - #define TERMINAL_PROFILE_SILENT_BELL "silent-bell" - #define TERMINAL_PROFILE_TITLE_MODE "title-mode" - #define TERMINAL_PROFILE_TITLE "title" -Index: gnome-terminal-3.6.2/src/terminal-screen.c -=================================================================== ---- gnome-terminal-3.6.2.orig/src/terminal-screen.c 2013-12-16 11:22:52.388435875 +1300 -+++ gnome-terminal-3.6.2/src/terminal-screen.c 2013-12-16 11:22:52.384435875 +1300 -@@ -972,6 +972,9 @@ - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_OUTPUT)) - vte_terminal_set_scroll_on_output (vte_terminal, - terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SCROLL_ON_OUTPUT)); -+ if (!prop_name || prop_name == I_(TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)) -+ vte_terminal_set_alternate_screen_scroll (vte_terminal, -+ terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_ALTERNATE_SCREEN_SCROLL)); - if (!prop_name || - prop_name == I_(TERMINAL_PROFILE_SCROLLBACK_LINES) || - prop_name == I_(TERMINAL_PROFILE_SCROLLBACK_UNLIMITED)) diff -Nru gnome-terminal-3.6.2/debian/patches/series gnome-terminal-3.6.2/debian/patches/series --- gnome-terminal-3.6.2/debian/patches/series 2013-12-16 02:32:20.000000000 +0400 +++ gnome-terminal-3.6.2/debian/patches/series 2015-02-16 12:40:58.000000000 +0300 @@ -1,6 +1,5 @@ 01_onlyshowin.patch 03_add_keywords.desktop -20_add_alt_screen_toggle_ui.patch 50_add_unity_quicklist.patch 51_fix_memleak_in_name_lost_cb.patch 60_add_lp_handler.patch