commit yast2-x11

1 Dec 2006

Hello community,

here is the log from the commit of package yast2-x11
checked in at Fri Dec 1 12:02:04 CET 2006.

--------

--- yast2-x11/yast2-x11.changes	2006-09-26 16:49:52.000000000 +0200
+++ /mounts/work_src_done/NOARCH/NOARCH/yast2-x11/yast2-x11.changes	2006-12-01 11:26:23.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Dec  1 10:46:23 CET 2006 - ms@suse.de
+
+- added fbdev handling according to driver restrictions (#224924)
+
+-------------------------------------------------------------------
+Wed Sep 27 17:08:47 CEST 2006 - ms@suse.de
+
+- version update to 2.14.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-x11-2.13.8.tar.bz2

New:
----
  yast2-x11-2.14.1.tar.bz2

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

Other differences:
------------------
++++++ yast2-x11.spec ++++++
--- /var/tmp/diff_new_pack.F48Swh/_old	2006-12-01 12:01:52.000000000 +0100
+++ /var/tmp/diff_new_pack.F48Swh/_new	2006-12-01 12:01:52.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-x11 (Version 2.13.8)
+# spec file for package yast2-x11 (Version 2.14.1)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-x11
-Version:        2.13.8
-Release:        8
-License:        GPL
+Version:        2.14.1
+Release:        1
+License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-x11-2.13.8.tar.bz2
+Source0:        yast2-x11-2.14.1.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
 %ifnarch s390 s390x
@@ -44,7 +44,7 @@
     Thomas Roelz
 
 %prep
-%setup -n yast2-x11-2.13.8
+%setup -n yast2-x11-2.14.1
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -81,6 +81,10 @@
 %doc %{prefix}/share/doc/packages/yast2-x11
 
 %changelog -n yast2-x11
+* Fri Dec 01 2006 - ms@suse.de
+- added fbdev handling according to driver restrictions (#224924)
+* Wed Sep 27 2006 - ms@suse.de
+- version update to 2.14.1
 * Tue Sep 26 2006 - ms@suse.de
 - added support for fvwm in autoyast part of x11 module (#207928)
 * Thu Aug 10 2006 - lslezak@suse.cz

++++++ yast2-x11-2.13.8.tar.bz2 -> yast2-x11-2.14.1.tar.bz2 ++++++
++++   13403 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/Makefile.am new/yast2-x11-2.14.1/Makefile.am
--- old/yast2-x11-2.13.8/Makefile.am	2006-09-26 14:53:22.000000000 +0200
+++ new/yast2-x11-2.14.1/Makefile.am	2006-12-01 11:24:02.000000000 +0100
@@ -7,8 +7,7 @@
 #
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS		= $(findstring yast2-devtools,$(RPMNAME))
 
-DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES		= $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR		= $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 
@@ -34,7 +33,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
 # because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
 	./config.status --file=$@:$<
 
 if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/Makefile.am.common new/yast2-x11-2.14.1/Makefile.am.common
--- old/yast2-x11-2.13.8/Makefile.am.common	2006-09-26 14:53:22.000000000 +0200
+++ new/yast2-x11-2.14.1/Makefile.am.common	2006-12-01 11:24:02.000000000 +0100
@@ -29,7 +29,19 @@
 
 dist-hook: check-syntax
 
+CHECK_SYNTAX = true
 check-syntax: $(client_DATA) $(ycpchook)
-	if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+	@if test "$(client_DATA)"; then \
+	  if $(CHECK_SYNTAX); then \
+	    TO_CHECK="$(filter %.ycp,$^)"; \
+	    echo "Checking syntax of $${TO_CHECK}"; \
+	    if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+	      echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+	      exit 1; \
+	    fi; \
+	  else \
+	    echo "Syntax check disabled"; \
+	  fi; \
+	fi
 
 -include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/VERSION new/yast2-x11-2.14.1/VERSION
--- old/yast2-x11-2.13.8/VERSION	2006-09-26 14:51:25.000000000 +0200
+++ new/yast2-x11-2.14.1/VERSION	2006-12-01 11:00:05.000000000 +0100
@@ -1 +1 @@
-2.13.8
+2.14.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/config.h.in new/yast2-x11-2.14.1/config.h.in
--- old/yast2-x11-2.13.8/config.h.in	2006-09-26 14:53:38.000000000 +0200
+++ new/yast2-x11-2.14.1/config.h.in	2006-12-01 11:24:17.000000000 +0100
@@ -65,7 +65,7 @@
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/configure.in new/yast2-x11-2.14.1/configure.in
--- old/yast2-x11-2.13.8/configure.in	2006-09-26 14:53:22.000000000 +0200
+++ new/yast2-x11-2.14.1/configure.in	2006-12-01 11:24:02.000000000 +0100
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-x11
 dnl
-dnl -- This file is generated by y2autoconf 2.13.25 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-x11, 2.13.8, http://bugs.opensuse.org/, yast2-x11)
+AC_INIT(yast2-x11, 2.14.1, http://bugs.opensuse.org/, yast2-x11)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.13.8"
+VERSION="2.14.1"
 RPMNAME="yast2-x11"
 MAINTAINER="Marcus Schaefer <ms@suse.de>"
 
@@ -111,6 +111,8 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -170,6 +172,9 @@
 if test "$YCPC" = "false"; then
     AC_MSG_ERROR([ycpc is not installed])
 fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+    AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
 
 
 AC_CONFIG_FILES(Makefile scripts/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/src/XLib.pm new/yast2-x11-2.14.1/src/XLib.pm
--- old/yast2-x11-2.13.8/src/XLib.pm	2006-09-26 14:51:25.000000000 +0200
+++ new/yast2-x11-2.14.1/src/XLib.pm	2006-12-01 11:17:42.000000000 +0100
@@ -376,6 +376,20 @@
 	return 1;
 }
 #==========================================
+# isFbdevBased
+#------------------------------------------
+BEGIN{ $TYPEINFO{isFbdevBased} = ["function", "boolean"]; }
+sub isFbdevBased {
+	my $class = shift;
+	my $mCard = new SaX::SaXManipulateCard (
+		$section{Card}
+	);
+	if ($mCard -> getCardDriver() eq "fbdev") {
+		return 1;
+	}
+	return 0;
+}
+#==========================================
 # getCardName
 #------------------------------------------
 BEGIN{ $TYPEINFO{getCardName} = ["function", "string"]; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-x11-2.13.8/src/proposal/x11_proposal.ycp new/yast2-x11-2.14.1/src/proposal/x11_proposal.ycp
--- old/yast2-x11-2.13.8/src/proposal/x11_proposal.ycp	2006-09-26 14:51:25.000000000 +0200
+++ new/yast2-x11-2.14.1/src/proposal/x11_proposal.ycp	2006-12-01 11:17:42.000000000 +0100
@@ -108,6 +108,7 @@
 	string	cardName    = (string)  XLib::getCardName();
 	string	monitorName = (string)  XLib::getMonitorName();
 	boolean	has3D       = (boolean) XLib::hasOpenGLFeatures();
+	boolean isFbdevBased= (boolean) XLib::isFbdevBased();
 	boolean	is3DCard    = (boolean) XLib::has3DCapabilities();
 	boolean isNoteBook  = (boolean) XLib::isExternalVGANoteBook();
 	boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware();
@@ -153,34 +154,64 @@
 	//======================================
 	// Monitor name and resolution...
 	//--------------------------------------
-	if (monitorInch == "undef") {
+	if (! isFbdevBased) {
+		if (monitorInch == "undef") {
+			proposal = proposal
+			+ LI
+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
+				+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
+				+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
+			+ IL;
+		} else {
+			proposal = proposal
+			+ LI
+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
+				+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
+				+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
+				+ monitorSize[2]:"" + "</a>)"
+				+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
+			+ IL;
+		}
+	} else {
+		if (monitorInch == "undef") {
+			proposal = proposal
+			+ LI
+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
+				+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
+				+ " - (" + resolution  + ")"
+			+ IL;
+		} else {
+			proposal = proposal
+			+ LI
+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
+				+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
+				+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
+				+ monitorSize[2]:"" + "</a>)"
+				+ " - (" + resolution  + ")"
+			+ IL;
+		}
+	}
+	//======================================
+	// Colordepth and number of colors...
+	//--------------------------------------
+	if (! isFbdevBased) {
 		proposal = proposal
 		+ LI
-			+ XMessages::monitor + "<a href=\"sax-monitor\">"
-			+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
-			+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
-			+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
+			+ XMessages::colorDepth + "<a href=\"sax-colors\">"
+			+ colorDepth + "</a> Bit (" + colorCount + ")"
 		+ IL;
 	} else {
 		proposal = proposal
 		+ LI
-			+ XMessages::monitor + "<a href=\"sax-monitor\">"
-			+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
-			+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
-			+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
-			+ monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">"
-			+ resolution  + "</a>)"
+			+ XMessages::colorDepth
+			+ colorDepth + " Bit (" + colorCount + ")"
 		+ IL;
 	}
 	//======================================
-	// Colordepth and number of colors...
-	//--------------------------------------
-	proposal = proposal
-	+ LI
-		+ XMessages::colorDepth + "<a href=\"sax-colors\">"
-		+ colorDepth + "</a> Bit (" + colorCount + ")"
-	+ IL;
-	//======================================
 	// 3D acceleration status/availability
 	//--------------------------------------
 	if (is3DCard) {


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



Remember to have fun...

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

    

root＠suse.de

tags

participants (1)