Merge branch 'master' of git://git.mageia.org/software/drakx

1 files changed, 55 insertions, 33 deletions

diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index af18e5962..1ca4f80cf 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -92,6 +92,24 @@
   95-dm-notify.rules
 </from>
 
+<from dir="/usr/LIB/girepository-1.0">
+  Atk-1.0.typelib
+  cairo-1.0.typelib
+  Gdk-3.0.typelib
+  GdkPixbuf-2.0.typelib
+  GdkX11-3.0.typelib
+  Gio-2.0.typelib
+  GLib-2.0.typelib
+  GModule-2.0.typelib
+  GObject-2.0.typelib
+  Gtk-3.0.typelib
+  JavaScriptCore-3.0.typelib <!-- needed by WebKit-3.0.typelib -->
+  Pango-1.0.typelib
+  Soup-2.4.typelib <!-- needed by WebKit-3.0.typelib -->
+  WebKit-3.0.typelib
+  xlib-2.0.typelib
+</from>
+
 <from dir="/usr/LIB/xorg/modules">
   drivers/fbdev_drv.so
   drivers/vesa_drv.so
@@ -142,7 +160,7 @@
       */LC_MESSAGES/draksnapshot.mo
       */LC_MESSAGES/drakx-net.mo
       */LC_MESSAGES/drakx-kbd-mouse-x11.mo
-      */LC_MESSAGES/gtk20.mo
+      */LC_MESSAGES/gtk30.mo
       */LC_MESSAGES/urpmi.mo
     </from>
   </to>
@@ -170,6 +188,9 @@
 
   <!-- needed by dmraid -->
   libdmraid-events-isw.so
+
+  <!-- needed fro Gtk3-WebKit -->
+  libwebkitgtk-3.0.so.0
 </from>
 </filter>
 
@@ -181,11 +202,22 @@
   /etc/passwd
   /etc/protocols
   /etc/rpm/macros.d/20common.macros
+
+  <!-- for gtk+3 that needs dbus to be initialized -->
+  <from dir="share">
+    <to dir="/etc">
+      <!-- abusing '<from expand="command">' -->
+      <from expand="command">
+	  dbus-uuidgen > share/machine-id; echo machine-id
+      </from>
+    </to>
+  </from>
+
 <!--  /usr/share/X11/XKeysymDB -->
   /etc/pango/ARCH/pango.modules
   /usr/LIB/libgdk_pixbuf-2.0.so.0
-  /usr/LIB/gtk-2.0/*/immodules/im-cedilla.so
-  /usr/LIB/gtk-2.0/*/engines/liboxygen-gtk.so
+  /usr/LIB/gtk-3.0/*/immodules/im-cedilla.so
+  /usr/LIB/gtk-3.0/*/theming-engines/liboxygen-gtk.so
   /usr/share/mime/mime.cache
 
   /usr/lib/libDrakX/keyboard.pm
@@ -208,8 +240,9 @@
   /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
 
   /etc/pki/tls/certs/ca-bundle.crt
 
@@ -227,6 +260,7 @@
     /usr/LIB/python2.7/_abcoll.py
     /usr/LIB/python2.7/abc.py
     /usr/LIB/python2.7/codecs.py
+    /usr/LIB/python2.7/collections.py
     /usr/LIB/python2.7/config/Makefile
     /usr/LIB/python2.7/copy.py
     /usr/LIB/python2.7/copy_reg.py
@@ -234,7 +268,11 @@
     /usr/LIB/python2.7/encodings/__init__.py
     /usr/LIB/python2.7/encodings/utf_8.py
     /usr/LIB/python2.7/genericpath.py
+    /usr/LIB/python2.7/heapq.py
+    /usr/LIB/python2.7/keyword.py
+    /usr/LIB/python2.7/lib-dynload/_collections.so
     /usr/LIB/python2.7/lib-dynload/itertools.so
+    /usr/LIB/python2.7/lib-dynload/operator.so
     /usr/LIB/python2.7/linecache.py
     /usr/LIB/python2.7/os.py
     /usr/LIB/python2.7/posixpath.py
@@ -246,37 +284,22 @@
     /usr/LIB/python2.7/sre_parse.py
     /usr/LIB/python2.7/stat.py
     /usr/LIB/python2.7/sysconfig.py
+    /usr/LIB/python2.7/_sysconfigdata.py
     /usr/LIB/python2.7/traceback.py
     /usr/LIB/python2.7/types.py
     /usr/LIB/python2.7/UserDict.py
     /usr/LIB/python2.7/warnings.py
     /usr/LIB/python2.7/weakref.py
     /usr/LIB/python2.7/_weakrefset.py
-    /usr/share/gdb/python/gdb/backtrace.py
-    /usr/share/gdb/python/gdb/command/backtrace.py
-    /usr/share/gdb/python/gdb/command/ignore_errors.py
-    /usr/share/gdb/python/gdb/command/__init__.py
-    /usr/share/gdb/python/gdb/command/pahole.py
-    /usr/share/gdb/python/gdb/command/pretty_printers.py
-    /usr/share/gdb/python/gdb/command/require.py
-    /usr/share/gdb/python/gdb/command/upto.py
-    /usr/share/gdb/python/gdb/FrameIterator.py
-    /usr/share/gdb/python/gdb/FrameWrapper.py
-    /usr/share/gdb/python/gdb/function/caller_is.py
-    /usr/share/gdb/python/gdb/function/__init__.py
-    /usr/share/gdb/python/gdb/function/in_scope.py
-    /usr/share/gdb/python/gdb/__init__.py
+    <from expand="glob">
+      /usr/share/gdb/python/gdb/*
+    </from>
   </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
-    /etc/gtk-2.0/gtk.immodules.*
     /etc/brltty/*.ttb
     /etc/brltty/*.txt
     /LIB/brltty/libbrlttyb??.so
@@ -464,7 +487,6 @@
 </from>
 
 <from expand="perl">
-  packdrake.pm
   Config/IniFiles.pm
   MDV/Distribconf.pm
   MDV/Packdrakeng.pm
@@ -473,6 +495,7 @@
   Parse/EDID.pm
   String/ShellQuote.pm
   XML/SAX/Exception.pm
+  ARCH-linux-thread-multi/Cairo.pm
   ARCH-linux-thread-multi/List/MoreUtils.pm
   ARCH-linux-thread-multi/Term/ReadKey.pm
   ARCH-linux-thread-multi/XML/LibXML.pm
@@ -484,6 +507,7 @@
   ARCH-linux-thread-multi/XML/LibXML/Boolean.pm
   ARCH-linux-thread-multi/XML/LibXML/Literal.pm
   ARCH-linux-thread-multi/XML/LibXML/Number.pm
+  ARCH-linux-thread-multi/auto/Cairo/Cairo.so
   ARCH-linux-thread-multi/auto/Term/ReadKey/ReadKey.so
   ARCH-linux-thread-multi/auto/XML/LibXML/LibXML.so
   urpm.pm
@@ -525,10 +549,12 @@
   perl-File-FnMatch
   perl-File-Sync
   perl-Filesys-Df
+  perl-Cairo-GObject
   perl-Clone
   perl-Glib
-  perl-Gtk2
-  perl-Gtk2-WebKit
+  perl-Glib-Object-Introspection
+  perl-Gtk3
+  perl-Gtk3-WebKit
   perl-Locale-gettext
   perl-MDK-Common
   perl-Pango
@@ -549,7 +575,6 @@
 <from dir="../../tools">
   <to dir="/usr/bin" flatten="on">
     serial_probe/serial_probe 
-    xhost+
   </to>
 </from>
 
@@ -587,13 +612,10 @@
   </to>
 </from>
 
-<from dir="share">
-  <to dir="/etc/gtk-2.0/">
-    gtkrc
-  </to>
+<from dir="/etc/gtk-3.0/">
+  settings.ini
 </from>
 
-
 <from dir="pixmaps">
   <to dir="/usr/share">
     <from expand="glob">