Hello community,
here is the log from the commit of package xscreensaver for openSUSE:Factory
checked in at Mon Dec 7 15:46:52 CET 2009.
--------
--- xscreensaver/xscreensaver.changes 2009-06-03 16:58:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/xscreensaver/xscreensaver.changes 2009-12-04 14:40:30.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 4 14:26:16 CET 2009 - seife@opensuse.org
+
+- de-fuzz the appdefaults patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xscreensaver.spec ++++++
--- /var/tmp/diff_new_pack.DrBtG4/_old 2009-12-07 15:45:59.000000000 +0100
+++ /var/tmp/diff_new_pack.DrBtG4/_new 2009-12-07 15:45:59.000000000 +0100
@@ -20,13 +20,13 @@
Name: xscreensaver
BuildRequires: Mesa-devel bc gdm intltool libdrm-devel libglade2-devel libgle-devel libgnome-devel libjpeg-devel pam-devel perl-XML-Parser update-desktop-files
-License: BSD 3-Clause; GPL v2 or later; Public Domain, Freeware; X11/MIT
+License: BSD3c ; GPLv2+ ; Public Domain, Freeware ; MIT
Group: Amusements/Toys/Screensavers
Provides: xscrns xscreensaver-gnome
Obsoletes: xscrns xscreensaver-gnome
Requires: desktop-data pam-modules
Version: 5.08
-Release: 2
+Release: 3
Summary: A screen saver and locker for the X Window System
Url: http://www.jwz.org/xscreensaver/
Source: %{name}-%{version}.tar.bz2
++++++ xscreensaver-default-screensaver.patch ++++++
--- /var/tmp/diff_new_pack.DrBtG4/_old 2009-12-07 15:45:59.000000000 +0100
+++ /var/tmp/diff_new_pack.DrBtG4/_new 2009-12-07 15:45:59.000000000 +0100
@@ -7,9 +7,13 @@
- select default screensaver to use
================================================================================
---- driver/XScreenSaver.ad.in
+Index: driver/XScreenSaver.ad.in
+===================================================================
+--- driver/XScreenSaver.ad.in.orig
+++ driver/XScreenSaver.ad.in
-@@ -37,7 +37,7 @@
+@@ -35,11 +35,11 @@
+ *passwdTimeout: 0:00:30
+ *dpmsEnabled: False
*dpmsStandby: 2:00:00
*dpmsSuspend: 2:00:00
*dpmsOff: 4:00:00
@@ -18,7 +22,11 @@
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
-@@ -53,10 +53,10 @@
+ *nice: 10
+ *memoryLimit: 0
+@@ -51,14 +51,14 @@
+ *fadeSeconds: 0:00:03
+ *fadeTicks: 20
*splash: True
*splashDuration: 0:00:05
*visualID: default
@@ -32,7 +40,11 @@
*textLiteral: XScreenSaver
*textFile: @DEFAULT_TEXT_FILE@
*textProgram: fortune
-@@ -139,6 +139,8 @@
+ *textURL: http://www.livejournal.com/stats/latest-rss.bml
+ !*textURL: http://twitter.com/statuses/public_timeline.atom
+@@ -138,10 +138,12 @@ GetViewPortIsFullOfLies: False
+ ! to false. Or switch WMs. Or join the 21st century and get a 24-bit
+ ! graphics card.
!
*installColormap: True
@@ -41,7 +53,11 @@
! This is the list of installed screen saver modes. See "man xscreensaver"
! for the syntax used here.
-@@ -312,7 +314,8 @@
+ !
+ ! If you want to disable a screensaver, DO NOT remove it from this list:
+@@ -294,11 +296,12 @@ GetViewPortIsFullOfLies: False
+ @GL_KLUDGE@ GL: flyingtoasters -root \n\
+ fontglide -root \n\
@GL_KLUDGE@ GL: gleidescope -root \n\
@GL_KLUDGE@ GL: glknots -root \n\
@GL_KLUDGE@ GL: glmatrix -root \n\
@@ -49,11 +65,15 @@
+@GL_KLUDGE@ GL: glslideshow -root -duration 30 -zoom 60 \
+ -pan 30 -fade 5 \n\
@GL_KLUDGE@ GL: hypertorus -root \n\
- @GL_KLUDGE@ GL: jigglypuff -root \n\
+ - GL: jigglypuff -root \n\
@GL_KLUDGE@ GL: klein -root \n\
---- driver/XScreenSaver_ad.h
+ metaballs -root \n\
+ @GL_KLUDGE@ GL: mirrorblob -root \n\
+Index: driver/XScreenSaver_ad.h
+===================================================================
+--- driver/XScreenSaver_ad.h.orig
+++ driver/XScreenSaver_ad.h
-@@ -1,7 +1,8 @@
+@@ -1,21 +1,22 @@
"#error Do not run app-defaults files through xrdb!",
"#error That does not do what you might expect.",
"#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.",
@@ -63,7 +83,8 @@
"*timeout: 0:10:00",
"*cycle: 0:10:00",
"*lockTimeout: 0:00:00",
-@@ -10,10 +11,10 @@
+ "*passwdTimeout: 0:00:30",
+ "*dpmsEnabled: False",
"*dpmsStandby: 2:00:00",
"*dpmsSuspend: 2:00:00",
"*dpmsOff: 4:00:00",
@@ -76,7 +97,11 @@
"*nice: 10",
"*memoryLimit: 0",
"*lock: False",
-@@ -27,8 +28,8 @@
+ "*verbose: False",
+ "*timestamp: True",
+@@ -25,12 +26,12 @@
+ "*fadeTicks: 20",
+ "*splash: True",
"*splashDuration: 0:00:05",
"*visualID: default",
"*captureStderr: True",
@@ -87,7 +112,11 @@
"*textLiteral: XScreenSaver",
"*textFile: ",
"*textProgram: fortune",
-@@ -212,7 +213,8 @@
+ "*textURL: http://www.livejournal.com/stats/latest-rss.bml",
+ "*overlayTextForeground: #FFFF00",
+@@ -193,11 +194,12 @@
+ GL: flyingtoasters -root \\n\
+ fontglide -root \\n\
GL: gleidescope -root \\n\
GL: glknots -root \\n\
GL: glmatrix -root \\n\
@@ -95,5 +124,7 @@
+ GL: glslideshow -root -duration 21 -zoom 84 \
+ -pan 30 -titles \\n\
GL: hypertorus -root \\n\
- GL: jigglypuff -root \\n\
+ - GL: jigglypuff -root \\n\
GL: klein -root \\n\
+ metaballs -root \\n\
+ GL: mirrorblob -root \\n\
++++++ xscreensaver-stars.patch ++++++
--- /var/tmp/diff_new_pack.DrBtG4/_old 2009-12-07 15:45:59.000000000 +0100
+++ /var/tmp/diff_new_pack.DrBtG4/_new 2009-12-07 15:45:59.000000000 +0100
@@ -1,22 +1,34 @@
---- driver/XScreenSaver.ad.in
+Index: driver/XScreenSaver.ad.in
+===================================================================
+--- driver/XScreenSaver.ad.in.orig
+++ driver/XScreenSaver.ad.in
-@@ -460,7 +460,7 @@
+@@ -404,11 +404,11 @@ XScreenSaver.bourneShell: /bin/sh
+ *passwd.body.label: This screen is locked.
+ *passwd.unlock.label: OK
+ *passwd.login.label: New Login
*passwd.user.label: Username:
- *passwd.passwd.label: Password:
*passwd.thermometer.width: 8
-*passwd.asterisks: True
+*passwd.asterisks: False
*passwd.uname: True
*splash.heading.label: XScreenSaver %s
---- driver/XScreenSaver_ad.h
+ *splash.body.label: Copyright � 1991-2008 by
+ *splash.body2.label: Jamie Zawinski