Bug#574287: Please switch from DirectFB to X11

[Cyril Brulebois <kibi@debian.org>]

Source: cdebconf-terminal
Version: 0.6
Severity: wishlist
Tags: d-i patch

Hi,

please find attached the patch to switch from DirectFB to X11. See
http://lists.debian.org/debian-boot/2010/03/msg00313.html for the
details.

Thanks for considering.

Mraw,
KiBi.

Index: debian/control
===================================================================
--- debian/control	(révision 62665)
+++ debian/control	(copie de travail)
@@ -3,7 +3,7 @@
 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.7-2), libvte-dev (>> 0.16.14-1)
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/cdebconf-terminal
 
 Package: cdebconf-gtk-terminal
Index: debian/changelog
===================================================================
--- debian/changelog	(révision 62665)
+++ debian/changelog	(copie de travail)
@@ -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
Index: configure.ac
===================================================================
--- configure.ac	(révision 62665)
+++ configure.ac	(copie de travail)
@@ -15,7 +15,7 @@
 
 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 ***")