summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-20 17:47:45 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-20 17:48:15 +0100
commit19a11905a998a1e62fb8f32aeb749f1b5a9bafd6 (patch)
treede64ff51b3091714ba0986de1a18d352ee77cd0c
parent2034e092be5c8baa072bc34ee7d34c8df7de989b (diff)
downloaddrakx-19a11905a998a1e62fb8f32aeb749f1b5a9bafd6.tar
drakx-19a11905a998a1e62fb8f32aeb749f1b5a9bafd6.tar.gz
drakx-19a11905a998a1e62fb8f32aeb749f1b5a9bafd6.tar.bz2
drakx-19a11905a998a1e62fb8f32aeb749f1b5a9bafd6.tar.xz
drakx-19a11905a998a1e62fb8f32aeb749f1b5a9bafd6.zip
use mutter instead of matchbox
in order to try to workaround diskdrake issues (mga#11790, mga#11989, ...) as a side effect, stage2 shrinks by 3Mb...
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/share/list.xml7
-rw-r--r--perl-install/install/steps_gtk.pm2
3 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a24ab411a..a0aea90d9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,9 @@
o fix pausing installing while displaying release notes
- drakx-in-chroot:
o advise to install xephyr if missing
+- use mutter instead of matchbox in order to try to workaround
+ diskdrake issues (mga#11790, mga#11989, ...)
+ as a side effect, stage2 shrinks by 3Mb...
Version 16.14 - 10 December 2013
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 094f59ce7..1ca4f80cf 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -240,8 +240,7 @@
/sbin/mount.ntfs-3g <!-- cannot be expanded as binary, not executable for all users -->
/sbin/blkid
- /usr/bin/drakx-matchbox-window-manager
- /usr/share/matchbox/mbnoapp.xpm
+ /usr/bin/mutter
/usr/share/icons/gnome/scalable/status/dialog-warning-symbolic.svg
@@ -298,10 +297,6 @@
</if>
<from expand="glob">
- <!-- needed by matchbox -->
- <from spaces_in_filename="1">
- /usr/share/themes/Ia Ora*/matchbox/*
- </from>
/usr/share/themes/oxygen-gtk*
/usr/LIB/gdk-pixbuf-2.0/*/loaders.cache
/usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 166bb7770..caeaf997c 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -46,7 +46,7 @@ sub new($$) {
run_program::run('xset', 'm', '1/8', '1');
}
any::disable_x_screensaver();
- run_program::raw({ detach => 1 }, 'drakx-matchbox-window-manager');
+ run_program::raw({ detach => 1 }, 'mutter');
install::gtk::init_gtk($o);
install::gtk::init_sizes($o);
install::gtk::install_theme($o);