This commit was manufactured by cvs2git to create tag 'STABLE'.

Sprout from master 2002-07-27 19:28:34 UTC kloczek <kloczek@pld-linux.org> '- merge translations from KSI amd Conectiva.'
Cherrypick from master 2000-10-05 18:42:12 UTC Jan Rękorajski <baggins@pld-linux.org> '- added configure.in fix':
    xlockmore-Mesa.patch -> 1.1
    xlockmore-X4.patch -> 1.2
    xlockmore-fortune.patch -> 1.1

diff --git a/xlockmore-Mesa.patch b/xlockmore-Mesa.patch
new file mode 100644 (file)
index 0000000..ef454bb
--- /dev/null
+++ b/xlockmore-Mesa.patch
@@ -0,0 +1,36 @@
+--- configure.in~      Mon Nov  8 15:06:12 1999
++++ configure.in       Wed Jan 19 14:37:50 2000
+@@ -1903,10 +1903,10 @@
+ 
+ dnl MesaGL mesagl
+ 
+-dnl test -z "$mesagl_direct_test_library" && mesagl_direct_test_library=MesaGLU
++dnl test -z "$mesagl_direct_test_library" && mesagl_direct_test_library=GLU
+ AC_DEFUN(AC_PATH_MESAGL_DIRECT,
+-[test -z "$mesagl_direct_test_library" && mesagl_direct_test_library=MesaGL
+-test -z "$mesagl_direct_test_library" && mesagl_direct_test_library=MesaGLU
++[test -z "$mesagl_direct_test_library" && mesagl_direct_test_library=GL
++test -z "$mesagl_direct_test_library" && mesagl_direct_test_library=GLU
+ test -z "$mesagl_direct_test_function" && mesagl_direct_test_function=glXCreateContext
+ test -z "$mesagl_direct_test_include" && mesagl_direct_test_include=GL/gl.h
+   for ac_dir in               \
+@@ -2057,7 +2057,7 @@
+   if test "$gl" = no; then
+     gl=yes
+     AC_DEFINE(USE_GL)
+-    XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU"
++    XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU"
+     test "x$mesagl_includes" = xNONE && mesagl_includes=$ac_mesagl_includes
+     test "x$mesagl_libraries" = xNONE && mesagl_libraries=$ac_mesagl_libraries
+     case "${canonical}" in
+@@ -2073,8 +2073,8 @@
+     case "${canonical}" in
+       *-*-linux* )
+         # Testing if MesaGL was compiled against VGA
+-        if test -f $mesagl_libraries/libMesaGL.so; then
+-          have_mesagl_svga=`nm $mesagl_libraries/libMesaGL.so | grep SVGAMesa | wc -l`
++        if test -f $mesagl_libraries/libGL.so; then
++          have_mesagl_svga=`nm $mesagl_libraries/libGL.so | grep SVGAMesa | wc -l`
+         else
+           have_mesagl_svga=0
+         fi

diff --git a/xlockmore-X4.patch b/xlockmore-X4.patch
index f1b05fa197669d49bb3fdb63e909c1ec45fc2a62..346d02f4254754722dc4651d130bed669301e0fa 100644 (file)
--- a/xlockmore-X4.patch
+++ b/xlockmore-X4.patch
@@ -1,7 +1,20 @@
-diff -Naur xlockmore-4.17.2/configure.in xlockmore-4.17.2-p/configure.in
---- xlockmore-4.17.2/configure.in      Tue Oct 17 11:08:16 2000
-+++ xlockmore-4.17.2-p/configure.in    Tue Oct 17 11:08:32 2000
-@@ -2116,7 +2116,7 @@
+--- xlockmore-4.16.1/xlock/xlock.c~    Thu Oct  5 15:34:30 2000
++++ xlockmore-4.16.1/xlock/xlock.c     Thu Oct  5 15:31:02 2000
+@@ -592,9 +592,11 @@
+ #ifdef USE_DPMS
+ #define MIN_DPMS 30           /* 30 second minimum */
+ #include <X11/extensions/dpms.h>
++#if 0
+ extern unsigned char DPMSQueryExtension(Display *, int *, int *);
+ extern int  DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *);
+ extern int  DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short);
++#endif
+ extern int  dpmsstandby;
+ extern int  dpmssuspend;
+ extern int  dpmsoff;
+--- xlockmore-4.16.1/configure.in~     Thu Oct  5 16:01:54 2000
++++ xlockmore-4.16.1/configure.in      Thu Oct  5 20:41:27 2000
+@@ -2403,7 +2403,7 @@
    AC_DEFINE(USE_DPMS)
  dnl test needed for Digital Unix machines
    if test "x$ac_dpms_libraries" != xNONE; then

diff --git a/xlockmore-fortune.patch b/xlockmore-fortune.patch
index f12417488fad469e58384bfd8c292422e42fbbb6..b9bcd7a4917d3f3c472e0f64cd6f0dfcd8e04930 100644 (file)
--- a/xlockmore-fortune.patch
+++ b/xlockmore-fortune.patch
@@ -1,16 +1,22 @@
-diff -Nru xlockmore-5.00.orig/xlock/XLock.ad xlockmore-5.00/xlock/XLock.ad
---- xlockmore-5.00.orig/xlock/XLock.ad Mon Dec  4 15:29:37 2000
-+++ xlockmore-5.00/xlock/XLock.ad      Wed May 15 13:03:15 2002
-@@ -56,9 +56,9 @@
+--- xlockmore-3.13/xlock.h.fortune     Sun Dec  1 23:11:26 1996
++++ xlockmore-3.13/xlock.h     Tue Feb 11 14:28:11 1997
+@@ -48,7 +48,7 @@
+ #define DEF_MFONT "-*-times-*-*-*-*-18-*-*-*-*-*-*-*"
+ #endif
+ #ifndef DEF_PROGRAM           /* Try the -o option ;) */
+-#define DEF_PROGRAM "fortune -s"
++#define DEF_PROGRAM "/usr/games/fortune -s"
+ #endif
+ 
+ #define DEF_ICONW             64      /* Age old default */
+--- xlockmore-3.13/XLock.ad.fortune    Tue Feb 11 14:34:13 1997
++++ xlockmore-3.13/XLock.ad    Tue Feb 11 14:34:27 1997
+@@ -46,7 +46,7 @@
+ 
+ ! For marquee & nose modes
  !XLock.program: fortune -o
- XLock.program: fortune -s
+-XLock.program: fortune -s
++XLock.program: /usr/games/fortune -s
  !XLock.program: fortune
--!XLock.program: /usr/games/fortune -o
--!XLock.program: /usr/games/fortune -s
--!XLock.program: /usr/games/fortune
-+!XLock.program: /usr/bin/fortune -o
-+!XLock.program: /usr/bin/fortune -s
-+!XLock.program: /usr/bin/fortune
  !XLock.program: finger
  !XLock.messagesfile: fortune.dat
- !XLock.messagefile: /etc/hosts