[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdeartwork/kscreensaver/kxsconfig
From: Stephan Kulow <coolo () kde ! org>
Date: 2004-10-01 8:21:02
Message-ID: 20041001082102.F14899908 () office ! kde ! org
[Download RAW message or body]
CVS commit by coolo:
paths changed slightly in latest SUSE version (don't worry, I keep calling
the target :)
A ScreenSavers/anemotaxis.desktop 1.1
A ScreenSavers/memscroller.desktop 1.1
M +4 -4 Makefile.am 1.23
M +1 -6 ScreenSavers/xscreensaver.template 1.3
--- kdeartwork/kscreensaver/kxsconfig/Makefile.am #1.22:1.23
@@ -29,12 +29,12 @@
newhacks:
- hacks=`cd /usr/X11R6/lib/xscreensaver/ && ls -1 | grep -v config` \
;\ + hacks=`cd /usr/lib/xscreensaver/ && ls -1 | grep -v config` ;\
echo $$hacks ;\
for name in $$hacks; do \
- if test -f /usr/X11R6/lib/xscreensaver/$$name && test -f \
/usr/X11R6/lib/X11/xscreensaver/config/$$name.xml && test ! -f \
$(srcdir)/ScreenSavers/$$name.desktop; then \
- label=`grep '<screensaver.*_label' \
/usr/X11R6/lib/X11/xscreensaver/config/$$name.xml | sed -e \
's#^.*_label=\"\(.*\)\".*$$#\1#'` ;\ + if test -f \
/usr/lib/xscreensaver/$$name && test -f /etc/xscreensaver/$$name.xml && \
test ! -f $(srcdir)/ScreenSavers/$$name.desktop; then \ + \
label=`grep '<screensaver.*_label' /etc/xscreensaver/$$name.xml | sed -e \
's#^.*_label=\"\(.*\)\".*$$#\1#'` ;\ \
f=$(srcdir)/ScreenSavers/$$name.desktop ;\
sed -e "s#@NAME@#$$name#; s#@LABEL@#$$label#" \
$(srcdir)/ScreenSavers/xscreensaver.template > $$f; \
- if ldd /usr/X11R6/lib/xscreensaver/$$name 2>&1 | grep \
libGL; then sed -e "s,@GL1@,X-KDE-Type=OpenGL,; \
s,@GL2@,X-KDE-Category=OpenGL Screen Savers," $$f > $$f.new && mv $$f.new \
$$f; else grep -v @GL $$f > $$f.new && mv $$f.new $$f; fi ;\ + \
if ldd /usr/lib/xscreensaver/$$name 2>&1 | grep libGL; then sed -e \
"s,@GL1@,X-KDE-Type=OpenGL,; s,@GL2@,X-KDE-Category=OpenGL Screen Savers," \
$$f > $$f.new && mv $$f.new $$f; else grep -v @GL $$f > $$f.new && mv \
$$f.new $$f; fi ;\ fi; \
done
--- kdeartwork/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template \
#1.2:1.3 @@ -4,5 +4,5 @@
Icon=kscreensaver
Type=Application
-Actions=InWindow,Root,Setup
+Actions=InWindow,Setup
Name=@LABEL@
@GL1@
@@ -18,7 +18,2 @@
NoDisplay=true
-[Desktop Action Root]
-Exec=kxsrun @NAME@ -- -root
-Name=Display in root window
-NoDisplay=true
-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic