Hello community, here is the log from the commit of package compiz checked in at Mon Jun 5 18:35:32 CEST 2006. -------- --- compiz/compiz.changes 2006-06-02 15:01:31.000000000 +0200 +++ compiz/compiz.changes 2006-06-05 16:51:59.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 5 16:49:52 CEST 2006 - danw@suse.de + +- If installing proprietary drivers fails, send the user to the + wiki, not sax (181228). If the card is unrecognized but has + recommended drivers, install them (180986). + +------------------------------------------------------------------- New: ---- gnome-xgl-settings-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.LlvMs4/_old 2006-06-05 18:35:19.000000000 +0200 +++ /var/tmp/diff_new_pack.LlvMs4/_new 2006-06-05 18:35:19.000000000 +0200 @@ -18,7 +18,7 @@ Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526 Autoreqprov: on Version: cvs_060602 -Release: 1 +Release: 2 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -32,6 +32,7 @@ Patch2: compiz-audible-bell-off.patch Patch3: compiz-wobbly-off.patch Patch4: java-config-notify.diff +Patch5: gnome-xgl-settings-install.patch %description Compiz is an OpenGL compositing manager that use @@ -55,6 +56,7 @@ patch -d compiz-0.0.12 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch patch -d compiz-0.0.12 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch patch -d compiz-0.0.12 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff +patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-install.patch %build PREFIX=/usr @@ -140,6 +142,10 @@ /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Mon Jun 05 2006 - danw@suse.de +- If installing proprietary drivers fails, send the user to the + wiki, not sax (181228). If the card is unrecognized but has + recommended drivers, install them (180986). * Fri Jun 02 2006 - dreveman@suse.de - Don't show fallback name in titlebar. (bnc 173059) - Fix keyboard movement issues. (bnc 179902) ++++++ gnome-xgl-settings-install.patch ++++++ Index: switch.c =================================================================== --- xgl-settings/switch.c (revision 144) +++ xgl-settings/switch.c (working copy) @@ -120,7 +120,7 @@ visual = gdk_screen_get_system_visual (gdk_screen_get_default ()); depth24 = visual->depth == 24; - if (ran_sax) { + if (ran_sax || (ran_installer && missing_packages)) { sax_advice = _("If you are having trouble fixing this, the openSUSE wiki may " "be able to help you."); sax_button_state = SwitchButtonWiki; @@ -161,7 +161,7 @@ } else if (card_status == 'G' || card_status == 'S') { if (!allowed_resolution || !depth24) { comment = g_strdup_printf ( - "%s %s\n\n%s", supported, + "%s\n\n%s\n\n%s", supported, _("However, Xgl cannot be enabled, because your color depth " "and/or resolution is not within the allowed range " "(1024x768 - 1920x1200 resolution, 24-bit color)."), @@ -169,7 +169,7 @@ button_state = sax_button_state; } else if (!accel_enabled && missing_packages && !ran_installer) { comment = g_strdup_printf ( - "%s %s", supported, + "%s\n\n%s", supported, _("However, in order to use Xgl, you need to first install a " "special video driver for your video card. Press the button " "below to run the Software Updater tool to install this " @@ -177,7 +177,7 @@ button_state = SwitchButtonInstaller; } else if (!accel_enabled) { comment = g_strdup_printf ( - "%s %s\n\n%s", supported, + "%s\n\n%s\n\n%s", supported, _("However, you do not currently have 3D acceleration enabled."), sax_advice); button_state = sax_button_state; @@ -210,6 +210,15 @@ "and running:\n\ngnome-xgl-switch --disable-xgl"); button_state = SwitchButtonEnable; } + } else if (missing_packages && !ran_installer) { + /* FIXME: Make this sound less certain once we can break string freeze */ + comment = g_strdup_printf ( + "%s\n\n%s", supported, + _("However, in order to use Xgl, you need to first install a " + "special video driver for your video card. Press the button " + "below to run the Software Updater tool to install this " + "driver.")); + button_state = SwitchButtonInstaller; } else { comment = g_strdup_printf ( "%s\n\n%s", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org