Author: branden
Date: 2004-10-25 11:57:42 -0500 (Mon, 25 Oct 2004)
New Revision: 1969
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/local/dexlet/main.py
Log:
Apply patch from Jeff Licquia to port the X configlet to python-configlet
version 2 so that xserver-xfree86 package configuration
doesn't crash for people who have the configlet infrastructure installed.
Make xserver-common conflict with python-configlet (<< 2.0) accordingly.
(Closes: #263076)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-23 10:08:49 UTC (rev 1968)
+++ trunk/debian/CHANGESETS 2004-10-25 16:57:42 UTC (rev 1969)
@@ -202,4 +202,11 @@
which is statically linked against libxkbfile).
1968
+Apply patch from Jeff Licquia to port the X configlet to python-configlet
+version 2 so that xserver-xfree86 package configuration
+doesn't crash for people who have the configlet infrastructure installed.
+Make xserver-common conflict with python-configlet (<< 2.0) accordingly.
+(Closes: #263076)
+ 1969
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-10-23 10:08:49 UTC (rev 1968)
+++ trunk/debian/TODO 2004-10-25 16:57:42 UTC (rev 1969)
@@ -53,9 +53,6 @@
launch xterm, per recommendation from Recai Oktas. If a valid locale isn't
set, bail out (would resolve #246398). (This patch would be Debian-specific
because validlocale is a Perl utility provided by base-config.)
-* #263076: Fix the X configlet so that xserver-xfree86 package configuration
- doesn't crash for people who have the configlet infrastructure installed.
- [BR]
4.3.0.dfsg.1-10
--------------
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-23 10:08:49 UTC (rev 1968)
+++ trunk/debian/changelog 2004-10-25 16:57:42 UTC (rev 1969)
@@ -101,6 +101,12 @@
have up-to-date dependencies on it (xbase-clients does, due to xkbcomp,
which is statically linked against libxkbfile).
+ * Apply patch from Jeff Licquia to port the X configlet to python-configlet
+ version 2 so that xserver-xfree86 package configuration
+ doesn't crash for people who have the configlet infrastructure installed.
+ Make xserver-common conflict with python-configlet (<< 2.0) accordingly.
+ (Closes: #263076)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -171,7 +177,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described at <URL: http://www.probo.com/timr/savage40.html >.
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 23 Oct 2004 05:07:26 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 25 Oct 2004 11:55:35 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-10-23 10:08:49 UTC (rev 1968)
+++ trunk/debian/control 2004-10-25 16:57:42 UTC (rev 1969)
@@ -1579,7 +1579,7 @@
Architecture: any
Depends: debconf (>= 1.0.21), xfree86-common (>= 4.2.1-5), ${shlibs:Depends},
${misc:Depends}
Suggests: xserver-xfree86 | xserver, xfonts-base, xfonts-100dpi |
xfonts-75dpi, xfonts-scalable, configlet-frontends
-Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1),
suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35),
xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<<
3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35),
xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<<
3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3
(<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35),
xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<<
3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35),
xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis, xserver-xfree86 (=
4.3.0.dfsg.1-5), xserver-xfree86 (= 4.3.0.dfsg.1-6), xserver-xfree86-dbg (=
4.3.0.dfsg.1-5), xserver-xfree86-dbg (= 4.3.0.dfsg.1-6)
+Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1),
suidmanager (<< 0.50), configlet (<= 0.9.22), python-configlet (<< 2.0),
xserver-3dlabs (<< 3.3.6-35), xserver-8514 (<< 3.3.6-35), xserver-agx (<<
3.3.6-35), xserver-common-v3 (<< 3.3.6-35), xserver-fbdev (<< 3.3.6-35),
xserver-i128 (<< 3.3.6-35), xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<<
3.3.6-35), xserver-mach8 (<< 3.3.6-35), xserver-mono (<< 3.3.6-35),
xserver-p9000 (<< 3.3.6-35), xserver-s3 (<< 3.3.6-35), xserver-s3v (<<
3.3.6-35), xserver-svga (<< 3.3.6-35), xserver-tga (<< 3.3.6-35), xserver-vga16
(<< 3.3.6-35), xserver-w32 (<< 3.3.6-35), xserver-xsun (<< 3.3.6-35),
xserver-xsun-mono (<< 3.3.6-35), xserver-xsun24 (<< 3.3.6-35), xserver-rage128,
xserver-sis, xserver-xfree86 (= 4.3.0.dfsg.1-5), xserver-xfree86 (=
4.3.0.dfsg.1-6), xserver-xfree86-dbg (= 4.3.0.dfsg.1-5), xserver-xfree86-dbg (=
4.3.0.dfsg.1-6)
Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx
(<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<<
3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9),
xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<<
3.3.2.3a-9), xsun-utils
Description: files and utilities common to all X servers
The X server is the hardware interface of the X Window System. Its job is to
Modified: trunk/debian/local/dexlet/main.py
===================================================================
--- trunk/debian/local/dexlet/main.py 2004-10-23 10:08:49 UTC (rev 1968)
+++ trunk/debian/local/dexlet/main.py 2004-10-25 16:57:42 UTC (rev 1969)
@@ -61,7 +61,8 @@
"invocation_hbox_main" :
"Invocation Options" },
"shared_questions": ["shared/clobber_x-server_symlink",
"shared/default-x-server",
- "shared/xfree86v3"]
+ "shared/xfree86v3"],
+ "api_version": 2
}
color_depths_keys = [ "monochrome (1 bit)",
@@ -353,7 +354,7 @@
def get_optionmenu_index(optionmenu):
menu = optionmenu.get_menu()
- children = menu.children()
+ children = menu.get_children()
item = menu.get_active()
for i in range(len(children)):
if children[i] == item:
@@ -419,9 +420,9 @@
else:
configlet.warn("dexlet", "impossible value of selected_mouse_port;
\"%s\"" % (selected_mouse_port,))
mouse_protocols = new_protocol_list
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in mouse_protocols:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
newmenu.append(menuitem)
newmenu.show()
@@ -463,25 +464,21 @@
w = my_wtree.get_widget("monitor_simple_dialog")
w.show()
w.grab_focus()
- w.get_window()._raise()
def raise_monitor_medium_dialog(*args):
w = my_wtree.get_widget("monitor_medium_dialog")
w.show()
w.grab_focus()
- w.get_window()._raise()
def raise_monitor_advanced_dialog(*args):
w = my_wtree.get_widget("monitor_advanced_dialog")
w.show()
w.grab_focus()
- w.get_window()._raise()
def raise_videocard_advanced_dialog(*args):
w = my_wtree.get_widget("videocard_advanced_dialog")
w.show()
w.grab_focus()
- w.get_window()._raise()
def freq_ok(freq):
# returns 0 if input invalid, 1 if valid
@@ -573,9 +570,13 @@
this_widget.hide()
def raise_32bits_dialog(*args):
- dialog = gnome_ui.GnomeMessageBox("32-bit color is actually 24 bits of
color information plus\n8 bits of alpha channel or simple zero padding. The X
Window\nSystem can handle both kinds of data, so select the 24 bit\nsetting if
you need either alpha channel or zero padding.", "info",
gnome_ui.STOCK_BUTTON_OK)
+ box_text = "32-bit color is actually 24 bits of color information plus\n8
bits of alpha channel or simple zero padding. The X Window\nSystem can handle
both kinds of data, so select the 24 bit\nsetting if you need either alpha
channel or zero padding."
+
+ dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE,
+ box_text)
dialog.set_position(gtk.WIN_POS_CENTER)
- clue_them_in = dialog.run_and_close()
+ dialog.run()
+ dialog.destroy()
class Dexlet(configlet.Configlet):
def append_debconf(self, name, value):
@@ -620,18 +621,18 @@
# initialize the option menus
# color depth
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in color_depths_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
newmenu.append(menuitem)
newmenu.show()
my_wtree.get_widget("default_depth").set_menu(newmenu)
# bpp
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in bpp_choices:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
newmenu.append(menuitem)
newmenu.show()
@@ -639,9 +640,9 @@
# X server driver list
# TODO: populate this using arch_driver_map
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in card_drivers_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
newmenu.append(menuitem)
newmenu.show()
@@ -652,9 +653,9 @@
#temp_list = dpkg_output.readlines()
#temp_list.sort()
server_list = map(string.strip, available_xservers)
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in server_list:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
menuitem.connect("activate", select_xserver, item)
newmenu.append(menuitem)
@@ -664,20 +665,20 @@
my_wtree.get_widget("default_xserver").set_sensitive(FALSE)
# allowed users
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in allowed_users_choices_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
newmenu.append(menuitem)
newmenu.show()
my_wtree.get_widget("allowed_users").set_menu(newmenu)
# screen size
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in screen_size_freqs_keys:
- label = gtk.GtkLabel(item)
+ label = gtk.Label(item)
label.show()
- menuitem = gtk.GtkMenuItem()
+ menuitem = gtk.MenuItem()
menuitem.add(label)
menuitem.show()
newmenu.append(menuitem)
@@ -685,9 +686,9 @@
my_wtree.get_widget("screen_size").set_menu(newmenu)
# mode list
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in mode_list_freqs_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
newmenu.append(menuitem)
newmenu.show()
@@ -856,9 +857,9 @@
mouse_ports = mouse_ports_devfs
else:
mouse_ports = mouse_ports_traditional
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
for item in mouse_ports:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
menuitem.show()
menuitem.connect("activate", select_mouse_port, item)
newmenu.append(menuitem)
