Merge remote branch 'nutyx-2009/master'

3 files changed, 37 insertions, 18 deletions

diff --git a/gnome/gnome-control-center/.footprint b/gnome/gnome-control-center/.footprint
index 6044a6d48..2984bb51e 100644
--- a/gnome/gnome-control-center/.footprint
+++ b/gnome/gnome-control-center/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x	root/root	etc/gconf/
 drwxr-xr-x	root/root	etc/gconf/schemas/
 -rw-r--r--	root/root	etc/gconf/schemas/control-center.schemas
 -rw-r--r--	root/root	etc/gconf/schemas/fontilus.schemas
+-rw-r--r--	root/root	etc/gconf/schemas/gnome-control-center.schemas
 drwxr-xr-x	root/root	etc/xdg/
 drwxr-xr-x	root/root	etc/xdg/autostart/
 -rw-r--r--	root/root	etc/xdg/autostart/gnome-at-session.desktop
@@ -62,18 +63,6 @@ drwxr-xr-x	root/root	usr/share/desktop-directories/
 drwxr-xr-x	root/root	usr/share/gnome-control-center/
 drwxr-xr-x	root/root	usr/share/gnome-control-center/default-apps/
 -rw-r--r--	root/root	usr/share/gnome-control-center/default-apps/gnome-default-applications.xml
-drwxr-xr-x	root/root	usr/share/gnome-control-center/glade/
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/appearance.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/at-enable-dialog.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/display-capplet.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-about-me-fingerprint.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-about-me.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-default-applications-properties.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-keybinding-properties.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-keyboard-properties.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-mouse-properties.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-network-properties.glade
--rw-r--r--	root/root	usr/share/gnome-control-center/glade/gnome-window-properties.glade
 drwxr-xr-x	root/root	usr/share/gnome-control-center/keybindings/
 -rw-r--r--	root/root	usr/share/gnome-control-center/keybindings/00-multimedia-key.xml
 -rw-r--r--	root/root	usr/share/gnome-control-center/keybindings/01-desktop-key.xml
@@ -91,17 +80,46 @@ drwxr-xr-x	root/root	usr/share/gnome-control-center/pixmaps/
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/gnome-about-me-lock.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/left-index-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/left-little-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/left-middle-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/left-ring-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/left-thumb.svg
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/mouse-cursor-normal-large.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/mouse-cursor-normal.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/mouse-cursor-white-large.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/mouse-cursor-white.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/ocean-stripes.png
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/print_error.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/print_ok.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/right-index-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/right-little-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/right-middle-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/right-ring-finger.svg
+-rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/right-thumb.svg
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/subpixel-bgr.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/subpixel-rgb.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/subpixel-vbgr.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/subpixel-vrgb.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/theme-thumbnailing.png
 -rw-r--r--	root/root	usr/share/gnome-control-center/pixmaps/window-theme-thumbnailing.png
+drwxr-xr-x	root/root	usr/share/gnome-control-center/ui/
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/appearance.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/at-enable-dialog.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/display-capplet.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-about-me-dialog.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-about-me-fingerprint.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-about-me-password.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-default-applications-properties.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-keybinding-properties.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-keyboard-properties-dialog.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-keyboard-properties-layout-chooser.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-keyboard-properties-model-chooser.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-keyboard-properties-options-dialog.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-mouse-properties.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-network-properties.ui
+-rw-r--r--	root/root	usr/share/gnome-control-center/ui/gnome-window-properties.ui
 drwxr-xr-x	root/root	usr/share/gnome/
 drwxr-xr-x	root/root	usr/share/gnome/cursor-fonts/
 -rw-r--r--	root/root	usr/share/gnome/cursor-fonts/cursor-large-white.pcf
@@ -132,6 +150,8 @@ drwxr-xr-x	root/root	usr/share/gnome/help/control-center/cs/
 -rw-r--r--	root/root	usr/share/gnome/help/control-center/cs/control-center.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/control-center/de/
 -rw-r--r--	root/root	usr/share/gnome/help/control-center/de/control-center.xml
+drwxr-xr-x	root/root	usr/share/gnome/help/control-center/el/
+-rw-r--r--	root/root	usr/share/gnome/help/control-center/el/control-center.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/control-center/en_GB/
 -rw-r--r--	root/root	usr/share/gnome/help/control-center/en_GB/control-center.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/control-center/es/
@@ -210,6 +230,7 @@ drwxr-xr-x	root/root	usr/share/omf/control-center/
 -rw-r--r--	root/root	usr/share/omf/control-center/control-center-ca@valencia.omf
 -rw-r--r--	root/root	usr/share/omf/control-center/control-center-cs.omf
 -rw-r--r--	root/root	usr/share/omf/control-center/control-center-de.omf
+-rw-r--r--	root/root	usr/share/omf/control-center/control-center-el.omf
 -rw-r--r--	root/root	usr/share/omf/control-center/control-center-en_GB.omf
 -rw-r--r--	root/root	usr/share/omf/control-center/control-center-es.omf
 -rw-r--r--	root/root	usr/share/omf/control-center/control-center-fr.omf
diff --git a/gnome/gnome-control-center/.md5sum b/gnome/gnome-control-center/.md5sum
index fdca56c28..1b8d3de9a 100644
--- a/gnome/gnome-control-center/.md5sum
+++ b/gnome/gnome-control-center/.md5sum
@@ -1,2 +1,2 @@
 7288b4af395044ce74f88d72527891b0  gnome-control-center-2.26.0-libxklavier-4.0-1.patch
-eed8feccc37712e34d88bd3b20e46962  gnome-control-center-2.26.0.tar.bz2
+a37a1b5ff4cfce45baef0cf31126d380  gnome-control-center-2.28.1.tar.bz2
diff --git a/gnome/gnome-control-center/Pkgfile b/gnome/gnome-control-center/Pkgfile
index 50ee97fdc..046bbead8 100644
--- a/gnome/gnome-control-center/Pkgfile
+++ b/gnome/gnome-control-center/Pkgfile
@@ -5,14 +5,12 @@
 # Depends on: gst-plugins-base, libcanberra, libgnomekbd, gnome-panel, metacity, nautilus, hal, gnome-settings-daemon, evolution-data-server
 
 name=gnome-control-center
-version=2.26.0
-release=2
-source=(http://ftp.gnome.org/pub/gnome/sources/$name/2.26/$name-$version.tar.bz2\
-	gnome-control-center-2.26.0-libxklavier-4.0-1.patch)
+version=2.28.1
+release=1
+source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../gnome-control-center-2.26.0-libxklavier-4.0-1.patch
 	./configure --prefix=$GNOME_PREFIX \
 		--sysconfdir=/etc \
 		--enable-aboutme \