From 65970e8b269744cf879172cf07f4a1c5232bb903 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 15 Mar 2009 15:42:21 -0500 Subject: Adding support for gnome-screensaver. Defaults are 10 minutes, no lock , cosmos. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/systemconfig.sh | 19 ++++++------------- abs/core-testing/LinHES-system/LinHES-run | 5 +++-- abs/core-testing/LinHES-system/PKGBUILD | 2 +- abs/core-testing/system-templates/PKGBUILD | 2 +- abs/extra-testing/gnome-screensaver/PKGBUILD | 2 +- abs/extra-testing/gnome-screensaver/__changelog | 1 + .../gnome-screensaver/gnome-screensaver.install | 9 +++++++++ 8 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 abs/extra-testing/gnome-screensaver/__changelog diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index eef4a98..00addde 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=307 +pkgrel=314 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates ) diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index 07ca7c6..16c51f3 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -738,9 +738,9 @@ fi if [ x$XScreensaver = x1 ] then - ser_install="xscreensaver $ser_install" + ser_install="gnome-screensaver $ser_install" else - ser_remove="xscreensaver $ser_remove" + ser_remove="gnome-screensaver $ser_remove" fi @@ -1085,26 +1085,19 @@ function setup_web_auth { function setupXscreensaver { #copy in template - if [ -f /home/mythtv/.xscreensaver ] - then - echo "Xscreensaver already configured" - else - #copy in template - cp $TEMPLATES/xscreensaver.template /home/mythtv/.xscreensaver - chown mythtv:users /home/mythtv/.xscreensaver - fi + #start it if not already running. if [ x$XScreensaver = x1 ] then #check if it's running, it not start it. if [ ! x$MV_NEW_INSTALL = "xtrue" ] then - su - mythtv -c "/usr/bin/xscreensaver -nosplash &" + su - mythtv -c "/usr/bin/gnome-screensaver " fi else #kill it - xscreensaver-command -exit & - killall xscreensaver & + gnome-screensaver-command --exit & + killall gnome-screensaver & fi diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run index 8de7a4b..1c4dbb6 100644 --- a/abs/core-testing/LinHES-system/LinHES-run +++ b/abs/core-testing/LinHES-system/LinHES-run @@ -11,8 +11,9 @@ xdotool mousemove -10 -10 if [ x"$XScreensaver" = "x1" ] then #start xscreensaver - xscreensaver-command -exit - xscreensaver -nosplash & + # xscreensaver-command -exit + # xscreensaver -nosplash & + gnome-screensaver fi /usr/bin/xvattr -a XV_COLORKEY -v 0 diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD index 348ee10..6270026 100644 --- a/abs/core-testing/LinHES-system/PKGBUILD +++ b/abs/core-testing/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=1.0 -pkgrel=39 +pkgrel=41 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD index f151017..3285279 100755 --- a/abs/core-testing/system-templates/PKGBUILD +++ b/abs/core-testing/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=1.0 -pkgrel=5 +pkgrel=7 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/extra-testing/gnome-screensaver/PKGBUILD b/abs/extra-testing/gnome-screensaver/PKGBUILD index 963032c..fd8476f 100644 --- a/abs/extra-testing/gnome-screensaver/PKGBUILD +++ b/abs/extra-testing/gnome-screensaver/PKGBUILD @@ -3,7 +3,7 @@ pkgname=gnome-screensaver pkgver=2.24.1 -pkgrel=3 +pkgrel=5 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=(i686 x86_64) license=('GPL') diff --git a/abs/extra-testing/gnome-screensaver/__changelog b/abs/extra-testing/gnome-screensaver/__changelog new file mode 100644 index 0000000..e1b40cd --- /dev/null +++ b/abs/extra-testing/gnome-screensaver/__changelog @@ -0,0 +1 @@ +add defaults to install file diff --git a/abs/extra-testing/gnome-screensaver/gnome-screensaver.install b/abs/extra-testing/gnome-screensaver/gnome-screensaver.install index d79cf1a..aafd6a3 100644 --- a/abs/extra-testing/gnome-screensaver/gnome-screensaver.install +++ b/abs/extra-testing/gnome-screensaver/gnome-screensaver.install @@ -2,6 +2,15 @@ pkgname=gnome-screensaver post_install() { usr/sbin/gconfpkg --install ${pkgname} + #set defaults + gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /apps/gnome-screensaver/lock_enabled false + gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type int -s "/apps/gnome-screensaver/idle_delay" 10 + gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --set --type list --list-type=string /apps/gnome-screensaver/themes [screensavers-cosmos-slideshow] + gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type string -s "/apps/gnome-screensaver/mode" single + + + + } pre_upgrade() { -- cgit v0.12