Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

24 files changed, 28 insertions, 25 deletions

diff --git a/gnome/bug-buddy/Pkgfile b/gnome/bug-buddy/Pkgfile
index a2387169c..781b47449 100755
--- a/gnome/bug-buddy/Pkgfile
+++ b/gnome/bug-buddy/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.bug-buddy.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, libglade, gnome-desktop, gnome-menus, gnome-doc-utils, evolution-data-server, libsoup, libgtop, libelf
+# Depends on: libgnomeui, libglade, gnome-desktop, gnome-menus, evolution-data-server, libsoup, libgtop, libelf
 
 name=bug-buddy
 version=2.30.0
diff --git a/gnome/cheese/Pkgfile b/gnome/cheese/Pkgfile
index d67ff1d5e..e5ac89686 100644
--- a/gnome/cheese/Pkgfile
+++ b/gnome/cheese/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: glib, gtk, libgnomeui, libcanberra, hal, cairo, evolution-data-server, gst-plugins-good, gconf, librsvg, gnome-desktop, gudev
+# Depends on: glib, gtk, libgnomeui, libcanberra, hal, cairo, evolution-data-server, gst-plugins-good, gconf, librsvg, gnome-desktop
 
 name=cheese
 version=2.30.0
diff --git a/gnome/epiphany/Pkgfile b/gnome/epiphany/Pkgfile
index 97b40615f..523c9c0bd 100644
--- a/gnome/epiphany/Pkgfile
+++ b/gnome/epiphany/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gnome-doc-utils, gnome-desktop, startup-notification,iso-codes, avahi, webkit, libcanberra, libnotify, nss
+# Depends on: gnome-desktop, startup-notification,iso-codes, avahi, webkit, libcanberra, libnotify, nss
 
 name=epiphany
 version=2.30.2
diff --git a/gnome/evolution-data-server/Pkgfile b/gnome/evolution-data-server/Pkgfile
index 322479eca..766c1177e 100644
--- a/gnome/evolution-data-server/Pkgfile
+++ b/gnome/evolution-data-server/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Evolution's Backend Server
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtk-doc, libgnomeui, libsoup, nss, libical, libgweather, popt, bison
+# Depends on: libgnomeui, libsoup, nss, libical, libgweather, popt, bison
 
 name=evolution-data-server
 version=2.30.1
diff --git a/gnome/evolution-webcal/Pkgfile b/gnome/evolution-webcal/Pkgfile
index b0b2c02c2..33c141fb1 100755
--- a/gnome/evolution-webcal/Pkgfile
+++ b/gnome/evolution-webcal/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Plugin pour la messagerie electronique de gnome evolution
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtk-doc, gtkhtml, gnome-doc-utils, evolution
+# Depends on: gtkhtml, evolution
 
 name=evolution-webcal
 version=2.28.0
diff --git a/gnome/evolution/Pkgfile b/gnome/evolution/Pkgfile
index 69e44b99d..3ae598cb7 100755
--- a/gnome/evolution/Pkgfile
+++ b/gnome/evolution/Pkgfile
@@ -1,7 +1,7 @@
 # Description: client messagerie evolution
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libpst, gtk-doc, gtkhtml, gnome-doc-utils, evolution-data-server, libcanberra, libunique, networkmanager, gtkimageview, nss, hal, dbus-glib, gstreamer, libnotify, intltool, gnome-desktop
+# Depends on: libpst, gtkhtml, evolution-data-server, libcanberra, libunique, networkmanager, gtkimageview, nss, hal, dbus-glib, gstreamer, libnotify, intltool, gnome-desktop
 
 name=evolution
 version=2.30.1.2
diff --git a/gnome/file-roller/Pkgfile b/gnome/file-roller/Pkgfile
index 3875f09a0..64be775fc 100644
--- a/gnome/file-roller/Pkgfile
+++ b/gnome/file-roller/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, gnome-doc-utils
+# Depends on: libgnomeui
 
 name=file-roller
 version=2.30.0
diff --git a/gnome/gcalctool/Pkgfile b/gnome/gcalctool/Pkgfile
index dc14ebec2..744bab48a 100644
--- a/gnome/gcalctool/Pkgfile
+++ b/gnome/gcalctool/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, gnome-doc-utils
+# Depends on: libgnomeui
 
 name=gcalctool
 version=5.30.0
diff --git a/gnome/gconf-editor/Pkgfile b/gnome/gconf-editor/Pkgfile
index 3df0c1681..259c10d40 100644
--- a/gnome/gconf-editor/Pkgfile
+++ b/gnome/gconf-editor/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, gnome-doc-utils
+# Depends on: libgnomeui
 
 name=gconf-editor
 version=2.30.0
diff --git a/gnome/gedit/Pkgfile b/gnome/gedit/Pkgfile
index 3883a6361..b681be3d7 100644
--- a/gnome/gedit/Pkgfile
+++ b/gnome/gedit/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, libgnomeprintui, gnome-doc-utils, gtksourceview, pygtk
+# Depends on: libgnomeui, libgnomeprintui, gtksourceview, pygtk
 
 name=gedit
 version=2.30.0
diff --git a/gnome/gnome-desktop/Pkgfile b/gnome/gnome-desktop/Pkgfile
index ae224aa27..4c1e7b3af 100644
--- a/gnome/gnome-desktop/Pkgfile
+++ b/gnome/gnome-desktop/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, gnome-doc-utils, startup-notification
+# Depends on: libgnomeui, startup-notification
 
 name=gnome-desktop
 version=2.30.0
diff --git a/gnome/gnome-device-manager/Pkgfile b/gnome/gnome-device-manager/Pkgfile
index b157e3736..c48f16fa0 100644
--- a/gnome/gnome-device-manager/Pkgfile
+++ b/gnome/gnome-device-manager/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: hal, hicolor-icon-theme, libgnomeui, gnome-doc-utils
+# Depends on: hal, hicolor-icon-theme, libgnomeui
 
 name=gnome-device-manager
 version=0.2
diff --git a/gnome/gnome-doc-utils/Pkgfile b/gnome/gnome-doc-utils/Pkgfile
index 65da1e3d7..be7068445 100644
--- a/gnome/gnome-doc-utils/Pkgfile
+++ b/gnome/gnome-doc-utils/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: intltool, libxslt, p5-xml-parser, rarian, docbook-xml
+# Depends on: intltool, libxslt, p5-xml-parser, rarian
 
 name=gnome-doc-utils
 version=0.20.0
diff --git a/gnome/gnome-keyring-manager/Pkgfile b/gnome/gnome-keyring-manager/Pkgfile
index 848ffb73a..b8bc4995e 100755
--- a/gnome/gnome-keyring-manager/Pkgfile
+++ b/gnome/gnome-keyring-manager/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, gnome-doc-utils, intltool
+# Depends on: libgnomeui, intltool
 
 name=gnome-keyring-manager
 version=2.20.0
diff --git a/gnome/gnome-python-desktop/Pkgfile b/gnome/gnome-python-desktop/Pkgfile
index 88f009446..3621d0d18 100755
--- a/gnome/gnome-python-desktop/Pkgfile
+++ b/gnome/gnome-python-desktop/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/about/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gnome-applets, libgtop, libgnomeprintui, gtksourceview, metacity, evolution, evince, libgnomeui, gnome-python, startup-notification, gnome-doc-utils, totem, nautilus-cd-burner, brasero
+# Depends on: gnome-applets, libgtop, libgnomeprintui, gtksourceview, metacity, evolution, evince, libgnomeui, gnome-python, startup-notification, totem, nautilus-cd-burner, brasero
 
 name=gnome-python-desktop
 version=2.30.0
diff --git a/gnome/gnome-speech/Pkgfile b/gnome/gnome-speech/Pkgfile
index 1d38fc41e..32fa09567 100755
--- a/gnome/gnome-speech/Pkgfile
+++ b/gnome/gnome-speech/Pkgfile
@@ -1,8 +1,8 @@
 # Description: general API for producing text-to-speech output
 # URL: http://mail.gnome.org/mailman/listinfo/gnome-accessibility-devel
-# Maintainer: Matt Housh, jaeger at morpheus dot net
-# Packager: jaeger at morpheus dot net
-# Depends on: libbonobo, jdk
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: libbonobo
 
 name=gnome-speech
 version=0.4.22
diff --git a/gnome/gnome-terminal/Pkgfile b/gnome/gnome-terminal/Pkgfile
index 1f5771b27..1eaea4812 100644
--- a/gnome/gnome-terminal/Pkgfile
+++ b/gnome/gnome-terminal/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, gnome-doc-utils, vte, startup-notification
+# Depends on: libgnomeui, vte, startup-notification
 
 name=gnome-terminal
 version=2.30.0
diff --git a/gnome/gnome-user-docs/Pkgfile b/gnome/gnome-user-docs/Pkgfile
index ac423288e..eea1f375c 100644
--- a/gnome/gnome-user-docs/Pkgfile
+++ b/gnome/gnome-user-docs/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gnome-doc-utils, docbook-xsl
+# Depends on: gnome-doc-utils
 
 name=gnome-user-docs
 version=2.30.0
diff --git a/gnome/gnome/Pkgfile b/gnome/gnome/Pkgfile
index ee08d987b..d9c32f72c 100644
--- a/gnome/gnome/Pkgfile
+++ b/gnome/gnome/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: glib, gtk, gestpkg, orbit2, libbonobo, gconf, wicd, alacarte, iso-codes, libunique, devicekit, devicekit-power, bug-buddy, gnome-control-center, dasher, deskbar-applet, eog, epiphany, evince, evolution-data-server, evolution-webcal, file-roller, gcalctool, gconf-editor, gdm, gedit, gnome-applets, gnome-backgrounds, gnome-desktop, gnome-device-manager, gnome-doc-utils, gnome-games, gnome-icon-theme, libgnome-keyring, gnome-keyring, gnome-keyring-manager, gnome-mag, gnome-media, gnome-audio, gnome-menus, gnome-netstatus, gnome-panel, gnome-power-manager, gnome-python-desktop, gnome-screensaver, gnome-session, gnome-speech, gnome-system-monitor, gnome-terminal, gnome-themes, gnome-user-docs, gnome-utils, gnome-volume-manager, gok, gst-plugins-base, gst-plugins-good, ekiga, gstreamer, gtk-engines, gtkhtml, gtksourceview, gucharmap, libgail-gnome, libgnomeprint, libgnomeprintui, libgtop, librsvg, libsoup, libwnck, pidgin, zenity, metacity, nautilus, nautilus-cd-burner, brasero, orca, rarian, sound-juicer, startup-notification, sound-theme-freedesktop, totem, vino, vte, yelp, vinagre, cheese, meld
+# Depends on: glib, gtk, gestpkg, orbit2, libbonobo, gconf, wicd, alacarte, iso-codes, libunique, devicekit, devicekit-power, bug-buddy, gnome-control-center, dasher, deskbar-applet, eog, epiphany, evince, evolution-data-server, evolution-webcal, file-roller, gcalctool, gconf-editor, gdm, gedit, gnome-applets, gnome-backgrounds, gnome-desktop, gnome-device-manager, gnome-games, gnome-icon-theme, libgnome-keyring, gnome-keyring, gnome-keyring-manager, gnome-mag, gnome-media, gnome-audio, gnome-menus, gnome-netstatus, gnome-panel, gnome-power-manager, gnome-python-desktop, gnome-screensaver, gnome-session, gnome-speech, gnome-system-monitor, gnome-terminal, gnome-themes, gnome-utils, gnome-volume-manager, gok, gst-plugins-base, gst-plugins-good, ekiga, gstreamer, gtk-engines, gtkhtml, gtksourceview, gucharmap, libgail-gnome, libgnomeprint, libgnomeprintui, libgtop, librsvg, libsoup, libwnck, pidgin, zenity, metacity, nautilus, nautilus-cd-burner, brasero, orca, rarian, sound-juicer, startup-notification, sound-theme-freedesktop, totem, vino, vte, yelp, vinagre, cheese, meld, gparted
 
 name=gnome
 version=2.30.0
diff --git a/gnome/gnome/post-install b/gnome/gnome/post-install
index 47dfd231f..eca283276 100755
--- a/gnome/gnome/post-install
+++ b/gnome/gnome/post-install
@@ -3,3 +3,6 @@ if [ ! -d /etc/gconf/gconf.xml.system ]; then
 	mkdir -p /etc/gconf/gconf.xml.system
 fi 
 chmod 755 /etc/gconf/gconf.xml.system
+
+sed -i "s/^id:[3-5]/id:4/" /etc/inittab
+
diff --git a/gnome/gucharmap/Pkgfile b/gnome/gucharmap/Pkgfile
index a9891952e..a527887c7 100644
--- a/gnome/gucharmap/Pkgfile
+++ b/gnome/gucharmap/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtk, p5-xml-parser, gconf, gtk-doc
+# Depends on: gtk, p5-xml-parser, gconf
 
 name=gucharmap
 version=2.30.0
diff --git a/gnome/sound-juicer/Pkgfile b/gnome/sound-juicer/Pkgfile
index 959982b41..2377d430f 100755
--- a/gnome/sound-juicer/Pkgfile
+++ b/gnome/sound-juicer/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.burtonini.com/blog/computers/sound-juicer/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libmusicbrainz, libgnomeui, gst-plugins-base, gst-plugins-bad, gst-plugins-ugly, gst-plugins-good, gnome-doc-utils, nautilus-cd-burner, gnome-media
+# Depends on: libmusicbrainz, libgnomeui, gst-plugins-base, gst-plugins-bad, gst-plugins-ugly, gst-plugins-good, nautilus-cd-burner, gnome-media
 
 name=sound-juicer
 version=2.28.2
diff --git a/gnome/yelp/Pkgfile b/gnome/yelp/Pkgfile
index 3de8c2075..d0cb280e1 100644
--- a/gnome/yelp/Pkgfile
+++ b/gnome/yelp/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, startup-notification, gnome-doc-utils, xulrunner
+# Depends on: libgnomeui, startup-notification, xulrunner
 
 name=yelp
 version=2.30.0
diff --git a/gnome/zenity/Pkgfile b/gnome/zenity/Pkgfile
index 548df9457..a4185951d 100644
--- a/gnome/zenity/Pkgfile
+++ b/gnome/zenity/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtk, docbook-xsl, gnome-doc-utils
+# Depends on: gtk
 
 name=zenity
 version=2.30.0