From 46471aabd6a6473e7c6e53e914d03fc9a084076a Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 26 Jun 2010 16:51:57 +0200 Subject: maj xfce#4.6.2-1 --- xfce/xfce/.footprint | 123 +++---------------------------------------------- xfce/xfce/.md5sum | 2 +- xfce/xfce/Pkgfile | 29 ++++-------- xfce/xfce/XFCE.xinitrc | 2 + xfce/xfce/post-install | 2 +- 5 files changed, 20 insertions(+), 138 deletions(-) create mode 100755 xfce/xfce/XFCE.xinitrc diff --git a/xfce/xfce/.footprint b/xfce/xfce/.footprint index f3364300e..ab20fb4b8 100644 --- a/xfce/xfce/.footprint +++ b/xfce/xfce/.footprint @@ -1,118 +1,7 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/skel/ -drwx------ root/root etc/skel/.cache/ -drwx------ root/root etc/skel/.cache/Thunar/ --rw-r--r-- root/root etc/skel/.cache/Thunar/metafile.tdb --rw-r--r-- root/root etc/skel/.cache/Thunar/thumbnailers.cache -drwx------ root/root etc/skel/.config/ -drwx------ root/root etc/skel/.config/Terminal/ --rw-r--r-- root/root etc/skel/.config/Terminal/terminalrc -drwx------ root/root etc/skel/.config/Thunar/ --rw-r--r-- root/root etc/skel/.config/Thunar/accels.scm --rw-r--r-- root/root etc/skel/.config/Thunar/thunarrc --rw-r--r-- root/root etc/skel/.config/Thunar/volmanrc -drwx------ root/root etc/skel/.config/autostart/ --rw-r--r-- root/root etc/skel/.config/autostart/xfce4-settings-helper-autostart.desktop --rw-r--r-- root/root etc/skel/.config/autostart/xfce4-tips-autostart.desktop -drwx------ root/root etc/skel/.config/gtk-2.0/ --rw-r--r-- root/root etc/skel/.config/gtk-2.0/gtkfilechooser.ini -drwx------ root/root etc/skel/.config/xarchiver/ --rw-r--r-- root/root etc/skel/.config/xarchiver/xarchiverrc -drwx------ root/root etc/skel/.config/xfce4-session/ -drwxr-xr-x root/root etc/skel/.config/xfce4/ --rw-r--r-- root/root etc/skel/.config/xfce4/Xcursor.xrdb --rw-r--r-- root/root etc/skel/.config/xfce4/Xft.xrdb -drwx------ root/root etc/skel/.config/xfce4/panel/ --rw-r--r-- root/root etc/skel/.config/xfce4/panel/actions-12.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/clock-14.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/launcher-10.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/launcher-7.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/launcher-8.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/pager-2.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/panels.xml --rw-r--r-- root/root etc/skel/.config/xfce4/panel/places-12358554313.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/separator-13.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/separator-6.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/systray-4.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/tasklist-3.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/xfce4-menu-5.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/xfce4-mixer-plugin-12358530830.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/xfce4-notes-plugin-12358551462.rc --rw-r--r-- root/root etc/skel/.config/xfce4/panel/xfce4-notes-plugin.gtkrc -drwxr-xr-x root/root etc/skel/.config/xfce4/xfconf/ -drwx------ root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --rw-r--r-- root/root etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml -drwx------ root/root etc/skel/.config/xfce4/xfwm4/ -drwxr-xr-x root/root etc/skel/.local/ -drwx------ root/root etc/skel/.local/share/ -drwx------ root/root etc/skel/.local/share/applications/ --rw-r--r-- root/root etc/skel/.local/share/applications/defaults.list -drwxr-xr-x root/root root/ -drwx------ root/root root/.cache/ -drwx------ root/root root/.cache/Thunar/ --rw-r--r-- root/root root/.cache/Thunar/metafile.tdb --rw-r--r-- root/root root/.cache/Thunar/thumbnailers.cache -drwx------ root/root root/.config/ -drwx------ root/root root/.config/Terminal/ --rw-r--r-- root/root root/.config/Terminal/terminalrc -drwx------ root/root root/.config/Thunar/ --rw-r--r-- root/root root/.config/Thunar/accels.scm --rw-r--r-- root/root root/.config/Thunar/thunarrc --rw-r--r-- root/root root/.config/Thunar/volmanrc -drwx------ root/root root/.config/autostart/ --rw-r--r-- root/root root/.config/autostart/xfce4-settings-helper-autostart.desktop --rw-r--r-- root/root root/.config/autostart/xfce4-tips-autostart.desktop -drwx------ root/root root/.config/gtk-2.0/ --rw-r--r-- root/root root/.config/gtk-2.0/gtkfilechooser.ini -drwx------ root/root root/.config/xarchiver/ --rw-r--r-- root/root root/.config/xarchiver/xarchiverrc -drwx------ root/root root/.config/xfce4-session/ -drwxr-xr-x root/root root/.config/xfce4/ --rw-r--r-- root/root root/.config/xfce4/Xcursor.xrdb --rw-r--r-- root/root root/.config/xfce4/Xft.xrdb -drwx------ root/root root/.config/xfce4/panel/ --rw-r--r-- root/root root/.config/xfce4/panel/actions-12.rc --rw-r--r-- root/root root/.config/xfce4/panel/clock-14.rc --rw-r--r-- root/root root/.config/xfce4/panel/launcher-10.rc --rw-r--r-- root/root root/.config/xfce4/panel/launcher-7.rc --rw-r--r-- root/root root/.config/xfce4/panel/launcher-8.rc --rw-r--r-- root/root root/.config/xfce4/panel/pager-2.rc --rw-r--r-- root/root root/.config/xfce4/panel/panels.xml --rw-r--r-- root/root root/.config/xfce4/panel/places-12358554313.rc --rw-r--r-- root/root root/.config/xfce4/panel/separator-13.rc --rw-r--r-- root/root root/.config/xfce4/panel/separator-6.rc --rw-r--r-- root/root root/.config/xfce4/panel/systray-4.rc --rw-r--r-- root/root root/.config/xfce4/panel/tasklist-3.rc --rw-r--r-- root/root root/.config/xfce4/panel/xfce4-menu-5.rc --rw-r--r-- root/root root/.config/xfce4/panel/xfce4-mixer-plugin-12358530830.rc --rw-r--r-- root/root root/.config/xfce4/panel/xfce4-notes-plugin-12358551462.rc --rw-r--r-- root/root root/.config/xfce4/panel/xfce4-notes-plugin.gtkrc -drwxr-xr-x root/root root/.config/xfce4/xfconf/ -drwx------ root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/ --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml --rw-r--r-- root/root root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml -drwx------ root/root root/.config/xfce4/xfwm4/ -drwxr-xr-x root/root root/.local/ -drwx------ root/root root/.local/share/ -drwx------ root/root root/.local/share/applications/ --rw-r--r-- root/root root/.local/share/applications/defaults.list -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/xfce4/ -drwxr-xr-x root/root usr/share/xfce4/backdrops/ --rw-r--r-- root/root usr/share/xfce4/backdrops/nutyx2009_2.png +drwxr-xr-x root/root etc/X11/ +drwxr-xr-x root/root etc/X11/dm/ +-rw-r--r-- root/root etc/X11/dm/XFCE.xinitrc +drwxr-xr-x root/root etc/qingy/ +drwxr-xr-x root/root etc/qingy/sessions/ +-rwxr-xr-x root/root etc/qingy/sessions/XFCE diff --git a/xfce/xfce/.md5sum b/xfce/xfce/.md5sum index 2a8cb1e13..b8b77969e 100644 --- a/xfce/xfce/.md5sum +++ b/xfce/xfce/.md5sum @@ -1 +1 @@ -514706cb619046f21d705503a0aba07f xfce-desktop-4.6.1-6.tar.bz2 +e061ab82332aa17ea0ff16c21d8e6315 XFCE.xinitrc diff --git a/xfce/xfce/Pkgfile b/xfce/xfce/Pkgfile index 9e64c126e..3fa7c39aa 100755 --- a/xfce/xfce/Pkgfile +++ b/xfce/xfce/Pkgfile @@ -1,28 +1,19 @@ # Description: Environnement graphique leger et performant (installe tous les paquets et dependances) # URL: http://www.xfce.org/ # Maintainer: NuTyX core team -# Packager: fred.galusik at gmail dot com -# Depends on: atk, dbh, dbus, dbus-glib, expat, fontconfig, freetype, fuse, gdm, glib, intltool, libgcrypt, libgpg-error, libgsf, libnotify, libpng, librsvg, libwnck, xorg-libx11, libxml2, gtk, gestpkg, cups, hal, gamin, gnutls, pango, pcre, python, startup-notification, alsa-utils, xdg-utils, hicolor-icon-theme, xfce4-dev-tools, libxfce4util, libxfcegui4, libxfce4menu, exo, xfce4-panel, thunar, libgnome, xfce4-session, xfce4-settings, xfwm4, xfwm4-themes, xfdesktop, xfce-utils, xfprint, gtk-xfce-engine, mousepad, vte, terminal, xarchiver, xfburn, orage, xfce4-appfinder, xfce4-mixer, xfmedia, xfce4-artwork, ristretto, thunar-volman, thunar-archive-plugin, thunar-media-tags-plugin, thunar-thumbnailers, xfce4-cpugraph-plugin, xfce4-places-plugin, xfce4-weather-plugin, xfce4-screenshooter, xfce4-taskmanager, xfce4-verve-plugin, xfce4-power-manager, xfce4-icon-theme, xfce4-notifyd, gigolo, gnupg1, oxygenrefit2-red, tango-icon-theme, midori, wicd, sylpheed, pidgin, xorg +# Packager: thierryn1 at hispeed dot ch +# Depends on: atk, dbh, dbus, dbus-glib, expat, fontconfig, freetype, fuse, glib, intltool, libgcrypt, libgpg-error, libgsf, libnotify, libpng, librsvg, libwnck, xorg-libx11, libxml2, gtk, gestpkg, cups, hal, gamin, gnutls, pango, pcre, python, startup-notification, alsa-utils, xdg-utils, hicolor-icon-theme, xfce4-dev-tools, libxfce4util, libxfcegui4, libxfce4menu, exo, xfce4-panel, thunar, libgnome, xfce4-session, xfce4-settings, xfwm4, xfwm4-themes, xfdesktop, xfce-utils, xfprint, gtk-xfce-engine, mousepad, vte, terminal, xarchiver, xfburn, orage, xfce4-appfinder, xfce4-mixer, xfmedia, xfce4-artwork, ristretto, thunar-volman, thunar-archive-plugin, thunar-media-tags-plugin, thunar-thumbnailers, xfce4-cpugraph-plugin, xfce4-places-plugin, xfce4-weather-plugin, xfce4-screenshooter, xfce4-taskmanager, xfce4-verve-plugin, xfce4-power-manager, xfce4-icon-theme, xfce4-notifyd, gigolo, gnupg1, oxygenrefit2-red, tango-icon-theme, midori, wicd, sylpheed, pidgin, xorg name=xfce -version=4.6.1 -release=6 -source=(http://kiao.no-ip.info/NuTyX/files/$name-desktop-$version-$release.tar.bz2) +version=4.6.2 +release=1 +source=(XFCE.xinitrc) build() { -cd $name-desktop-$version - cp -Rfp * $PKG - chown -R root:root $PKG - cd $PKG - find . -perm 664 -exec chmod 644 {} \; - find . -perm 600 -exec chmod 644 {} \; - find . -perm 444 -exec chmod 644 {} \; - find . -perm 400 -exec chmod 644 {} \; - find . -perm 440 -exec chmod 644 {} \; - find . -perm 777 -exec chmod 755 {} \; - find . -perm 775 -exec chmod 755 {} \; - find . -perm 511 -exec chmod 755 {} \; - find . -perm 711 -exec chmod 755 {} \; - find . -perm 555 -exec chmod 755 {} \; + install -D -m644 XFCE.xinitrc $PKG/etc/X11/dm/XFCE.xinitrc + mkdir -p $PKG/etc/qingy/sessions +echo "userclientrc=/etc/X11/dm/XFCE.xinitrc /usr/bin/startx.qingy" >\ + $PKG/etc/qingy/sessions/XFCE + chmod 755 $PKG/etc/qingy/sessions/XFCE } diff --git a/xfce/xfce/XFCE.xinitrc b/xfce/xfce/XFCE.xinitrc new file mode 100755 index 000000000..1e9ace610 --- /dev/null +++ b/xfce/xfce/XFCE.xinitrc @@ -0,0 +1,2 @@ +dbus-launch --exit-with-session & +/usr/bin/startxfce4 diff --git a/xfce/xfce/post-install b/xfce/xfce/post-install index ca1c234de..8c282bc3f 100755 --- a/xfce/xfce/post-install +++ b/xfce/xfce/post-install @@ -1,6 +1,6 @@ #!/bin/bash update-desktop-database -sed -i "s/^id:[3-5]/id:4/" /etc/inittab +sed -i "s/^id:[3-5]/id:3/" /etc/inittab sed -i "s/^\(Session=\).*$/\1xfce/g" /etc/skel/.dmrc -- cgit v1.2.3-70-g09d2