* [gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver/files/5.08: 01_all_default_settings.patch 02_all_no_intltool.patch
@ 2009-01-19 11:43 Peter Volkov (pva)
0 siblings, 0 replies; only message in thread
From: Peter Volkov (pva) @ 2009-01-19 11:43 UTC (permalink / raw
To: gentoo-commits
pva 09/01/19 11:43:56
Added: 01_all_default_settings.patch
02_all_no_intltool.patch
Log:
Version bump.
(Portage version: 2.2_rc22/cvs/Linux 2.6.26-openvz.git-89451f9 i686)
Revision Changes Path
1.1 x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.08/01_all_default_settings.patch?rev=1.1&content-type=text/plain
Index: 01_all_default_settings.patch
===================================================================
diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index af651d7..470297c 100644
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -31,36 +31,36 @@
*mode: random
*timeout: 0:10:00
*cycle: 0:10:00
-*lockTimeout: 0:00:00
+*lockTimeout: 0:20:00
*passwdTimeout: 0:00:30
-*dpmsEnabled: False
-*dpmsStandby: 2:00:00
-*dpmsSuspend: 2:00:00
-*dpmsOff: 4:00:00
-*grabDesktopImages: True
+*dpmsEnabled: True
+*dpmsStandby: 1:00:00
+*dpmsSuspend: 1:00:00
+*dpmsOff: 2:00:00
+*grabDesktopImages: False
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
*nice: 10
*memoryLimit: 0
-*lock: False
+*lock: True
*verbose: False
*timestamp: True
*fade: True
*unfade: False
*fadeSeconds: 0:00:03
*fadeTicks: 20
-*splash: True
+*splash: False
*splashDuration: 0:00:05
*visualID: default
*captureStderr: True
*ignoreUninstalledPrograms: False
-*textMode: file
-*textLiteral: XScreenSaver
+*textMode: literal
+*textLiteral: Gentoo Linux
*textFile: @DEFAULT_TEXT_FILE@
-*textProgram: fortune
-*textURL: http://www.livejournal.com/stats/latest-rss.bml
+*textProgram: /usr/bin/fortune
+*textURL: http://planet.gentoo.org/rss20.xml
!*textURL: http://twitter.com/statuses/public_timeline.atom
*overlayTextForeground: #FFFF00
@@ -118,7 +118,10 @@ GetViewPortIsFullOfLies: False
! The format used for printing the date and time in the password dialog box
! (see the strftime(3) manual page for details.)
-*dateFormat: %d-%b-%y (%a); %I:%M %p
+! Preferred time representation for the current locale
+*dateFormat: %x %X
+! Xscreensaver's default
+! *dateFormat: %d-%b-%y (%a); %I:%M %p
! To show the time only:
! *dateFormat: %I:%M %p
! For 24 hour time:
diff --git a/hacks/barcode.c b/hacks/barcode.c
index 61b0c23..946a6fd 100644
--- a/hacks/barcode.c
+++ b/hacks/barcode.c
@@ -131,7 +131,6 @@ static const char *words[] =
"children",
"chocolate",
"CLONE",
- "cock",
"constriction",
"contrition",
"cop",
@@ -265,7 +264,6 @@ static const char *words[] =
"punishment",
"punk rock",
"punk",
- "pussy",
"quagmire",
"quarantine",
"quartz",
@@ -333,8 +331,6 @@ static const char *words[] =
"vegetarian",
"venom",
"verifiability",
- "viagra",
- "vibrator",
"victim",
"vignette",
"villainy",
diff --git a/hacks/glx/glsnake.c b/hacks/glx/glsnake.c
index f2a0b5f..da2721b 100644
--- a/hacks/glx/glsnake.c
+++ b/hacks/glx/glsnake.c
@@ -565,17 +565,17 @@ static const struct model_s model[] = {
ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
ZERO, PIN, ZERO }
},
- { "erect penis", /* thanks benno */
+ { "shuffle board", /* thanks benno */
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
ZERO, ZERO }
},
- { "flaccid penis",
+ { "flaccid anchor",
{ PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
ZERO, ZERO }
},
- { "vagina",
+ { "engagement ring",
{ RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
PIN, RIGHT, ZERO }
@@ -995,7 +995,7 @@ static const struct model_s model[] = {
{ "Parrot",
{ ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
},
- { "Penis",
+ { "Shuttle",
{ PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
},
{ "PictureComingSoon",
1.1 x11-misc/xscreensaver/files/5.08/02_all_no_intltool.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.08/02_all_no_intltool.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.08/02_all_no_intltool.patch?rev=1.1&content-type=text/plain
Index: 02_all_no_intltool.patch
===================================================================
diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in
--- xscreensaver-5.07_old/configure.in 2008-10-16 02:15:57.761938178 +0200
+++ xscreensaver-5.07/configure.in 2008-10-16 02:11:43.311971411 +0200
@@ -1172,7 +1172,7 @@
#
###############################################################################
-AC_PROG_INTLTOOL
+# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
GETTEXT_PACKAGE=xscreensaver
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
[This is the name of the gettext package to use.])
diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in
--- xscreensaver-5.07_old/driver/Makefile.in 2008-10-16 02:15:57.835271514 +0200
+++ xscreensaver-5.07/driver/Makefile.in 2008-10-16 03:16:51.678244563 +0200
@@ -22,7 +22,7 @@
mansuffix = 1
manNdir = $(mandir)/man$(mansuffix)
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
+#INTLTOOL_MERGE = @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
GTK_DATADIR = @GTK_DATADIR@
GTK_APPDIR = $(GTK_DATADIR)/applications
@@ -492,20 +492,19 @@
# screensaver-properties.desktop
# into /usr/share/applications/
-install-gnome:: screensaver-properties.desktop
+install-gnome::
@if [ "$(GTK_DATADIR)" != "" ]; then \
if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
fi ;\
name2=xscreensaver-properties.desktop ;\
- echo $(INSTALL_DATA) screensaver-properties.desktop \
+ echo $(INSTALL_DATA) screensaver-properties.desktop.in \
$(install_prefix)$(GTK_APPDIR)/$$name2 ;\
- $(INSTALL_DATA) screensaver-properties.desktop \
+ $(INSTALL_DATA) screensaver-properties.desktop.in \
$(install_prefix)$(GTK_APPDIR)/$$name2 ;\
fi
-
# xscreensaver.xpm
# into /usr/share/pixmaps/
install-gnome:: $(LOGO)
@@ -764,7 +763,7 @@
XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
-@INTLTOOL_DESKTOP_RULE@
+# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
# The executables linked in this directory.
#
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-01-19 11:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-19 11:43 [gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver/files/5.08: 01_all_default_settings.patch 02_all_no_intltool.patch Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox