diff options
author | tnut <tnut at nutyx dot com> | 2011-05-15 16:42:45 +0200 |
---|---|---|
committer | tnut <tnut at nutyx dot com> | 2011-05-15 16:42:45 +0200 |
commit | 3698a74fe7f226e7a5e17005019696771204dd25 (patch) | |
tree | ae7f391a4aaf943c7b28091f519d46298553764c /xfce | |
parent | f6877a674a28185b827f663f1796c1d0c617ba73 (diff) | |
parent | ca8bb9c38adfe0b31ac984847d912ede08b9bc97 (diff) | |
download | nutyx-extra-3698a74fe7f226e7a5e17005019696771204dd25.tar.gz nutyx-extra-3698a74fe7f226e7a5e17005019696771204dd25.tar.bz2 nutyx-extra-3698a74fe7f226e7a5e17005019696771204dd25.tar.xz nutyx-extra-3698a74fe7f226e7a5e17005019696771204dd25.zip |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'xfce')
-rwxr-xr-x | xfce/xfce/post-install | 5 | ||||
-rw-r--r-- | xfce/xfce4-session/.footprint.i686 | 1 | ||||
-rw-r--r-- | xfce/xfce4-session/.footprint.x86_64 | 1 | ||||
-rwxr-xr-x | xfce/xfce4-session/Pkgfile | 3 | ||||
-rw-r--r-- | xfce/xfwm4/.footprint.i686 | 4 | ||||
-rw-r--r-- | xfce/xfwm4/.footprint.x86_64 | 4 | ||||
-rwxr-xr-x | xfce/xfwm4/Pkgfile | 5 |
7 files changed, 18 insertions, 5 deletions
diff --git a/xfce/xfce/post-install b/xfce/xfce/post-install index ee18fd997..c50db93a8 100755 --- a/xfce/xfce/post-install +++ b/xfce/xfce/post-install @@ -1,4 +1,7 @@ #!/bin/bash update-desktop-database -sed -i "s/^id:[3-5]/id:3/" /etc/inittab +sed -i "s/^id:[3-5]/id:4/" /etc/inittab + +# Activer kde par défaut +sed -i "s/^\(Session=\).*$/\1xfce4/g" /etc/skel/.dmrc diff --git a/xfce/xfce4-session/.footprint.i686 b/xfce/xfce4-session/.footprint.i686 index 994c472b7..cbdc6db6c 100644 --- a/xfce/xfce4-session/.footprint.i686 +++ b/xfce/xfce4-session/.footprint.i686 @@ -1,7 +1,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/xdg/ drwxr-xr-x root/root etc/xdg/autostart/ --rw-r--r-- root/root etc/xdg/autostart/xfce4-tips-autostart.desktop drwxr-xr-x root/root etc/xdg/xfce4/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/xfce-perchannel-xml/ diff --git a/xfce/xfce4-session/.footprint.x86_64 b/xfce/xfce4-session/.footprint.x86_64 index 994c472b7..cbdc6db6c 100644 --- a/xfce/xfce4-session/.footprint.x86_64 +++ b/xfce/xfce4-session/.footprint.x86_64 @@ -1,7 +1,6 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/xdg/ drwxr-xr-x root/root etc/xdg/autostart/ --rw-r--r-- root/root etc/xdg/autostart/xfce4-tips-autostart.desktop drwxr-xr-x root/root etc/xdg/xfce4/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/ drwxr-xr-x root/root etc/xdg/xfce4/xfconf/xfce-perchannel-xml/ diff --git a/xfce/xfce4-session/Pkgfile b/xfce/xfce4-session/Pkgfile index be842becd..fbe187076 100755 --- a/xfce/xfce4-session/Pkgfile +++ b/xfce/xfce4-session/Pkgfile @@ -7,7 +7,7 @@ name=xfce4-session version=4.8.1 -release=2 +release=3 source=(http://archive.xfce.org/src/xfce/$name/4.8/$name-$version.tar.bz2) build() { @@ -23,4 +23,5 @@ cd $name-$version make make DESTDIR=$PKG install rm -r $PKG/usr/share/doc + rm $PKG/etc/xdg/autostart/xfce4-tips-autostart.desktop } diff --git a/xfce/xfwm4/.footprint.i686 b/xfce/xfwm4/.footprint.i686 index cb43106db..107d68e37 100644 --- a/xfce/xfwm4/.footprint.i686 +++ b/xfce/xfwm4/.footprint.i686 @@ -1,3 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/autostart/ +-rw-r--r-- root/root etc/xdg/autostart/xfce-wm-start.desktop drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xfwm4 diff --git a/xfce/xfwm4/.footprint.x86_64 b/xfce/xfwm4/.footprint.x86_64 index cb43106db..107d68e37 100644 --- a/xfce/xfwm4/.footprint.x86_64 +++ b/xfce/xfwm4/.footprint.x86_64 @@ -1,3 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/autostart/ +-rw-r--r-- root/root etc/xdg/autostart/xfce-wm-start.desktop drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xfwm4 diff --git a/xfce/xfwm4/Pkgfile b/xfce/xfwm4/Pkgfile index e1066ce11..250830cef 100755 --- a/xfce/xfwm4/Pkgfile +++ b/xfce/xfwm4/Pkgfile @@ -7,7 +7,7 @@ name=xfwm4 version=4.8.1 -release=1 +release=2 source=(http://archive.xfce.org/src/xfce/$name/4.8/$name-$version.tar.bz2) build() { @@ -22,4 +22,7 @@ cd $name-$version make make DESTDIR=$PKG install rm -r $PKG/usr/share/doc + mkdir -p $PKG/etc/xdg/autostart + sed "s/xfwm4-settings/xfwm4/" $PKG/usr/share/applications/xfce-wm-settings.desktop > \ + $PKG/etc/xdg/autostart/xfce-wm-start.desktop } |