Mailinglist Archive: opensuse-commit (1421 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package sax2
checked in at Fri May 23 02:00:07 CEST 2008.


--------
--- sax2/sax2.changes   2008-05-20 10:22:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes      2008-05-22 
21:52:22.928199000 +0200
@@ -1,0 +2,10 @@
+Thu May 22 21:48:39 CEST 2008 - ms@xxxxxxx
+
+- don't create X11 links if /var/X11R6/bin/X exists (bnc #197328)
+
+-------------------------------------------------------------------
+Tue May 20 11:40:10 CEST 2008 - ms@xxxxxxx
+
+- added Samsung Syncmaster 930B (bnc #391816)
+
+-------------------------------------------------------------------



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.g25345/_old  2008-05-23 01:59:44.000000000 +0200
+++ /var/tmp/diff_new_pack.g25345/_new  2008-05-23 01:59:44.000000000 +0200
@@ -40,7 +40,7 @@
 PreReq:         /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq 
%insserv_prereq
 Summary:        SuSE advanced X Window System-configuration
 Version:        8.1
-Release:        430
+Release:        431
 Group:          System/X11/Utilities
 License:        GPL v2 or later
 Source:         sax2.tar.bz2
@@ -468,6 +468,10 @@
 %endif
 
 %changelog
+* Thu May 22 2008 ms@xxxxxxx
+- don't create X11 links if /var/X11R6/bin/X exists (bnc #197328)
+* Tue May 20 2008 ms@xxxxxxx
+- added Samsung Syncmaster 930B (bnc #391816)
 * Tue May 20 2008 ms@xxxxxxx
 - update hwinfo source
 * Mon May 19 2008 ms@xxxxxxx


++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/sax/api/data/cdb/Monitors new/sax/api/data/cdb/Monitors
--- old/sax/api/data/cdb/Monitors       2008-05-09 11:13:29.000000000 +0200
+++ new/sax/api/data/cdb/Monitors       2008-05-20 11:37:28.000000000 +0200
@@ -1,7 +1,7 @@
 # /.../
 # Copyright (c) 2001 SuSE GmbH Nuernberg, Germany.  All rights reserved.
 #
-# Author: Marcus Schaefer <sax@xxxxxxx>, Fri May  9 11:15:45 2008
+# Author: Marcus Schaefer <sax@xxxxxxx>, Tue May 20 11:39:51 2008
 #
 # Template for monitor data
 # --------------------------
@@ -32911,6 +32911,15 @@
 }
 
 #==============================================
+# SyncMaster 930B
+#----------------------------------------------
+SAMSUNG:SYNCMASTER 930B  {
+ Option=DPMS
+ Hsync=30-81
+ Vsync=50-75
+}
+
+#==============================================
 # SyncMaster 931C (Analog)
 #----------------------------------------------
 SAMSUNG:SYNCMASTER 931C (ANALOG)  {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/sax/libsax/config.cpp new/sax/libsax/config.cpp
--- old/sax/libsax/config.cpp   2008-05-02 15:13:02.000000000 +0200
+++ new/sax/libsax/config.cpp   2008-05-22 21:50:58.000000000 +0200
@@ -341,7 +341,7 @@
        // is located in /usr/bin and doesn't need to be linked
        // ----
        QFile loader (SAX_X11_LOADER);
-       if (loader.exists()) {
+       if ((loader.exists()) && (access ("/var/X11R6/bin/X",F_OK) != 0)) {
                unlink  ("/usr/X11R6/bin/X");
                unlink  ("/var/X11R6/bin/X");
                if ((symlink ("/var/X11R6/bin/X","/usr/X11R6/bin/X")) != 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild    2008-05-20 10:23:00.000000000 +0200
+++ new/sax/svnbuild    2008-05-22 21:53:54.000000000 +0200
@@ -1 +1 @@
-1606
+1608
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/sax/xc.pl new/sax/xc.pl
--- old/sax/xc.pl       2007-07-20 16:07:10.000000000 +0200
+++ new/sax/xc.pl       2008-05-22 21:50:58.000000000 +0200
@@ -667,7 +667,7 @@
        #==========================================
        # Create startup links
        #------------------------------------------
-       if (-f $server) {
+       if ((-f $server) && (! -l "/var/X11R6/bin/X")) {
                qx (rm -f /usr/X11R6/bin/X);
                qx (rm -f /var/X11R6/bin/X);
                qx (ln -s /var/X11R6/bin/X /usr/X11R6/bin/X);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx