wok diff xorg-server-Xvesa/receipt @ rev 3015

Up: Xvesa and others and add xorg-server-tinyX (use server 1.5.3)
author Christophe Lincoln <pankso@slitaz.org>
date Mon May 11 22:34:28 2009 +0200 (2009-05-11)
parents e9f7584e5ff5
children d9da3725841c
line diff
     1.1 --- a/xorg-server-Xvesa/receipt	Wed Mar 11 09:30:04 2009 +0000
     1.2 +++ b/xorg-server-Xvesa/receipt	Mon May 11 22:34:28 2009 +0200
     1.3 @@ -1,20 +1,35 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-server-Xvesa"
     1.7 -VERSION="1.2.0"
     1.8 +VERSION="1.5.2"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Xorg kdrive server Xvesa (tinyX)."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
    1.13 -xorg-base-fonts freetype zlib"
    1.14 -WANTED="xorg-server"
    1.15 +xorg-base-fonts freetype zlib hal dbus"
    1.16 +SUGGESTED="xorg-xrandr"
    1.17 +WANTED="xorg-server-tinyX"
    1.18 +SOURCE="xorg-server"
    1.19  WEB_SITE="http://www.x.org/"
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24 -	mkdir -p $fs/usr/bin
    1.25 +	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    1.26 +	mkdir -p $fs/usr/bin $fs/etc/X11
    1.27  	cp -a $_pkg/usr/bin/Xvesa $fs/usr/bin
    1.28 -	strip $fs/usr/bin/Xvesa
    1.29  	chmod 4711 $fs/usr/bin/Xvesa
    1.30  }
    1.31 +
    1.32 +post_install()
    1.33 +{
    1.34 +	# Upgrade from 1.2.0 to 1.5.3
    1.35 +	if ! grep -q "\-keybd keyboard" $1/etc/slim.conf; then
    1.36 +		echo -n "Updating Slim configuration..."
    1.37 +		res=$(grep ^xserver_arguments $1/etc/slim.conf | \
    1.38 +			sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
    1.39 +		sed -i s/"-screen $res"/"-screen $res -keybd keyboard -mouse mouse,5,\/dev\/input\/mice -nolisten tcp"/ \
    1.40 +			$1/etc/slim.conf
    1.41 +		status
    1.42 +	fi
    1.43 +}