[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#574285: marked as done (cdebconf: Please switch from DirectFB to X11)

Your message dated Wed, 24 Mar 2010 01:32:26 +0000
with message-id <E1NuFSM-00055s-VP@ries.debian.org>
and subject line Bug#574285: fixed in cdebconf 0.149
has caused the Debian Bug report #574285,
regarding cdebconf: Please switch from DirectFB to X11
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
574285: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574285
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: cdebconf
Version: 0.148
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)
@@ -1,7 +1,7 @@
 Source: cdebconf
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 7.0.0~), po-debconf (>= 0.5.0), libslang2-dev, libnewt-dev, libtextwrap-dev (>= 0.1-5), libdebian-installer4-dev (>= 0.41) | libdebian-installer-dev, libgtk-directfb-2.0-dev (>= 2.8.18-5), libcairo2-dev (>= 1.6.4-6.1)
+Build-Depends: debhelper (>= 7.0.0~), po-debconf (>= 0.5.0), libslang2-dev, libnewt-dev, libtextwrap-dev (>= 0.1-5), libdebian-installer4-dev (>= 0.41) | libdebian-installer-dev, libgtk2.0-dev (>= 2.18.7-2), libcairo2-dev (>= 1.8.10-3)
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Joey Hess <joeyh@debian.org>, Colin Watson <cjwatson@debian.org>, Bastian Blank <waldi@debian.org>, Jérémy Bobbio <lunar@debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>
 Standards-Version: 3.8.4
Index: debian/changelog
===================================================================
--- debian/changelog	(révision 62665)
+++ debian/changelog	(copie de travail)
@@ -1,8 +1,21 @@
 cdebconf (0.149) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Remove unused variable in newt_initialize.
   * Silence compiler warning in dpkg-reconfigure when filling argv.
 
+  [ Cyril Brulebois ]
+  * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+    graphical installer:
+     - Replace libgtk-directfb-2.0-dev with libgtk2.0-dev, versioned to
+       ensure the new udeb gets a dependency on libgtk-x11-udeb.
+     - Bump the Build-Depends on libcairo2-dev to ensure the new udeb gets
+       a dependency on libcairo2-udeb.
+     - Disable DirectFB includes and dfb_input_device_reload_keymap().
+     - Update libraries in pkg-config calls.
+     - Set a default cursor after having switched to fullscreen.
+  * Many thanks to Julien Cristau for his patches.
+
  -- Colin Watson <cjwatson@debian.org>  Tue, 23 Feb 2010 12:34:16 +0000
 
 cdebconf (0.148) unstable; urgency=low
Index: src/modules/frontend/gtk/ui.c
===================================================================
--- src/modules/frontend/gtk/ui.c	(révision 62665)
+++ src/modules/frontend/gtk/ui.c	(copie de travail)
@@ -454,6 +454,7 @@
     GtkWidget * dialog;
     GtkWidget * vbox;
     GtkWidget * frame;
+    GtkWidget * label;
 
     /* XXX: check NULL! */
     dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -465,13 +466,17 @@
     gtk_window_set_decorated(GTK_WINDOW(dialog), FALSE /* no decoration */);
     gtk_container_set_border_width(GTK_CONTAINER(dialog), 0 /* no border */);
 
+    /* Create a wrapped label */
+    label = gtk_label_new(message);
+    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+
     /* XXX: check NULL! */
     vbox = gtk_vbox_new(FALSE /* don't make children equal */,
                         DEFAULT_PADDING);
     gtk_box_pack_start(GTK_BOX(vbox), create_dialog_title_label(title),
                        FALSE /* don't expand */, FALSE /* don't fill */,
                        0 /* no padding */);
-    gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(message),
+    gtk_box_pack_start(GTK_BOX(vbox), label,
                        FALSE /* don't expand */, FALSE /* don't fill */,
                        DEFAULT_PADDING);
     gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(),
Index: src/modules/frontend/gtk/di.c
===================================================================
--- src/modules/frontend/gtk/di.c	(révision 62665)
+++ src/modules/frontend/gtk/di.c	(copie de travail)
@@ -44,9 +44,11 @@
 #include <unistd.h>
 #include <syslog.h>
 
+#if 0
 #include <directfb.h>
 /* for dfb_input_device_reload_keymap() and dfb_input_device_at() */
 #include <core/input.h>
+#endif
 #include <gtk/gtk.h>
 
 #include "question.h"
@@ -173,6 +175,7 @@
 {
     struct frontend_data * fe_data = fe->data;
     struct di_data * di_data;
+    GdkCursor * cursor;
 
     g_assert(NULL == fe_data->di_data);
     if (NULL == (di_data = g_malloc0(sizeof (struct di_data)))) {
@@ -189,6 +192,10 @@
 
     make_fullscreen(fe_data->window);
 
+    cursor = gdk_cursor_new(GDK_LEFT_PTR);
+    gdk_window_set_cursor(gdk_get_default_root_window(), cursor);
+    gdk_cursor_unref(cursor);
+
     return TRUE;
 }
 
@@ -202,7 +209,9 @@
  */
 static void refresh_keymap(struct frontend * fe)
 {
+#if 0
     dfb_input_device_reload_keymap(dfb_input_device_at(DIDID_KEYBOARD));
+#endif
 }
 
 /** Returns the current text direction.
Index: src/modules/frontend/gtk/Makefile
===================================================================
--- src/modules/frontend/gtk/Makefile	(révision 62665)
+++ src/modules/frontend/gtk/Makefile	(copie de travail)
@@ -14,10 +14,10 @@
 
 ifneq ($(strip $(filter -DDI_UDEB, $(CFLAGS))),)
 OBJS += screenshot.opic di.opic
-MODCFLAGS = `pkg-config --cflags gtk+-directfb-2.0 \
-                                 gthread-2.0 directfb-internal`
-MODLDFLAGS = `pkg-config --libs gtk+-directfb-2.0 \
-                                gthread-2.0 directfb-internal` -ldebian-installer
+MODCFLAGS = `pkg-config --cflags gtk+-x11-2.0 \
+                                 gthread-2.0`
+MODLDFLAGS = `pkg-config --libs gtk+-x11-2.0 \
+                                gthread-2.0` -ldebian-installer
 else
 MODCFLAGS = `pkg-config --cflags gtk+-2.0 gthread-2.0`
 MODLDFLAGS = `pkg-config --libs gtk+-2.0 gthread-2.0` -ldebian-installer

--- End Message ---
--- Begin Message --- 
Source: cdebconf
Source-Version: 0.149

We believe that the bug you reported is fixed in the latest version of
cdebconf, which is due to be installed in the Debian FTP archive:

cdebconf-gtk-udeb_0.149_amd64.udeb
  to main/c/cdebconf/cdebconf-gtk-udeb_0.149_amd64.udeb
cdebconf-gtk_0.149_amd64.deb
  to main/c/cdebconf/cdebconf-gtk_0.149_amd64.deb
cdebconf-newt-udeb_0.149_amd64.udeb
  to main/c/cdebconf/cdebconf-newt-udeb_0.149_amd64.udeb
cdebconf-priority_0.149_all.udeb
  to main/c/cdebconf/cdebconf-priority_0.149_all.udeb
cdebconf-text-udeb_0.149_amd64.udeb
  to main/c/cdebconf/cdebconf-text-udeb_0.149_amd64.udeb
cdebconf-udeb_0.149_amd64.udeb
  to main/c/cdebconf/cdebconf-udeb_0.149_amd64.udeb
cdebconf_0.149.dsc
  to main/c/cdebconf/cdebconf_0.149.dsc
cdebconf_0.149.tar.gz
  to main/c/cdebconf/cdebconf_0.149.tar.gz
cdebconf_0.149_amd64.deb
  to main/c/cdebconf/cdebconf_0.149_amd64.deb
libdebconfclient0-dev_0.149_amd64.deb
  to main/c/cdebconf/libdebconfclient0-dev_0.149_amd64.deb
libdebconfclient0-udeb_0.149_amd64.udeb
  to main/c/cdebconf/libdebconfclient0-udeb_0.149_amd64.udeb
libdebconfclient0_0.149_amd64.deb
  to main/c/cdebconf/libdebconfclient0_0.149_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 574285@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Frans Pop <fjp@debian.org> (supplier of updated cdebconf package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 24 Mar 2010 02:07:33 +0100
Source: cdebconf
Binary: cdebconf cdebconf-gtk libdebconfclient0 libdebconfclient0-dev cdebconf-udeb cdebconf-priority libdebconfclient0-udeb cdebconf-text-udeb cdebconf-slang-udeb cdebconf-newt-udeb cdebconf-gtk-udeb
Architecture: source all amd64
Version: 0.149
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Frans Pop <fjp@debian.org>
Description: 
 cdebconf   - Debian Configuration Management System (C-implementation)
 cdebconf-gtk - Gtk+ frontend for Debian Configuration Management System
 cdebconf-gtk-udeb - Gtk+ frontend for Debian Configuration Management System (udeb)
 cdebconf-newt-udeb - Newt frontend for Debian Configuration Management System (udeb)
 cdebconf-priority - Change debconf priority (udeb)
 cdebconf-slang-udeb - S-Lang frontend for Debian Configuration Management System (udeb)
 cdebconf-text-udeb - Plain text frontend for Debian Configuration Management System (udeb)
 cdebconf-udeb - Debian Configuration Management System (C-implementation) (udeb)
 libdebconfclient0 - Debian Configuration Management System (C-implementation)
 libdebconfclient0-dev - Development files for cdebconf
 libdebconfclient0-udeb - Debian Configuration Management System (C-implementation) (udeb)
Closes: 574285
Changes: 
 cdebconf (0.149) unstable; urgency=low
 .
   [ Colin Watson ]
   * Remove unused variable in newt_initialize.
   * Silence compiler warning in dpkg-reconfigure when filling argv.
 .
   [ Cyril Brulebois ]
   * Wrap label in GTK frontend to improve display of help dialogs.
   * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
     graphical installer (closes: #574285):
     - Replace libgtk-directfb-2.0-dev with libgtk2.0-dev, versioned to
       ensure the new udeb gets a dependency on libgtk-x11-udeb.
     - Bump the Build-Depends on libcairo2-dev to ensure the new udeb gets
       a dependency on libcairo2-udeb.
     - Disable DirectFB includes and dfb_input_device_reload_keymap().
     - Update libraries in pkg-config calls.
     - Set a default cursor after having switched to fullscreen.
   * Many thanks to Julien Cristau for his patches.
 .
   [ Updated translations ]
   * French (fr.po) by Christian Perrier
   * Hebrew (he.po) by Omer Zak
   * Lithuanian (lt.po) by Kęstutis Biliūnas
   * Slovenian (sl.po) by Vanja Cvelbar
Checksums-Sha1: 
 c118cbf7627cdc628c76e8079066e6a1e0e3a35e 1388 cdebconf_0.149.dsc
 17a6294f68428d723af2e3ad412253bc1ef1fcb0 324823 cdebconf_0.149.tar.gz
 c83c313784207935bd9ea47ad2055e79490ae172 2838 cdebconf-priority_0.149_all.udeb
 4dd3b4ad2102349681883d065b187bfd4880e149 157152 cdebconf_0.149_amd64.deb
 b2a532baaf710ea8572d1543bb601c17368fce07 68490 cdebconf-gtk_0.149_amd64.deb
 13b67ca111db01d5dfa791ba174abfaea0d4a3f9 40730 libdebconfclient0_0.149_amd64.deb
 09940e2d49523abc860f6f35503dd305dc77e3b1 45994 libdebconfclient0-dev_0.149_amd64.deb
 beee38e8051cdf12d6f258f3eeec5a3902da3c69 81534 cdebconf-udeb_0.149_amd64.udeb
 214c837f053d1f09887f2dfb7d5f0369c144ccf8 3318 libdebconfclient0-udeb_0.149_amd64.udeb
 e83c8a720b5edef2a08f5897d8055e6c19628870 21000 cdebconf-text-udeb_0.149_amd64.udeb
 5d73491eed8882d81f5300406e91af1ea5c9b2f4 18666 cdebconf-newt-udeb_0.149_amd64.udeb
 908a3337b74cb8f69a2e429bfdce5eea3bbfb396 31942 cdebconf-gtk-udeb_0.149_amd64.udeb
Checksums-Sha256: 
 bea7d0eb6e776aee33a526b242149595298dea114c50d025187e9c0ffdb23cca 1388 cdebconf_0.149.dsc
 4bcc052b5f9ed4dd69e06b30d55ee9b2204790875b6cba1e27f4cb20ff038152 324823 cdebconf_0.149.tar.gz
 51d71b68e72e8d8432b595232fa83fcd633d254180f86c31e34dbc71079675c5 2838 cdebconf-priority_0.149_all.udeb
 5f9fe59477d4476bf3ba015162da0d8f76c71a82c6738df006adfc7c05d667d5 157152 cdebconf_0.149_amd64.deb
 6746fa40a172c8f8d276e886c22a15dfbcbbfa6aaa59244a74d4fb6f9b07d8d5 68490 cdebconf-gtk_0.149_amd64.deb
 21653bb56f76ecb51ba59cbedbd014b724e3f5a826d886d5ec23139b699ce366 40730 libdebconfclient0_0.149_amd64.deb
 45ae49d2b76d66e645aaf72cddf6e935b09b7d1ec4e9cb69def67083ee6b047e 45994 libdebconfclient0-dev_0.149_amd64.deb
 106dbd70b72ca659e7451f198e75385146a268e5f6a92db5faa2eb51f0f460a5 81534 cdebconf-udeb_0.149_amd64.udeb
 97a7a0e7f05b56edb23df178f4dec985fbf91716581c4940f05bcfbfd8beb3de 3318 libdebconfclient0-udeb_0.149_amd64.udeb
 a7a4caea3979d4cd4178c85f985dc1b035d81daeaff20cdcb0a460fd87b9bdd2 21000 cdebconf-text-udeb_0.149_amd64.udeb
 79e536cb6032458ad7f1d3388b850c570a7553118562b44eacb1741f691dcdf0 18666 cdebconf-newt-udeb_0.149_amd64.udeb
 453633d03fe46d870cf19ab3a5db6c096491c0ace013da83be779416c7b813a9 31942 cdebconf-gtk-udeb_0.149_amd64.udeb
Files: 
 766585cae1baa3ef600ffb2f4579e983 1388 utils optional cdebconf_0.149.dsc
 65545e747f3e888559c51ebcea16e94b 324823 utils optional cdebconf_0.149.tar.gz
 e4a49638a0a2c09a70bcaf72d6a28da2 2838 debian-installer standard cdebconf-priority_0.149_all.udeb
 bcacd9c3a57a53c5bf625d49b6b38756 157152 utils extra cdebconf_0.149_amd64.deb
 63217c1093ce772f1dac360f4f6ac898 68490 admin optional cdebconf-gtk_0.149_amd64.deb
 b9a8d25f6a26ad4fa16cf0aadcdcab68 40730 libs optional libdebconfclient0_0.149_amd64.deb
 5fd69875cb9598984b8c8704c4e15d81 45994 libdevel optional libdebconfclient0-dev_0.149_amd64.deb
 408ea7c8923bc2453da356919c92857e 81534 debian-installer standard cdebconf-udeb_0.149_amd64.udeb
 bc8df91142c4f900afe2a42af9e41de8 3318 debian-installer optional libdebconfclient0-udeb_0.149_amd64.udeb
 f66e8355c095d2e461947a7e5d045794 21000 debian-installer optional cdebconf-text-udeb_0.149_amd64.udeb
 0fdf0195560c0578c51651eb5a5f2780 18666 debian-installer optional cdebconf-newt-udeb_0.149_amd64.udeb
 e5ff7c5d15aa030a62b0ff94ce3b2cc1 31942 debian-installer optional cdebconf-gtk-udeb_0.149_amd64.udeb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkupZ/wACgkQgm/Kwh6ICoQYigCgrMQKQBc+y71iBsoAvTFCbVT5
NwEAn0eiu36KI+QHSiCSgHlsWDPdzfo9
=3MVa
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: