Package: vte
Version: 1:0.24.3-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

In Ubuntu, I'm considering applying the attached patch to update to 0.27.2.

This does several things:
 * Builds a gtk3 version of vte (libvte-2.90-9)
 * Adds gir packages for both libraries
 * Moves executable to new libvte-bin package
 * Specifies version of python when building/installing, as we ran into
   an issue where configure could get rerun during those steps and might
   use wrong version of python.

I'm very interested in feedback on the general packaging splits I've done.
In particular, I'd like to get an OK on the package names so I don't introduce
a delta with Debian in that regard.

-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.37-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru vte-0.24.3/debian/control vte-0.24.3/debian/control
--- vte-0.24.3/debian/control	2010-11-06 07:50:13.000000000 -0400
+++ vte-0.24.3/debian/control	2010-11-24 14:18:28.000000000 -0500
@@ -6,7 +6,8 @@
 Source: vte
 Section: libs
 Priority: optional
-Maintainer: Guilherme de S. Pastore <gpast...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guilherme de S. Pastore <gpast...@debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>, Emilio Pozuelo Monfort <po...@debian.org>, Josselin Mouette <j...@debian.org>, Sebastian Dröge <sl...@debian.org>
 Standards-Version: 3.8.4
 XS-Python-Version: >= 2.3
@@ -15,7 +16,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),
@@ -27,13 +33,14 @@
                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
 
 Package: libvte9
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libvte-bin,
          libvte-common
 Description: Terminal emulator widget for GTK+ 2.0 - runtime files
  The VTE library inserts terminal capability strings into a trie, and then
@@ -59,6 +66,21 @@
  This package contains the minimal runtime library needed by the Debian
  installer.
 
+Package: gir1.0-vte-0.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         libvte-common
+Conflicts: gobject-introspection-repository
+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-dev
 Architecture: any
 Section: libdevel
@@ -69,7 +91,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
@@ -80,12 +103,58 @@
  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-bin,
+         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
@@ -93,13 +162,30 @@
  .
  This package contains internationalization files for the VTE library.
 
+Package: libvte-bin
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvte-common
+Breaks: libvte9 (<= 0.2.27)
+Replaces: libvte9 (<= 0.2.27)
+Description: Terminal emulator widget for GTK+ - helper programs
+ 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 helper programs for the VTE library.
+
 Package: python-vte
 Architecture: any
 Section: python
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          ${python:Depends},
-         python-gtk2
+         python-gtk2,
+         libvte-common
 XB-Python-Version: ${python:Versions}
 Conflicts: python2.3-vte,
            python2.4-vte
@@ -118,7 +204,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
diff -Nru vte-0.24.3/debian/control.in vte-0.24.3/debian/control.in
--- vte-0.24.3/debian/control.in	2010-07-16 16:20:57.000000000 -0400
+++ vte-0.24.3/debian/control.in	2010-11-24 14:18:24.000000000 -0500
@@ -1,7 +1,8 @@
 Source: vte
 Section: libs
 Priority: optional
-Maintainer: Guilherme de S. Pastore <gpast...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guilherme de S. Pastore <gpast...@debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.8.4
 XS-Python-Version: >= 2.3
@@ -10,7 +11,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),
@@ -22,13 +28,14 @@
                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
 
 Package: libvte9
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libvte-bin,
          libvte-common
 Description: Terminal emulator widget for GTK+ 2.0 - runtime files
  The VTE library inserts terminal capability strings into a trie, and then
@@ -54,6 +61,21 @@
  This package contains the minimal runtime library needed by the Debian
  installer.
 
+Package: gir1.0-vte-0.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         libvte-common
+Conflicts: gobject-introspection-repository
+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-dev
 Architecture: any
 Section: libdevel
@@ -64,7 +86,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
@@ -75,12 +98,58 @@
  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-bin,
+         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
@@ -88,13 +157,30 @@
  .
  This package contains internationalization files for the VTE library.
 
+Package: libvte-bin
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libvte-common
+Breaks: libvte9 (<= 0.2.27)
+Replaces: libvte9 (<= 0.2.27)
+Description: Terminal emulator widget for GTK+ - helper programs
+ 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 helper programs for the VTE library.
+
 Package: python-vte
 Architecture: any
 Section: python
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          ${python:Depends},
-         python-gtk2
+         python-gtk2,
+         libvte-common
 XB-Python-Version: ${python:Versions}
 Conflicts: python2.3-vte,
            python2.4-vte
@@ -113,7 +199,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
diff -Nru vte-0.24.3/debian/gir1.0-vte-0.0.install vte-0.24.3/debian/gir1.0-vte-0.0.install
--- vte-0.24.3/debian/gir1.0-vte-0.0.install	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/gir1.0-vte-0.0.install	2010-11-24 14:06:03.000000000 -0500
@@ -0,0 +1 @@
+usr/lib/girepository-1.0/Vte-0.0.typelib
diff -Nru vte-0.24.3/debian/gir1.0-vte-2.90.install vte-0.24.3/debian/gir1.0-vte-2.90.install
--- vte-0.24.3/debian/gir1.0-vte-2.90.install	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/gir1.0-vte-2.90.install	2010-11-24 13:55:01.000000000 -0500
@@ -0,0 +1 @@
+usr/lib/girepository-1.0/Vte-2.90.typelib
diff -Nru vte-0.24.3/debian/libvte-2.90-9.install vte-0.24.3/debian/libvte-2.90-9.install
--- vte-0.24.3/debian/libvte-2.90-9.install	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/libvte-2.90-9.install	2010-11-24 13:55:01.000000000 -0500
@@ -0,0 +1 @@
+usr/lib/libvte2_90.so.*
diff -Nru vte-0.24.3/debian/libvte-2.90-9.lintian-overrides vte-0.24.3/debian/libvte-2.90-9.lintian-overrides
--- vte-0.24.3/debian/libvte-2.90-9.lintian-overrides	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/libvte-2.90-9.lintian-overrides	2010-11-24 13:55:01.000000000 -0500
@@ -0,0 +1 @@
+libvte-2.90-9 binary: package-name-doesnt-match-sonames libvte2-90-9
diff -Nru vte-0.24.3/debian/libvte-2.90-9.symbols vte-0.24.3/debian/libvte-2.90-9.symbols
--- vte-0.24.3/debian/libvte-2.90-9.symbols	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/libvte-2.90-9.symbols	2010-11-24 13:55:01.000000000 -0500
@@ -0,0 +1,135 @@
+libvte2_90.so.9 libvte-2.90-9 #MINVER#
+ _vte_debug_fl...@base 1:0.27.2
+ _vte_debug_i...@base 1:0.27.2
+ _vte_pty_cl...@base 1:0.27.2
+ _vte_pty_get_s...@base 1:0.27.2
+ _vte_pty_o...@base 1:0.27.2
+ _vte_pty_set_s...@base 1:0.27.2
+ _vte_pty_set_u...@base 1:0.27.2
+ vte_pty_child_se...@base 1:0.27.2
+ vte_pty_cl...@base 1:0.27.2
+ vte_pty_error_get_t...@base 1:0.27.2
+ vte_pty_error_qu...@base 1:0.27.2
+ vte_pty_flags_get_t...@base 1:0.27.2
+ vte_pty_get...@base 1:0.27.2
+ vte_pty_get_s...@base 1:0.27.2
+ vte_pty_get_t...@base 1:0.27.2
+ vte_pty_...@base 1:0.27.2
+ vte_pty_new_fore...@base 1:0.27.2
+ vte_pty_set_s...@base 1:0.27.2
+ vte_pty_set_t...@base 1:0.27.2
+ vte_pty_set_u...@base 1:0.27.2
+ vte_reaper_add_ch...@base 1:0.27.2
+ vte_reaper_...@base 1:0.27.2
+ vte_reaper_get_t...@base 1:0.27.2
+ vte_terminal_accessible_factory_get_t...@base 1:0.27.2
+ vte_terminal_accessible_factory_...@base 1:0.27.2
+ vte_terminal_accessible_get_t...@base 1:0.27.2
+ vte_terminal_accessible_...@base 1:0.27.2
+ vte_terminal_anti_alias_get_t...@base 1:0.27.2
+ vte_terminal_copy_clipbo...@base 1:0.27.2
+ vte_terminal_copy_prim...@base 1:0.27.2
+ vte_terminal_cursor_blink_mode_get_t...@base 1:0.27.2
+ vte_terminal_cursor_shape_get_t...@base 1:0.27.2
+ vte_terminal_erase_binding_get_t...@base 1:0.27.2
+ vte_terminal_f...@base 1:0.27.2
+ vte_terminal_feed_ch...@base 1:0.27.2
+ vte_terminal_feed_child_bin...@base 1:0.27.2
+ vte_terminal_fork_comm...@base 1:0.27.2
+ vte_terminal_fork_command_f...@base 1:0.27.2
+ vte_terminal_fork...@base 1:0.27.2
+ vte_terminal_get_adjustm...@base 1:0.27.2
+ vte_terminal_get_allow_b...@base 1:0.27.2
+ vte_terminal_get_audible_b...@base 1:0.27.2
+ vte_terminal_get_char_asc...@base 1:0.27.2
+ vte_terminal_get_char_desc...@base 1:0.27.2
+ vte_terminal_get_char_hei...@base 1:0.27.2
+ vte_terminal_get_char_wi...@base 1:0.27.2
+ vte_terminal_get_child_exit_sta...@base 1:0.27.2
+ vte_terminal_get_column_co...@base 1:0.27.2
+ vte_terminal_get_cursor_blink_m...@base 1:0.27.2
+ vte_terminal_get_cursor_posit...@base 1:0.27.2
+ vte_terminal_get_cursor_sh...@base 1:0.27.2
+ vte_terminal_get_default_emulat...@base 1:0.27.2
+ vte_terminal_get_emulat...@base 1:0.27.2
+ vte_terminal_get_encod...@base 1:0.27.2
+ vte_terminal_get_f...@base 1:0.27.2
+ vte_terminal_get_has_select...@base 1:0.27.2
+ vte_terminal_get_icon_ti...@base 1:0.27.2
+ vte_terminal_get_mouse_autoh...@base 1:0.27.2
+ vte_terminal_get_padd...@base 1:0.27.2
+ vte_terminal_get_...@base 1:0.27.2
+ vte_terminal_get_pty_obj...@base 1:0.27.2
+ vte_terminal_get_row_co...@base 1:0.27.2
+ vte_terminal_get_status_l...@base 1:0.27.2
+ vte_terminal_get_t...@base 1:0.27.2
+ vte_terminal_get_text_include_trailing_spa...@base 1:0.27.2
+ vte_terminal_get_text_ra...@base 1:0.27.2
+ vte_terminal_get_t...@base 1:0.27.2
+ vte_terminal_get_using_...@base 1:0.27.2
+ vte_terminal_get_visible_b...@base 1:0.27.2
+ vte_terminal_get_window_ti...@base 1:0.27.2
+ vte_terminal_im_append_menuit...@base 1:0.27.2
+ vte_terminal_is_word_c...@base 1:0.27.2
+ vte_terminal_match_...@base 1:0.27.2
+ vte_terminal_match_add_gre...@base 1:0.27.2
+ vte_terminal_match_ch...@base 1:0.27.2
+ vte_terminal_match_clear_...@base 1:0.27.2
+ vte_terminal_match_rem...@base 1:0.27.2
+ vte_terminal_match_set_cur...@base 1:0.27.2
+ vte_terminal_match_set_cursor_n...@base 1:0.27.2
+ vte_terminal_match_set_cursor_t...@base 1:0.27.2
+ vte_terminal_...@base 1:0.27.2
+ vte_terminal_paste_clipbo...@base 1:0.27.2
+ vte_terminal_paste_prim...@base 1:0.27.2
+ vte_terminal_pty_...@base 1:0.27.2
+ vte_terminal_re...@base 1:0.27.2
+ vte_terminal_search_find_n...@base 1:0.27.2
+ vte_terminal_search_find_previ...@base 1:0.27.2
+ vte_terminal_search_get_gre...@base 1:0.27.2
+ vte_terminal_search_get_wrap_aro...@base 1:0.27.2
+ vte_terminal_search_set_gre...@base 1:0.27.2
+ vte_terminal_search_set_wrap_aro...@base 1:0.27.2
+ vte_terminal_select_...@base 1:0.27.2
+ vte_terminal_select_n...@base 1:0.27.2
+ vte_terminal_set_allow_b...@base 1:0.27.2
+ vte_terminal_set_alternate_screen_scr...@base 1:0.27.2
+ vte_terminal_set_audible_b...@base 1:0.27.2
+ vte_terminal_set_background_im...@base 1:0.27.2
+ vte_terminal_set_background_image_f...@base 1:0.27.2
+ vte_terminal_set_background_saturat...@base 1:0.27.2
+ vte_terminal_set_background_tint_co...@base 1:0.27.2
+ vte_terminal_set_background_transpar...@base 1:0.27.2
+ vte_terminal_set_backspace_bind...@base 1:0.27.2
+ vte_terminal_set_color_backgro...@base 1:0.27.2
+ vte_terminal_set_color_b...@base 1:0.27.2
+ vte_terminal_set_color_cur...@base 1:0.27.2
+ vte_terminal_set_color_...@base 1:0.27.2
+ vte_terminal_set_color_foregro...@base 1:0.27.2
+ vte_terminal_set_color_highli...@base 1:0.27.2
+ vte_terminal_set_col...@base 1:0.27.2
+ vte_terminal_set_cursor_blink_m...@base 1:0.27.2
+ vte_terminal_set_cursor_bli...@base 1:0.27.2
+ vte_terminal_set_cursor_sh...@base 1:0.27.2
+ vte_terminal_set_default_col...@base 1:0.27.2
+ vte_terminal_set_delete_bind...@base 1:0.27.2
+ vte_terminal_set_emulat...@base 1:0.27.2
+ vte_terminal_set_encod...@base 1:0.27.2
+ vte_terminal_set_f...@base 1:0.27.2
+ vte_terminal_set_font_from_str...@base 1:0.27.2
+ vte_terminal_set_font_from_string_f...@base 1:0.27.2
+ vte_terminal_set_font_f...@base 1:0.27.2
+ vte_terminal_set_mouse_autoh...@base 1:0.27.2
+ vte_terminal_set_opac...@base 1:0.27.2
+ vte_terminal_set_...@base 1:0.27.2
+ vte_terminal_set_pty_obj...@base 1:0.27.2
+ vte_terminal_set_scroll_backgro...@base 1:0.27.2
+ vte_terminal_set_scroll_on_keystr...@base 1:0.27.2
+ vte_terminal_set_scroll_on_out...@base 1:0.27.2
+ vte_terminal_set_scrollback_li...@base 1:0.27.2
+ vte_terminal_set_s...@base 1:0.27.2
+ vte_terminal_set_visible_b...@base 1:0.27.2
+ vte_terminal_set_word_ch...@base 1:0.27.2
+ vte_terminal_watch_ch...@base 1:0.27.2
+ vte_terminal_write_conte...@base 1:0.27.2
+ vte_terminal_write_flags_get_t...@base 1:0.27.2
diff -Nru vte-0.24.3/debian/libvte-2.90-dev.install vte-0.24.3/debian/libvte-2.90-dev.install
--- vte-0.24.3/debian/libvte-2.90-dev.install	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/libvte-2.90-dev.install	2010-11-24 13:55:01.000000000 -0500
@@ -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
diff -Nru vte-0.24.3/debian/libvte9.install vte-0.24.3/debian/libvte9.install
--- vte-0.24.3/debian/libvte9.install	2009-06-10 01:11:53.000000000 -0400
+++ vte-0.24.3/debian/libvte9.install	2010-11-24 14:09:25.000000000 -0500
@@ -1,3 +1 @@
 usr/lib/libvte.so.*
-usr/lib/vte/* usr/lib/libvte9/
-usr/lib/libvte9/*
diff -Nru vte-0.24.3/debian/libvte9-udeb.install vte-0.24.3/debian/libvte9-udeb.install
--- vte-0.24.3/debian/libvte9-udeb.install	2009-06-10 01:11:53.000000000 -0400
+++ vte-0.24.3/debian/libvte9-udeb.install	2010-11-24 13:55:01.000000000 -0500
@@ -1,2 +1,2 @@
 usr/lib/libvte.so.*
-usr/share/vte/termcap/xterm
+usr/share/vte/termcap-0.0/xterm
diff -Nru vte-0.24.3/debian/libvte-bin.install vte-0.24.3/debian/libvte-bin.install
--- vte-0.24.3/debian/libvte-bin.install	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/libvte-bin.install	2010-11-24 13:55:01.000000000 -0500
@@ -0,0 +1 @@
+usr/lib/libvte9/*
diff -Nru vte-0.24.3/debian/libvte-common.install vte-0.24.3/debian/libvte-common.install
--- vte-0.24.3/debian/libvte-common.install	2009-04-22 18:28:38.000000000 -0400
+++ vte-0.24.3/debian/libvte-common.install	2010-11-24 13:55:01.000000000 -0500
@@ -1,3 +1,3 @@
 usr/share/locale
-usr/share/vte/termcap
+usr/share/vte/termcap-*
 usr/share/glade3
diff -Nru vte-0.24.3/debian/libvte-common.links vte-0.24.3/debian/libvte-common.links
--- vte-0.24.3/debian/libvte-common.links	1969-12-31 19:00:00.000000000 -0500
+++ vte-0.24.3/debian/libvte-common.links	2010-11-24 14:14:34.000000000 -0500
@@ -0,0 +1 @@
+/usr/share/vte/termcap-0.0 /usr/share/vte/termcap
diff -Nru vte-0.24.3/debian/libvte-dev.install vte-0.24.3/debian/libvte-dev.install
--- vte-0.24.3/debian/libvte-dev.install	2009-04-22 18:41:26.000000000 -0400
+++ vte-0.24.3/debian/libvte-dev.install	2010-11-24 14:07:09.000000000 -0500
@@ -1,5 +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/Vte-0.0.gir
diff -Nru vte-0.24.3/debian/rules vte-0.24.3/debian/rules
--- vte-0.24.3/debian/rules	2010-04-21 08:19:11.000000000 -0400
+++ vte-0.24.3/debian/rules	2010-11-24 13:55:35.000000000 -0500
@@ -17,7 +17,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
@@ -35,6 +35,38 @@
 
 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) --with-gtk=3.0 \
+	  $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) \
+	                           $(cdbs_configure_flags) \
+	                           $(DEB_CONFIGURE_EXTRA_FLAGS) \
+	                           $(DEB_CONFIGURE_USER_FLAGS));
+	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
@@ -71,13 +103,13 @@
 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))
 
 install-stamp-%:
-	make -C $(buildbasedir)/$* install DESTDIR=$(DEB_DESTDIR)
+	make -C $(buildbasedir)/$* install DESTDIR=$(DEB_DESTDIR) PYTHON=`which $*`
 	# stop shipping *.a and *.la files for the Python module;
 	# python-support moves them anyway (#412477)
 	find $(DEB_DESTDIR)/usr/lib/$* -name \*.a -exec rm -f '{}' \;
diff -Nru vte-0.24.3/debian/watch vte-0.24.3/debian/watch
--- vte-0.24.3/debian/watch	2009-09-29 14:40:10.000000000 -0400
+++ vte-0.24.3/debian/watch	2010-11-24 13:55:35.000000000 -0500
@@ -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

Reply via email to