Bug#573498: pango1.0: Please switch the udeb from directfb to xlib

[Cyril Brulebois]

Source: pango1.0
Version: 1.26.2-1
Severity: wishlist
Tags: patch d-i

Hi,

please find attached the patch I used to switch from directfb to xlib
for this udeb. Reading it again, I have two comments:
 - It seems I missed a versioned B-D: according to the Depends graph at
   [1], one would have to add libx11-dev (>= 1.3.3-2). Without that, a
   Depends on the non-udeb libx11-6 package would be generated.
 - The vBD bump on cairo isn't actually needed, since my patch in
   #573394 doesn't bump the shlibs (on purpose, so that other packages
   aren't affected by the addition of this udeb). Hopefully a strict
   Depends on libcairo2-udeb won't be needed since all those packages
   should be pushed in testing at the same time. You may want to drop
   that bump, and not wait for #573394 to be fixed. [You could want to
   tweak the substvars after the dependencies are computed, but that'd
   be a bit hackish.]

 1. http://people.debian.org/~kibi/di-x11/2010-02-27/intra-deps.png

FWIW, xft, libxrender, libx11 are all out of NEW, so they should be
available soonish.

Please let me know if you have any question. (I can double-check the
generated binaries are fine before you upload, for example.)

Mraw,
KiBi.
-------------- next part --------------
--- a/udebify/29/pango1.0-1.26.2/debian/changelog
+++ b/udebify/29/pango1.0-1.26.2/debian/changelog
@@ -1,3 +1,16 @@
+pango1.0 (1.26.2-2) UNRELEASED; urgency=low
+
+  * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+    graphical installer:
+     - Remove the --without-x flag from the udeb_configure_flags variable.
+  * Version/Bump some B-D to make sure the udeb gets proper dependencies
+    on the recently reworked/added udebs:
+     - libcairo2-dev
+     - libxft-dev
+  * Thanks to Julien Cristau for his initial patch.
+
+ -- Cyril Brulebois <kibi at debian.org>  Sun, 07 Feb 2010 03:29:52 +0000
+
 pango1.0 (1.26.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
--- a/udebify/29/pango1.0-1.26.2/debian/rules
+++ b/udebify/29/pango1.0-1.26.2/debian/rules
@@ -118,7 +118,6 @@ static_configure_flags := $(configure_fl
 			--with-included-modules \
 			--enable-static
 udeb_configure_flags := $(configure_flags) \
-			--without-x \
 			--disable-debug
 
 # optional optimized flavor for some arches
--- a/udebify/29/pango1.0-1.26.2/debian/control
+++ b/udebify/29/pango1.0-1.26.2/debian/control
@@ -11,12 +11,12 @@ Build-Depends: debhelper (>= 5.0.22),
                libglib2.0-dev (>= 2.17.3),
                pkg-config,
                defoma (>= 0.11.1),
-               libxft-dev (>= 2.0.0),
+               libxft-dev (>= 2.1.14-2),
                libfontconfig1-dev (>= 2.5.0),
                autotools-dev,
                po-debconf,
                gnome-pkg-tools (>= 0.11),
-               libcairo2-dev (>= 1.8.2-2),
+               libcairo2-dev (>= 1.8.8-3),
                perl,
                quilt,
                dpkg-dev (>= 1.14.17),
--- a/udebify/29/pango1.0-1.26.2/debian/control.in
+++ b/udebify/29/pango1.0-1.26.2/debian/control.in
@@ -11,12 +11,12 @@ Build-Depends: debhelper (>= 5.0.22),
                libglib2.0-dev (>= 2.17.3),
                pkg-config,
                defoma (>= 0.11.1),
-               libxft-dev (>= 2.0.0),
+               libxft-dev (>= 2.1.14-2),
                libfontconfig1-dev (>= 2.5.0),
                autotools-dev,
                po-debconf,
                gnome-pkg-tools (>= 0.11),
-               libcairo2-dev (>= 1.8.2-2),
+               libcairo2-dev (>= 1.8.8-3),
                perl,
                quilt,
                dpkg-dev (>= 1.14.17),