Merge commit 'tyrry/master'

6 files changed, 46 insertions, 10 deletions

diff --git a/gnome/gok/.footprint b/gnome/gok/.footprint
index 465c7dfe0..3cec2578b 100755
--- a/gnome/gok/.footprint
+++ b/gnome/gok/.footprint
@@ -20,7 +20,7 @@ drwxr-xr-x	root/root	usr/share/gnome/help/
 drwxr-xr-x	root/root	usr/share/gnome/help/gok/
 drwxr-xr-x	root/root	usr/share/gnome/help/gok/C/
 -rw-r--r--	root/root	usr/share/gnome/help/gok/C/gok.xml
--rwxr-xr-x	root/root	usr/share/gnome/help/gok/C/legal.xml
+-rw-r--r--	root/root	usr/share/gnome/help/gok/C/legal.xml
 drwxr-xr-x	root/root	usr/share/gok/
 drwxr-xr-x	root/root	usr/share/gok/C/
 -rw-r--r--	root/root	usr/share/gok/C/gok-controls.kbd
@@ -153,6 +153,17 @@ drwxr-xr-x	root/root	usr/share/gok/ca/
 -rw-r--r--	root/root	usr/share/gok/ca/quit.kbd
 -rw-r--r--	root/root	usr/share/gok/ca/text-operations.kbd
 -rw-r--r--	root/root	usr/share/gok/ca/valuator.kbd
+drwxr-xr-x	root/root	usr/share/gok/ca@valencia/
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/gok-controls.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/hide.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/launcher.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/main.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/mouse.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/move-resize.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/numberpad.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/quit.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/text-operations.kbd
+-rw-r--r--	root/root	usr/share/gok/ca@valencia/valuator.kbd
 drwxr-xr-x	root/root	usr/share/gok/cs/
 -rw-r--r--	root/root	usr/share/gok/cs/gok-controls.kbd
 -rw-r--r--	root/root	usr/share/gok/cs/hide.kbd
@@ -338,8 +349,6 @@ drwxr-xr-x	root/root	usr/share/gok/glade/
 -rw-r--r--	root/root	usr/share/gok/glade/gok.glade2
 -rw-r--r--	root/root	usr/share/gok/gok.rc
 -rw-r--r--	root/root	usr/share/gok/goklogo.png
--rw-r--r--	root/root	usr/share/gok/goksound1.wav
--rw-r--r--	root/root	usr/share/gok/goksound2.wav
 drwxr-xr-x	root/root	usr/share/gok/gu/
 -rw-r--r--	root/root	usr/share/gok/gu/gok-controls.kbd
 -rw-r--r--	root/root	usr/share/gok/gu/hide.kbd
@@ -900,6 +909,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/gok/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/ch02.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/ch03.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/ch04.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-GokButton.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-arraylist.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-callbacks.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-command-common.html
@@ -917,6 +927,7 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/gok/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-data.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-editor.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-feedback.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-gconf-keys.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-gconf.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-key.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/gok/gok-gok-keyboard.html
@@ -968,3 +979,8 @@ drwxr-xr-x	root/root	usr/share/omf/gok/
 -rw-r--r--	root/root	usr/share/omf/gok/gok-C.omf
 drwxr-xr-x	root/root	usr/share/pixmaps/
 -rw-r--r--	root/root	usr/share/pixmaps/gok.png
+drwxr-xr-x	root/root	usr/share/sounds/
+drwxr-xr-x	root/root	usr/share/sounds/freedesktop/
+drwxr-xr-x	root/root	usr/share/sounds/freedesktop/stereo/
+-rw-r--r--	root/root	usr/share/sounds/freedesktop/stereo/goksound1.wav
+-rw-r--r--	root/root	usr/share/sounds/freedesktop/stereo/goksound2.wav
diff --git a/gnome/gok/.md5sum b/gnome/gok/.md5sum
index 0bb722e83..e9bbad3bb 100755
--- a/gnome/gok/.md5sum
+++ b/gnome/gok/.md5sum
@@ -1 +1 @@
-8cc28ad6010a977c9ccbe8d5b690f636  gok-2.26.0.tar.bz2
+d7305f12c703e13eeaed796f996dbc86  gok-2.28.1.tar.bz2
diff --git a/gnome/gok/Pkgfile b/gnome/gok/Pkgfile
index 4ed103c23..b9d04c63d 100755
--- a/gnome/gok/Pkgfile
+++ b/gnome/gok/Pkgfile
@@ -6,9 +6,9 @@
 # Group: gnome/desktop
 
 name=gok
-version=2.26.0
+version=2.28.1
 release=1
-gnomever=2.26.3
+gnomever=2.28.2
 source=(http://download.gnome.org/desktop/${gnomever%.*}/$gnomever/sources/$name-$version.tar.bz2)
 
 build() {
diff --git a/gnome/nautilus-cd-burner/.footprint b/gnome/nautilus-cd-burner/.footprint
index c5e2e6fd9..355a22899 100755
--- a/gnome/nautilus-cd-burner/.footprint
+++ b/gnome/nautilus-cd-burner/.footprint
@@ -29,6 +29,26 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/nautilus-cd-burner-open-iso.desktop
 -rw-r--r--	root/root	usr/share/applications/nautilus-cd-burner.desktop
+drwxr-xr-x	root/root	usr/share/gtk-doc/
+drwxr-xr-x	root/root	usr/share/gtk-doc/html/
+drwxr-xr-x	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/NautilusBurnDriveSelection.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/ch01.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/home.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/index.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/index.sgml
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/left.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner-nautilus-burn-drive-monitor.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner-nautilus-burn-drive.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner-nautilus-burn-features.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner-nautilus-burn-init.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner-nautilus-burn-process.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner-nautilus-burn-recorder.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner.devhelp
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/nautilus-cd-burner.devhelp2
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/right.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/style.css
+-rw-r--r--	root/root	usr/share/gtk-doc/html/nautilus-cd-burner/up.png
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
diff --git a/gnome/nautilus-cd-burner/.md5sum b/gnome/nautilus-cd-burner/.md5sum
index 7472fa3b9..0d5675349 100755
--- a/gnome/nautilus-cd-burner/.md5sum
+++ b/gnome/nautilus-cd-burner/.md5sum
@@ -1 +1 @@
-eb211dd03d0518263fa4eadccc3caa88  nautilus-cd-burner-2.24.0.tar.bz2
+02324246d8e4804e15e41ef7b62836a7  nautilus-cd-burner-2.25.3.tar.bz2
diff --git a/gnome/nautilus-cd-burner/Pkgfile b/gnome/nautilus-cd-burner/Pkgfile
index 29e046611..91a7b41e6 100755
--- a/gnome/nautilus-cd-burner/Pkgfile
+++ b/gnome/nautilus-cd-burner/Pkgfile
@@ -2,11 +2,11 @@
 # URL: http://cvs.gnome.org/viewcvs/nautilus-cd-burner/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gnome-mount, dbus, hal, nautilus
+# Depends on: gnome-mount, dbus, hal, nautilus, cdrtools, intltool
 
 name=nautilus-cd-burner
-version=2.24.0
-release=1
+version=2.25.3
+release=3
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
 
 build() {