From ccf8a266ea972bf2db3ec7a2415397fa92c8bb42 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Mon, 8 Feb 2010 00:40:30 +0000
Subject: [PATCH] Switch udeb from DirectFB to Xlib to prepare the move to an X11-based graphical installer.

---
 packages/cdebconf-terminal/configure.ac     |    2 +-
 packages/cdebconf-terminal/debian/changelog |   10 ++++++++++
 packages/cdebconf-terminal/debian/control   |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/cdebconf-terminal/configure.ac b/packages/cdebconf-terminal/configure.ac
index bf054b1..be4ded5 100644
--- a/packages/cdebconf-terminal/configure.ac
+++ b/packages/cdebconf-terminal/configure.ac
@@ -15,7 +15,7 @@ fi
 
 FRONTENDS="newt"
 
-PKG_CHECK_MODULES(GTK, [gtk+-directfb-2.0],
+PKG_CHECK_MODULES(GTK, [gtk+-x11-2.0],
  FRONTENDS="$FRONTENDS gtk",
  echo "*** Cannot build GTK+ plugin ***")
 
diff --git a/packages/cdebconf-terminal/debian/changelog b/packages/cdebconf-terminal/debian/changelog
index b126ff6..c67c8fb 100644
--- a/packages/cdebconf-terminal/debian/changelog
+++ b/packages/cdebconf-terminal/debian/changelog
@@ -1,7 +1,17 @@
 cdebconf-terminal (0.7) UNRELEASED; urgency=low
 
+  [ Frans Pop ]
   * Remove Standards-Version field.
 
+  [ Cyril Brulebois ]
+  * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+    graphical installer:
+     - Get rid of libgtk-directfb-2.0-dev in Build-Depends.
+     - Bump the Build-Depends on libgtk2.0-dev to ensure the new udeb gets
+       a dependency on libgtk-x11-udeb.
+     - Replace gtk+-directfb-2.0 with gtk+-x11-2.0 in configure.ac to use
+       the shared/x11 flavour (which is the one used for the udeb).
+
  -- Frans Pop <fjp@debian.org>  Fri, 15 Jan 2010 16:05:29 +0100
 
 cdebconf-terminal (0.6) unstable; urgency=low
diff --git a/packages/cdebconf-terminal/debian/control b/packages/cdebconf-terminal/debian/control
index f59c5ad..a593bd7 100644
--- a/packages/cdebconf-terminal/debian/control
+++ b/packages/cdebconf-terminal/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Section: debian-installer
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Jérémy Bobbio <lunar@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libdebconfclient0-dev (>= 0.146), libnewt-dev, libgtk-directfb-2.0-dev, libvte-dev (>> 0.16.14-1)
+Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libdebconfclient0-dev (>= 0.146), libnewt-dev, libgtk2.0-dev (>= 2.18.6-2), libvte-dev (>> 0.16.14-1)
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/cdebconf-terminal
 
 Package: cdebconf-gtk-terminal
-- 
1.6.6.1

