r40734 - in /desktop/experimental/vte3/debian: ./ patches/

ah at users.alioth.debian.org ah at users.alioth.debian.org
Mon Feb 24 20:56:00 UTC 2014 

Author: ah
Date: Mon Feb 24 20:56:00 2014
New Revision: 40734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40734
Log:
* New upstream release.
* Make debian/patches/01_scroll_notebook.patch apply again.
* Drop debian/patches/03_scroll_region_updates.patch, applied upstream.
* Have quilt refresh the following patches:
  - debian/patches/04_workaround_resources_compiler_path.patch
  - debian/patches/25_optional-ncurses.patch
  - debian/patches/60_termcap-home-end.patch
* Add two new symbols to debian/libvte-2.90-9.symbols

Removed:
    desktop/experimental/vte3/debian/patches/03_scroll_region_updates.patch
Modified:
    desktop/experimental/vte3/debian/changelog
    desktop/experimental/vte3/debian/libvte-2.90-9.symbols
    desktop/experimental/vte3/debian/patches/01_scroll_notebook.patch
    desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch
    desktop/experimental/vte3/debian/patches/25_optional-ncurses.patch
    desktop/experimental/vte3/debian/patches/60_termcap-home-end.patch
    desktop/experimental/vte3/debian/patches/series

Modified: desktop/experimental/vte3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/changelog?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/vte3/debian/changelog	[utf-8] Mon Feb 24 20:56:00 2014
@@ -1,3 +1,16 @@
+vte3 (1:0.35.2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Make debian/patches/01_scroll_notebook.patch apply again.
+  * Drop debian/patches/03_scroll_region_updates.patch, applied upstream.
+  * Have quilt refresh the following patches:
+    - debian/patches/04_workaround_resources_compiler_path.patch
+    - debian/patches/25_optional-ncurses.patch
+    - debian/patches/60_termcap-home-end.patch
+  * Add two new symbols to debian/libvte-2.90-9.symbols
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 24 Feb 2014 20:28:46 +0100
+
 vte3 (1:0.34.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/experimental/vte3/debian/libvte-2.90-9.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/libvte-2.90-9.symbols?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/libvte-2.90-9.symbols	[utf-8] (original)
+++ desktop/experimental/vte3/debian/libvte-2.90-9.symbols	[utf-8] Mon Feb 24 20:56:00 2014
@@ -65,6 +65,7 @@
  vte_terminal_get_padding at Base 1:0.27.2
  vte_terminal_get_pty at Base 1:0.27.2
  vte_terminal_get_pty_object at Base 1:0.27.2
+ vte_terminal_get_rewrap_on_resize at Base 1:0.35.2
  vte_terminal_get_row_count at Base 1:0.27.2
  vte_terminal_get_status_line at Base 1:0.27.2
  vte_terminal_get_text at Base 1:0.27.2
@@ -135,6 +136,7 @@
  vte_terminal_set_opacity at Base 1:0.27.2
  vte_terminal_set_pty at Base 1:0.27.2
  vte_terminal_set_pty_object at Base 1:0.27.2
+ vte_terminal_set_rewrap_on_resize at Base 1:0.35.2
  vte_terminal_set_scroll_background at Base 1:0.27.2
  vte_terminal_set_scroll_on_keystroke at Base 1:0.27.2
  vte_terminal_set_scroll_on_output at Base 1:0.27.2

Modified: desktop/experimental/vte3/debian/patches/01_scroll_notebook.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/01_scroll_notebook.patch?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/patches/01_scroll_notebook.patch	[utf-8] (original)
+++ desktop/experimental/vte3/debian/patches/01_scroll_notebook.patch	[utf-8] Mon Feb 24 20:56:00 2014
@@ -4,11 +4,9 @@
 
 Corresponding GTK+ bug: GNOME #145244
 
-Index: vte-0.34.9/src/vte.c
-===================================================================
---- vte-0.34.9.orig/src/vte.c	2013-10-23 14:49:45.844097520 +0200
-+++ vte-0.34.9/src/vte.c	2013-10-23 14:49:45.840097469 +0200
-@@ -11357,6 +11357,13 @@
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -11527,6 +11527,13 @@
  
  	vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
  
@@ -19,6 +17,6 @@
 +		return FALSE;
 +#endif
 +
- 	_VTE_DEBUG_IF(VTE_DEBUG_EVENTS)
- 		switch (event->direction) {
- 		case GDK_SCROLL_UP:
+ 	switch (event->direction) {
+ 	case GDK_SCROLL_UP:
+ 		terminal->pvt->mouse_smooth_scroll_delta -= 1.;

Modified: desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch	[utf-8] (original)
+++ desktop/experimental/vte3/debian/patches/04_workaround_resources_compiler_path.patch	[utf-8] Mon Feb 24 20:56:00 2014
@@ -1,11 +1,9 @@
 Description: Drop --sourcedir from glib-compile-resources call. It is not necessary here, and breaks out-of-tree builds with absolute configure paths, such as cdbs does.
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672541
 
-Index: vte-0.34.9/src/Makefile.am
-===================================================================
---- vte-0.34.9.orig/src/Makefile.am	2013-10-23 14:49:50.628158018 +0200
-+++ vte-0.34.9/src/Makefile.am	2013-10-23 14:49:50.624157968 +0200
-@@ -152,7 +152,7 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -154,7 +154,7 @@
  	mv -f $@.tmp $@
  
  vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml)

Modified: desktop/experimental/vte3/debian/patches/25_optional-ncurses.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/25_optional-ncurses.patch?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/patches/25_optional-ncurses.patch	[utf-8] (original)
+++ desktop/experimental/vte3/debian/patches/25_optional-ncurses.patch	[utf-8] Mon Feb 24 20:56:00 2014
@@ -1,7 +1,5 @@
-Index: vte-0.34.9/configure.ac
-===================================================================
---- vte-0.34.9.orig/configure.ac	2013-10-23 14:49:53.672196514 +0200
-+++ vte-0.34.9/configure.ac	2013-10-23 14:49:53.668196463 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -245,45 +245,52 @@
  AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
  AC_CHECK_FUNCS([ceil floor round])
@@ -93,10 +91,8 @@
  
  # Search for the required modules.
  
-Index: vte-0.34.9/src/keymap.c
-===================================================================
---- vte-0.34.9.orig/src/keymap.c	2013-10-23 14:49:53.672196514 +0200
-+++ vte-0.34.9/src/keymap.c	2013-10-23 14:49:53.668196463 +0200
+--- a/src/keymap.c
++++ b/src/keymap.c
 @@ -52,7 +52,7 @@
  #include <termcap.h>
  #define VTE_TERMCAP_NAME "termcap"
@@ -106,7 +102,7 @@
  #endif
  
  #ifdef VTE_DEBUG
-@@ -1006,8 +1006,10 @@
+@@ -1034,8 +1034,10 @@
  	enum _vte_fkey_mode fkey_mode;
  	char *cap, *tmp;
  	const char *termcap_special = NULL;
@@ -117,7 +113,7 @@
  
  	g_return_if_fail(normal != NULL);
  	g_return_if_fail(normal_length != NULL);
-@@ -1161,6 +1163,7 @@
+@@ -1189,6 +1191,7 @@
  			}
  		}
  	}
@@ -125,7 +121,7 @@
  	if (termcap_special != NULL) {
  		tmp = g_strdup(terminal);
  		cap = NULL;
-@@ -1201,6 +1204,7 @@
+@@ -1229,6 +1232,7 @@
  			return;
  		}
  	}
@@ -133,10 +129,8 @@
  
  	_vte_debug_print(VTE_DEBUG_KEYBOARD,
  			" (ignoring, no match for modifier state).\n");
-Index: vte-0.34.9/src/ssfe.c
-===================================================================
---- vte-0.34.9.orig/src/ssfe.c	2013-10-23 14:49:53.672196514 +0200
-+++ vte-0.34.9/src/ssfe.c	2013-10-23 14:49:53.668196463 +0200
+--- a/src/ssfe.c
++++ b/src/ssfe.c
 @@ -38,7 +38,7 @@
  #include <termcap.h>
  #define VTE_TERMCAP_NAME "termcap"

Modified: desktop/experimental/vte3/debian/patches/60_termcap-home-end.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/60_termcap-home-end.patch?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/patches/60_termcap-home-end.patch	[utf-8] (original)
+++ desktop/experimental/vte3/debian/patches/60_termcap-home-end.patch	[utf-8] Mon Feb 24 20:56:00 2014
@@ -1,5 +1,5 @@
---- vte-0.16.14.orig/termcaps/xterm
-+++ vte-0.16.14/termcaps/xterm
+--- a/termcaps/xterm
++++ b/termcaps/xterm
 @@ -15,6 +15,7 @@
  	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
  	:ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\

Modified: desktop/experimental/vte3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vte3/debian/patches/series?rev=40734&op=diff
==============================================================================
--- desktop/experimental/vte3/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/vte3/debian/patches/series	[utf-8] Mon Feb 24 20:56:00 2014
@@ -1,5 +1,4 @@
 01_scroll_notebook.patch
-03_scroll_region_updates.patch
 04_workaround_resources_compiler_path.patch
 25_optional-ncurses.patch
 60_termcap-home-end.patch

More information about the pkg-gnome-commits mailing list