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

---
 packages/cdebconf-entropy/configure.ac     |    2 +-
 packages/cdebconf-entropy/debian/changelog |    9 +++++++++
 packages/cdebconf-entropy/debian/control   |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/cdebconf-entropy/configure.ac b/packages/cdebconf-entropy/configure.ac
index 26adf25..25a659a 100644
--- a/packages/cdebconf-entropy/configure.ac
+++ b/packages/cdebconf-entropy/configure.ac
@@ -18,7 +18,7 @@ FRONTENDS="text"
 AC_CHECK_LIB(newt, newtInit, FRONTENDS="$FRONTENDS newt", echo
  "*** Cannot build Newt plugin ***")
 
-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-entropy/debian/changelog b/packages/cdebconf-entropy/debian/changelog
index 7547cdc..7ae69c2 100644
--- a/packages/cdebconf-entropy/debian/changelog
+++ b/packages/cdebconf-entropy/debian/changelog
@@ -6,6 +6,15 @@ cdebconf-entropy (0.13) UNRELEASED; urgency=low
   [ Frans Pop ]
   * Add missing build dependency on libdebian-installer4-dev. Closes: #562294.
 
+  [ 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, 25 Dec 2009 13:14:47 +0100
 
 cdebconf-entropy (0.12) unstable; urgency=low
diff --git a/packages/cdebconf-entropy/debian/control b/packages/cdebconf-entropy/debian/control
index 3419a6c..764b3ea 100644
--- a/packages/cdebconf-entropy/debian/control
+++ b/packages/cdebconf-entropy/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Section: debian-installer
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Max Vozeler <xam@debian.org>, Jérémy Bobbio <lunar@debian.org>, Christian Perrier <bubulle@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libnewt-dev, libtextwrap-dev, libdebconfclient0-dev (>= 0.130), libgtk-directfb-2.0-dev
+Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libnewt-dev, libtextwrap-dev, libdebconfclient0-dev (>= 0.130), libgtk2.0-dev (>= 2.18.6-2)
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/cdebconf-entropy
 
 Package: cdebconf-text-entropy
-- 
1.6.6.1

