Merge lp:~ubuntu-desktop/vte/ubuntugtk3 into lp:~ubuntu-desktop/vte/ubuntu

[Michael Terry]

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-09 03:20:43 +0000
+++ debian/changelog	2010-12-14 13:50:09 +0000
@@ -1,3 +1,41 @@
+vte (1:0.27.2-0ubuntu1) natty; urgency=low
+
+  * fix_gtk3_api_changes.patch:
+    - Fix GTK3 API breakage
+  * debian/control:
+    - Drop libvte-bin package, after consulting with Debian
+  * debian/rules:
+    - Use separate libexecdir to put binaries in separate folder
+      for the gtk3 version of the library
+
+ -- Michael Terry <[e-mail]>  Mon, 13 Dec 2010 17:00:11 -0500
+
+vte (1:0.27.2-0ubuntu1~build2) natty; urgency=low
+
+  * debian/rules:
+    - Fix when gtk3 version is installed
+
+ -- Michael Terry <[e-mail]>  Tue, 23 Nov 2010 15:31:24 -0500
+
+vte (1:0.27.2-0ubuntu1~build1) natty; urgency=low
+
+  * New upstream version
+  * debian/watch:
+    - Fix regular expression to work
+  * debian/rules:
+    - Fix python install line to specify version of python, fixes FTBFS
+  * Adds support for gtk3, adding:
+    - libvte-2.90-9
+    - gir1.0-vte-2.90
+    - libvte-2.90-dev
+    - libvte-bin
+  * Renamed gir1.0-vte-1.0 to gir1.0-vte-0.0, since that is the version of
+    the gir used.  There are no rdepends.
+  * Moved the helper program from the library package to a new libvte-bin
+    package
+
+ -- Michael Terry <[e-mail]>  Tue, 23 Nov 2010 10:13:27 -0500
+
 vte (1:0.26.2-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-12-09 03:20:43 +0000
+++ debian/control	2010-12-14 13:50:09 +0000
@@ -17,9 +17,12 @@
                libglib2.0-dev (>= 2.22.0),
                libcairo2-dev,
                libx11-dev,
-               libgtk2.0-dev (>= 2.19.7-2),
+               libgtk2.0-dev (>= 2.20.0),
+               libgtk3.0-dev (>= 2.91.0),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.6.7),
+               gir1.0-gtk-2.0,
+               gir1.0-gtk-3.0,
                gettext,
                python-gtk2-dev,
                python-all-dev (>= 2.3.5-11),
@@ -31,7 +34,7 @@
                libpango1.0-dev (>= 1.22.0),
                libgladeui-1-dev,
                intltool (>= 0.35)
-Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc
+Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libgtk3.0-doc, libatk1.0-doc
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu
 
 Package: libvte9
@@ -64,7 +67,7 @@
  This package contains the minimal runtime library needed by the Debian
  installer.
 
-Package: gir1.0-vte-1.0
+Package: gir1.0-vte-0.0
 Section: libs
 Architecture: any
 Depends: ${gir:Depends},
@@ -90,7 +93,8 @@
          libx11-dev,
          libgtk2.0-dev (>= 2.14.0),
          libpango1.0-dev (>= 1.22.0),
-         libglib2.0-dev (>= 2.22.0)
+         libglib2.0-dev (>= 2.22.0),
+         libvte-common
 Provides: python-vte-dev
 Description: Terminal emulator widget for GTK+ 2.0 - development files
  The VTE library inserts terminal capability strings into a trie, and then
@@ -101,12 +105,57 @@
  This package contains development files for the VTE library and its 
  Python bindings.
 
+Package: libvte-2.90-9
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvte-common
+Description: Terminal emulator widget for GTK+ 3.0 - runtime files
+ The VTE library inserts terminal capability strings into a trie, and then
+ uses it to determine if data received from a pseudo-terminal is a control
+ sequence or just random data. The sample program "interpret" illustrates
+ more or less what the widget sees after it filters incoming data.
+
+Package: gir1.0-vte-2.90
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends},
+         libvte-common
+Description: GObject introspection data for the VTE library
+ This package contains introspection data for VTE, a terminal emulator
+ widget for GTK+.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+
+Package: libvte-2.90-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libvte-2.90-9 (= ${binary:Version}),
+         libcairo2-dev,
+         libx11-dev,
+         libgtk3.0-dev (>= 2.91.0),
+         libpango1.0-dev (>= 1.22.0),
+         libglib2.0-dev (>= 2.22.0),
+         libvte-common
+Description: Terminal emulator widget for GTK+ 3.0 - development files
+ The VTE library inserts terminal capability strings into a trie, and then
+ uses it to determine if data received from a pseudo-terminal is a control
+ sequence or just random data. The sample program "interpret" illustrates
+ more or less what the widget sees after it filters incoming data.
+ .
+ This package contains development files for the VTE library and its 
+ Python bindings.
+
 Package: libvte-common
 Architecture: all
 Section: libs
 Depends: ${misc:Depends}
 Replaces: libvte2 (<= 0.5.1-2)
-Description: Terminal emulator widget for GTK+ 2.0 - common files
+Description: Terminal emulator widget for GTK+ - common files
  The VTE library inserts terminal capability strings into a trie, and then
  uses it to determine if data received from a pseudo-terminal is a control
  sequence or just random data. The sample program "interpret" illustrates
@@ -139,7 +188,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Terminal emulator widget for GTK+ 2.0 - documentation
+Description: Terminal emulator widget for GTK+ - documentation
  The VTE library inserts terminal capability strings into a trie, and then
  uses it to determine if data received from a pseudo-terminal is a control
  sequence or just random data. The sample program "interpret" illustrates

=== modified file 'debian/control.in'
--- debian/control.in	2010-12-09 03:20:43 +0000
+++ debian/control.in	2010-12-14 13:50:09 +0000
@@ -12,9 +12,12 @@
                libglib2.0-dev (>= 2.22.0),
                libcairo2-dev,
                libx11-dev,
-               libgtk2.0-dev (>= 2.19.7-2),
+               libgtk2.0-dev (>= 2.20.0),
+               libgtk3.0-dev (>= 2.91.0),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.6.7),
+               gir1.0-gtk-2.0,
+               gir1.0-gtk-3.0,
                gettext,
                python-gtk2-dev,
                python-all-dev (>= 2.3.5-11),
@@ -26,7 +29,7 @@
                libpango1.0-dev (>= 1.22.0),
                libgladeui-1-dev,
                intltool (>= 0.35)
-Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc
+Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libgtk3.0-doc, libatk1.0-doc
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu
 
 Package: libvte9
@@ -59,7 +62,7 @@
  This package contains the minimal runtime library needed by the Debian
  installer.
 
-Package: gir1.0-vte-1.0
+Package: gir1.0-vte-0.0
 Section: libs
 Architecture: any
 Depends: ${gir:Depends},
@@ -85,7 +88,8 @@
          libx11-dev,
          libgtk2.0-dev (>= 2.14.0),
          libpango1.0-dev (>= 1.22.0),
-         libglib2.0-dev (>= 2.22.0)
+         libglib2.0-dev (>= 2.22.0),
+         libvte-common
 Provides: python-vte-dev
 Description: Terminal emulator widget for GTK+ 2.0 - development files
  The VTE library inserts terminal capability strings into a trie, and then
@@ -96,12 +100,57 @@
  This package contains development files for the VTE library and its 
  Python bindings.
 
+Package: libvte-2.90-9
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvte-common
+Description: Terminal emulator widget for GTK+ 3.0 - runtime files
+ The VTE library inserts terminal capability strings into a trie, and then
+ uses it to determine if data received from a pseudo-terminal is a control
+ sequence or just random data. The sample program "interpret" illustrates
+ more or less what the widget sees after it filters incoming data.
+
+Package: gir1.0-vte-2.90
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends},
+         libvte-common
+Description: GObject introspection data for the VTE library
+ This package contains introspection data for VTE, a terminal emulator
+ widget for GTK+.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
+
+Package: libvte-2.90-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libvte-2.90-9 (= ${binary:Version}),
+         libcairo2-dev,
+         libx11-dev,
+         libgtk3.0-dev (>= 2.91.0),
+         libpango1.0-dev (>= 1.22.0),
+         libglib2.0-dev (>= 2.22.0),
+         libvte-common
+Description: Terminal emulator widget for GTK+ 3.0 - development files
+ The VTE library inserts terminal capability strings into a trie, and then
+ uses it to determine if data received from a pseudo-terminal is a control
+ sequence or just random data. The sample program "interpret" illustrates
+ more or less what the widget sees after it filters incoming data.
+ .
+ This package contains development files for the VTE library and its 
+ Python bindings.
+
 Package: libvte-common
 Architecture: all
 Section: libs
 Depends: ${misc:Depends}
 Replaces: libvte2 (<= 0.5.1-2)
-Description: Terminal emulator widget for GTK+ 2.0 - common files
+Description: Terminal emulator widget for GTK+ - common files
  The VTE library inserts terminal capability strings into a trie, and then
  uses it to determine if data received from a pseudo-terminal is a control
  sequence or just random data. The sample program "interpret" illustrates
@@ -134,7 +183,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Terminal emulator widget for GTK+ 2.0 - documentation
+Description: Terminal emulator widget for GTK+ - documentation
  The VTE library inserts terminal capability strings into a trie, and then
  uses it to determine if data received from a pseudo-terminal is a control
  sequence or just random data. The sample program "interpret" illustrates

=== renamed file 'debian/gir1.0-vte-1.0.install' => 'debian/gir1.0-vte-0.0.install'
--- debian/gir1.0-vte-1.0.install	2010-08-31 03:04:57 +0000
+++ debian/gir1.0-vte-0.0.install	2010-12-14 13:50:09 +0000
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0
+usr/lib/girepository-1.0/Vte-0.0.typelib

=== added file 'debian/gir1.0-vte-2.90.install'
--- debian/gir1.0-vte-2.90.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.0-vte-2.90.install	2010-12-14 13:50:09 +0000
@@ -0,0 +1,1 @@
+usr/lib/girepository-1.0/Vte-2.90.typelib

=== added file 'debian/libvte-2.90-9.install'
--- debian/libvte-2.90-9.install	1970-01-01 00:00:00 +0000
+++ debian/libvte-2.90-9.install	2010-12-14 13:50:09 +0000
@@ -0,0 +1,2 @@
+usr/lib/libvte2_90.so.*
+usr/lib/libvte-2.90-9/*

=== added file 'debian/libvte-2.90-9.lintian-overrides'
--- debian/libvte-2.90-9.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libvte-2.90-9.lintian-overrides	2010-12-14 13:50:09 +0000
@@ -0,0 +1,1 @@
+libvte-2.90-9 binary: package-name-doesnt-match-sonames libvte2-90-9

=== added file 'debian/libvte-2.90-9.symbols'
--- debian/libvte-2.90-9.symbols	1970-01-01 00:00:00 +0000
+++ debian/libvte-2.90-9.symbols	2010-12-14 13:50:09 +0000
@@ -0,0 +1,135 @@
+libvte2_90.so.9 libvte-2.90-9 #MINVER#
+ _vte_debug_flags@Base 1:0.27.2
+ _vte_debug_init@Base 1:0.27.2
+ _vte_pty_close@Base 1:0.27.2
+ _vte_pty_get_size@Base 1:0.27.2
+ _vte_pty_open@Base 1:0.27.2
+ _vte_pty_set_size@Base 1:0.27.2
+ _vte_pty_set_utf8@Base 1:0.27.2
+ vte_pty_child_setup@Base 1:0.27.2
+ vte_pty_close@Base 1:0.27.2
+ vte_pty_error_get_type@Base 1:0.27.2
+ vte_pty_error_quark@Base 1:0.27.2
+ vte_pty_flags_get_type@Base 1:0.27.2
+ vte_pty_get_fd@Base 1:0.27.2
+ vte_pty_get_size@Base 1:0.27.2
+ vte_pty_get_type@Base 1:0.27.2
+ vte_pty_new@Base 1:0.27.2
+ vte_pty_new_foreign@Base 1:0.27.2
+ vte_pty_set_size@Base 1:0.27.2
+ vte_pty_set_term@Base 1:0.27.2
+ vte_pty_set_utf8@Base 1:0.27.2
+ vte_reaper_add_child@Base 1:0.27.2
+ vte_reaper_get@Base 1:0.27.2
+ vte_reaper_get_type@Base 1:0.27.2
+ vte_terminal_accessible_factory_get_type@Base 1:0.27.2
+ vte_terminal_accessible_factory_new@Base 1:0.27.2
+ vte_terminal_accessible_get_type@Base 1:0.27.2
+ vte_terminal_accessible_new@Base 1:0.27.2
+ vte_terminal_anti_alias_get_type@Base 1:0.27.2
+ vte_terminal_copy_clipboard@Base 1:0.27.2
+ vte_terminal_copy_primary@Base 1:0.27.2
+ vte_terminal_cursor_blink_mode_get_type@Base 1:0.27.2
+ vte_terminal_cursor_shape_get_type@Base 1:0.27.2
+ vte_terminal_erase_binding_get_type@Base 1:0.27.2
+ vte_terminal_feed@Base 1:0.27.2
+ vte_terminal_feed_child@Base 1:0.27.2
+ vte_terminal_feed_child_binary@Base 1:0.27.2
+ vte_terminal_fork_command@Base 1:0.27.2
+ vte_terminal_fork_command_full@Base 1:0.27.2
+ vte_terminal_forkpty@Base 1:0.27.2
+ vte_terminal_get_adjustment@Base 1:0.27.2
+ vte_terminal_get_allow_bold@Base 1:0.27.2
+ vte_terminal_get_audible_bell@Base 1:0.27.2
+ vte_terminal_get_char_ascent@Base 1:0.27.2
+ vte_terminal_get_char_descent@Base 1:0.27.2
+ vte_terminal_get_char_height@Base 1:0.27.2
+ vte_terminal_get_char_width@Base 1:0.27.2
+ vte_terminal_get_child_exit_status@Base 1:0.27.2
+ vte_terminal_get_column_count@Base 1:0.27.2
+ vte_terminal_get_cursor_blink_mode@Base 1:0.27.2
+ vte_terminal_get_cursor_position@Base 1:0.27.2
+ vte_terminal_get_cursor_shape@Base 1:0.27.2
+ vte_terminal_get_default_emulation@Base 1:0.27.2
+ vte_terminal_get_emulation@Base 1:0.27.2
+ vte_terminal_get_encoding@Base 1:0.27.2
+ vte_terminal_get_font@Base 1:0.27.2
+ vte_terminal_get_has_selection@Base 1:0.27.2
+ vte_terminal_get_icon_title@Base 1:0.27.2
+ vte_terminal_get_mouse_autohide@Base 1:0.27.2
+ vte_terminal_get_padding@Base 1:0.27.2
+ vte_terminal_get_pty@Base 1:0.27.2
+ vte_terminal_get_pty_object@Base 1:0.27.2
+ vte_terminal_get_row_count@Base 1:0.27.2
+ vte_terminal_get_status_line@Base 1:0.27.2
+ vte_terminal_get_text@Base 1:0.27.2
+ vte_terminal_get_text_include_trailing_spaces@Base 1:0.27.2
+ vte_terminal_get_text_range@Base 1:0.27.2
+ vte_terminal_get_type@Base 1:0.27.2
+ vte_terminal_get_using_xft@Base 1:0.27.2
+ vte_terminal_get_visible_bell@Base 1:0.27.2
+ vte_terminal_get_window_title@Base 1:0.27.2
+ vte_terminal_im_append_menuitems@Base 1:0.27.2
+ vte_terminal_is_word_char@Base 1:0.27.2
+ vte_terminal_match_add@Base 1:0.27.2
+ vte_terminal_match_add_gregex@Base 1:0.27.2
+ vte_terminal_match_check@Base 1:0.27.2
+ vte_terminal_match_clear_all@Base 1:0.27.2
+ vte_terminal_match_remove@Base 1:0.27.2
+ vte_terminal_match_set_cursor@Base 1:0.27.2
+ vte_terminal_match_set_cursor_name@Base 1:0.27.2
+ vte_terminal_match_set_cursor_type@Base 1:0.27.2
+ vte_terminal_new@Base 1:0.27.2
+ vte_terminal_paste_clipboard@Base 1:0.27.2
+ vte_terminal_paste_primary@Base 1:0.27.2
+ vte_terminal_pty_new@Base 1:0.27.2
+ vte_terminal_reset@Base 1:0.27.2
+ vte_terminal_search_find_next@Base 1:0.27.2
+ vte_terminal_search_find_previous@Base 1:0.27.2
+ vte_terminal_search_get_gregex@Base 1:0.27.2
+ vte_terminal_search_get_wrap_around@Base 1:0.27.2
+ vte_terminal_search_set_gregex@Base 1:0.27.2
+ vte_terminal_search_set_wrap_around@Base 1:0.27.2
+ vte_terminal_select_all@Base 1:0.27.2
+ vte_terminal_select_none@Base 1:0.27.2
+ vte_terminal_set_allow_bold@Base 1:0.27.2
+ vte_terminal_set_alternate_screen_scroll@Base 1:0.27.2
+ vte_terminal_set_audible_bell@Base 1:0.27.2
+ vte_terminal_set_background_image@Base 1:0.27.2
+ vte_terminal_set_background_image_file@Base 1:0.27.2
+ vte_terminal_set_background_saturation@Base 1:0.27.2
+ vte_terminal_set_background_tint_color@Base 1:0.27.2
+ vte_terminal_set_background_transparent@Base 1:0.27.2
+ vte_terminal_set_backspace_binding@Base 1:0.27.2
+ vte_terminal_set_color_background@Base 1:0.27.2
+ vte_terminal_set_color_bold@Base 1:0.27.2
+ vte_terminal_set_color_cursor@Base 1:0.27.2
+ vte_terminal_set_color_dim@Base 1:0.27.2
+ vte_terminal_set_color_foreground@Base 1:0.27.2
+ vte_terminal_set_color_highlight@Base 1:0.27.2
+ vte_terminal_set_colors@Base 1:0.27.2
+ vte_terminal_set_cursor_blink_mode@Base 1:0.27.2
+ vte_terminal_set_cursor_blinks@Base 1:0.27.2
+ vte_terminal_set_cursor_shape@Base 1:0.27.2
+ vte_terminal_set_default_colors@Base 1:0.27.2
+ vte_terminal_set_delete_binding@Base 1:0.27.2
+ vte_terminal_set_emulation@Base 1:0.27.2
+ vte_terminal_set_encoding@Base 1:0.27.2
+ vte_terminal_set_font@Base 1:0.27.2
+ vte_terminal_set_font_from_string@Base 1:0.27.2
+ vte_terminal_set_font_from_string_full@Base 1:0.27.2
+ vte_terminal_set_font_full@Base 1:0.27.2
+ vte_terminal_set_mouse_autohide@Base 1:0.27.2
+ vte_terminal_set_opacity@Base 1:0.27.2
+ vte_terminal_set_pty@Base 1:0.27.2
+ vte_terminal_set_pty_object@Base 1:0.27.2
+ vte_terminal_set_scroll_background@Base 1:0.27.2
+ vte_terminal_set_scroll_on_keystroke@Base 1:0.27.2
+ vte_terminal_set_scroll_on_output@Base 1:0.27.2
+ vte_terminal_set_scrollback_lines@Base 1:0.27.2
+ vte_terminal_set_size@Base 1:0.27.2
+ vte_terminal_set_visible_bell@Base 1:0.27.2
+ vte_terminal_set_word_chars@Base 1:0.27.2
+ vte_terminal_watch_child@Base 1:0.27.2
+ vte_terminal_write_contents@Base 1:0.27.2
+ vte_terminal_write_flags_get_type@Base 1:0.27.2

=== added file 'debian/libvte-2.90-dev.install'
--- debian/libvte-2.90-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libvte-2.90-dev.install	2010-12-14 13:50:09 +0000
@@ -0,0 +1,5 @@
+usr/include/vte-2.90
+usr/lib/pkgconfig/vte-2.90.pc
+usr/lib/libvte2_90.a
+usr/lib/libvte2_90.so
+usr/share/gir-1.0/Vte-2.90.gir

=== modified file 'debian/libvte-common.install'
--- debian/libvte-common.install	2009-05-08 08:05:57 +0000
+++ debian/libvte-common.install	2010-12-14 13:50:09 +0000
@@ -1,3 +1,3 @@
 usr/share/locale
-usr/share/vte/termcap
+usr/share/vte/termcap-*
 usr/share/glade3

=== modified file 'debian/libvte-dev.install'
--- debian/libvte-dev.install	2010-08-31 03:04:57 +0000
+++ debian/libvte-dev.install	2010-12-14 13:50:09 +0000
@@ -1,6 +1,7 @@
-usr/include
-usr/lib/pkgconfig
+usr/include/vte-0.0
+usr/lib/pkgconfig/vte.pc
+usr/lib/pkgconfig/pyvte.pc
 usr/lib/libvte.a
 usr/lib/libvte.so
 usr/share/pygtk/2.0/defs
-usr/share/gir-1.0
+usr/share/gir-1.0/Vte-0.0.gir

=== modified file 'debian/libvte9-udeb.install'
--- debian/libvte9-udeb.install	2008-11-18 13:39:29 +0000
+++ debian/libvte9-udeb.install	2010-12-14 13:50:09 +0000
@@ -1,2 +1,2 @@
 usr/lib/libvte.so.*
-usr/share/vte/termcap/xterm
+usr/share/vte/termcap-0.0/xterm

=== modified file 'debian/libvte9.install'
--- debian/libvte9.install	2010-08-17 08:12:45 +0000
+++ debian/libvte9.install	2010-12-14 13:50:09 +0000
@@ -1,3 +1,2 @@
 usr/lib/libvte.so.*
-usr/lib/vte-0.0/* usr/lib/libvte9/
 usr/lib/libvte9/*

=== added file 'debian/patches/fix_gtk3_api_changes.patch'
--- debian/patches/fix_gtk3_api_changes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_gtk3_api_changes.patch	2010-12-14 13:50:09 +0000
@@ -0,0 +1,16 @@
+Index: vte-0.27.2/src/vtebg.c
+===================================================================
+--- vte-0.27.2.orig/src/vtebg.c	2010-12-13 16:14:54.627609272 -0500
++++ vte-0.27.2/src/vtebg.c	2010-12-13 16:15:16.467609272 -0500
+@@ -240,7 +240,11 @@
+ 
+ 		window = gdk_screen_get_root_window(screen);
+                 pvt->native.window = window;
++#if GTK_CHECK_VERSION (2, 91, 6)
++                pvt->native.native_window = gdk_x11_window_get_xid(window);
++#else
+                 pvt->native.native_window = gdk_x11_drawable_get_xid(window);
++#endif
+ #if GTK_CHECK_VERSION (2, 90, 8)
+                 pvt->native.display = gdk_window_get_display(window);
+ #else

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-06 11:50:18 +0000
+++ debian/patches/series	2010-12-14 13:50:09 +0000
@@ -4,3 +4,4 @@
 91_keep_fds.patch
 93_add_alt_screen_scroll_toggle.patch
 lp621927_set_default_term.patch
+fix_gtk3_api_changes.patch

=== modified file 'debian/rules'
--- debian/rules	2010-12-09 03:20:43 +0000
+++ debian/rules	2010-12-14 13:50:09 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 libvteN := $(shell sed -rn 's/^Package:[[:space:]]*(libvte[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+libvteNgtk3 := $(shell sed -rn 's/^Package:[[:space:]]*(libvte-2.90-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 udeb := $(libvteN)-udeb
 
 buildbasedir := $(CURDIR)/debian/build
@@ -18,7 +19,7 @@
 
 DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvteN)
 DEB_FIXPERMS_EXCLUDE += gnome-pty-helper
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libvteN) (>= 1:0.24.0)' --add-udeb=$(udeb)
+DEB_DH_MAKESHLIBS_ARGS_libvte9 += -V '$(libvteN) (>= 1:0.24.0)' --add-udeb=$(udeb)
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--enable-glade-catalogue \
@@ -37,6 +38,39 @@
 
 DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring $(udeb),$(cdbs_curpkg)),$(DEB_DESTDIR_$(udeb)),$(DEB_DESTDIR))
 
+binary-predeb/gir%::
+	dh_girepository -p$(cdbs_curpkg)
+
+######
+# gtk3 rules
+gtk3-configure-stamp:
+	: # configure for GTK+ 3.0
+	set -e; \
+	rm -rf $(buildbasedir)/gtk3; \
+	mkdir $(buildbasedir)/gtk3; \
+	cd $(buildbasedir)/gtk3; \
+	$(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) \
+	  $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) \
+	                           $(cdbs_configure_flags) \
+	                           $(DEB_CONFIGURE_EXTRA_FLAGS) \
+	                           $(DEB_CONFIGURE_USER_FLAGS)) \
+	  --with-gtk=3.0 --libexecdir="\$${prefix}/lib/$(libvteNgtk3)"
+	touch $@
+gtk3-build-stamp: gtk3-configure-stamp
+	: # build for GTK+ 3.0
+	$(MAKE) -C $(buildbasedir)/gtk3
+	touch $@
+gtk3-install-stamp: gtk3-build-stamp
+	: # install for GTK+ 3.0
+	$(MAKE) -C $(buildbasedir)/gtk3 install DESTDIR=$(DEB_DESTDIR)
+	touch $@
+common-configure-arch:: gtk3-configure-stamp
+common-build-arch:: gtk3-build-stamp
+common-install-prehook-indep:: gtk3-install-stamp
+common-install-prehook-arch:: gtk3-install-stamp
+clean::
+	rm -f gtk3-*-stamp
+
 ######
 # udeb rules
 configure/$(udeb):: $(DEB_BUILDDIR_$(udeb))/config.status
@@ -73,7 +107,7 @@
 configure/python-vte:: $(addprefix configure-stamp-, $(PY_VERSIONS))
 
 build-stamp-%:
-	make -C $(buildbasedir)/$*
+	make -C $(buildbasedir)/$* PYTHON=`which $*`
 	touch $@
 
 build/python-vte:: $(addprefix build-stamp-, $(PY_VERSIONS))

=== modified file 'debian/watch'
--- debian/watch	2010-05-24 04:41:47 +0000
+++ debian/watch	2010-12-14 13:50:09 +0000
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/vte/([\d\.]+)[\d]/ vte-(.*)\.tar\.gz
+http://ftp.gnome.org/pub/GNOME/sources/vte/([\d\.]+[\d])/ vte-(.*)\.tar\.gz