--- a/udebify/33/vte-0.22.5/debian/changelog
+++ b/udebify/33/vte-0.22.5/debian/changelog
@@ -1,3 +1,13 @@
+vte (1:0.22.5-2) UNRELEASED; urgency=low
+
+  * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+    graphical installer
+     - Drop the B-D on libgtk-directfb-2.0-dev.
+     - Bump the B-D on libgtk2.0-dev to make sure the udeb gets its
+       dependency on the (recently-added) udeb rather than on the library.
+
+ -- Cyril Brulebois <kibi@debian.org>  Mon, 08 Feb 2010 00:16:27 +0000
+
 vte (1:0.22.5-1) unstable; urgency=low
 
   * New upstream release.
--- a/udebify/33/vte-0.22.5/debian/control
+++ b/udebify/33/vte-0.22.5/debian/control
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: vte
 Section: libs
 Priority: optional
@@ -9,8 +14,7 @@ Build-Depends: cdbs (>= 0.4.43),
                debhelper (>= 5.0.37.2),
                quilt,
                libglib2.0-dev (>= 2.18.0),
-               libgtk2.0-dev (>= 2.14.0),
-               libgtk-directfb-2.0-dev (>= 2.6.0),
+               libgtk2.0-dev (>= 2.18.6-2),
                gettext,
                python-gtk2-dev,
                python-all-dev (>= 2.3.5-11),
--- a/udebify/33/vte-0.22.5/debian/control.in
+++ b/udebify/33/vte-0.22.5/debian/control.in
@@ -9,8 +9,7 @@ Build-Depends: cdbs (>= 0.4.43),
                debhelper (>= 5.0.37.2),
                quilt,
                libglib2.0-dev (>= 2.18.0),
-               libgtk2.0-dev (>= 2.14.0),
-               libgtk-directfb-2.0-dev (>= 2.6.0),
+               libgtk2.0-dev (>= 2.18.6-2),
                gettext,
                python-gtk2-dev,
                python-all-dev (>= 2.3.5-11),
--- a/udebify/33/vte-0.22.5/debian/rules
+++ b/udebify/33/vte-0.22.5/debian/rules
@@ -40,13 +40,19 @@ DEB_DH_INSTALL_ARGS = --sourcedir=$(if $
 # udeb rules
 configure/$(udeb):: $(DEB_BUILDDIR_$(udeb))/config.status
 $(DEB_BUILDDIR_$(udeb))/config.status:
+	# The following comment applied to the DirectFB-based udeb. That dirty
+	# hack probably could go away with the new X11-based udeb, provided
+	# libgtk-x11-udeb is still built from the 'shared' flavour, and not
+	# from a new stripped-down flavour. Keep this hack for now, and for
+	# reference.
+
 	# paint me ugly: Gtk 2.8 mixes the pkg-config files from both builds
 	# (x11/shared and directfb), so the gtk+2.0.pc from the directfb can't
 	# be used; we cheat and create a fake one higher in the PKG_CONFIG_PATH
 	# which is a symlink to the gtk+-directfb-2.0.pc
 	mkdir -p $(DEB_BUILDDIR_$(udeb))/pkg-config
 	cd $(DEB_BUILDDIR_$(udeb))/pkg-config && \
-		ln -sf /usr/lib/pkgconfig/gtk+-directfb-2.0.pc gtk+-2.0.pc
+		ln -sf /usr/lib/pkgconfig/gtk+-x11-2.0.pc gtk+-2.0.pc
 	cd $(DEB_BUILDDIR_$(udeb)) && \
 		PKG_CONFIG_PATH=pkg-config \
 		$(DEB_CONFIGURE_SCRIPT_ENV) \