Hello community,
here is the log from the commit of package yast2-x11
checked in at Sat Sep 6 05:17:02 CEST 2008.
--------
--- yast2-x11/yast2-x11.changes 2008-09-01 20:21:03.000000000 +0200
+++ yast2-x11/yast2-x11.changes 2008-09-05 22:39:32.839784000 +0200
@@ -1,0 +2,13 @@
+Fri Sep 5 22:36:25 CEST 2008 - jdsn@suse.de
+
+- consistent look of x11 proposal with others (bnc#327435)
+- removed a wrong CloseDialog that crashed the installation
+- 2.17.4
+
+-------------------------------------------------------------------
+Thu Sep 4 19:02:46 CEST 2008 - jdsn@suse.de
+
+- no longer set BusID for single card configurations (bnc #381644)
+- 2.17.3
+
+-------------------------------------------------------------------
Old:
----
yast2-x11-2.17.2.tar.bz2
New:
----
yast2-x11-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-x11.spec ++++++
--- /var/tmp/diff_new_pack.t24192/_old 2008-09-06 05:16:04.000000000 +0200
+++ /var/tmp/diff_new_pack.t24192/_new 2008-09-06 05:16:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-x11 (Version 2.17.2)
+# spec file for package yast2-x11 (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-x11
-Version: 2.17.2
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-x11-2.17.2.tar.bz2
+Source0: yast2-x11-2.17.4.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
@@ -52,7 +52,7 @@
Marcus Schaefer
%prep
-%setup -n yast2-x11-2.17.2
+%setup -n yast2-x11-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -88,6 +88,13 @@
/usr/share/YaST2/schema/autoyast/rnc/*.rnc
%doc %{prefix}/share/doc/packages/yast2-x11
%changelog
+* Sat Sep 06 2008 jdsn@suse.de
+- consistent look of x11 proposal with others (bnc#327435)
+- removed a wrong CloseDialog that crashed the installation
+- 2.17.4
+* Thu Sep 04 2008 jdsn@suse.de
+- no longer set BusID for single card configurations (bnc #381644)
+- 2.17.3
* Mon Sep 01 2008 jdsn@suse.de
- fixed type conversion in autoYaST setup (bnc#418648)
- 2.17.2
++++++ yast2-x11-2.17.2.tar.bz2 -> yast2-x11-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/configure new/yast2-x11-2.17.4/configure
--- old/yast2-x11-2.17.2/configure 2008-09-01 20:22:42.000000000 +0200
+++ new/yast2-x11-2.17.4/configure 2008-09-05 22:54:46.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-x11 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-x11 2.17.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-x11'
PACKAGE_TARNAME='yast2-x11'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-x11 2.17.2'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-x11 2.17.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1438,7 +1438,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-x11 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-x11 2.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-x11 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-x11 2.17.4:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-x11 configure 2.17.2
+yast2-x11 configure 2.17.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1629,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-x11 $as_me 2.17.2, which was
+It was created by yast2-x11 $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2450,7 +2450,7 @@
# Define the identity of the package.
PACKAGE='yast2-x11'
- VERSION='2.17.2'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2678,7 @@
-VERSION="2.17.2"
+VERSION="2.17.4"
RPMNAME="yast2-x11"
MAINTAINER="J. Daniel Schmidt "
@@ -21389,7 +21389,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-x11 $as_me 2.17.2, which was
+This file was extended by yast2-x11 $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21442,7 +21442,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-x11 config.status 2.17.2
+yast2-x11 config.status 2.17.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/configure.in new/yast2-x11-2.17.4/configure.in
--- old/yast2-x11-2.17.2/configure.in 2008-09-01 20:22:25.000000000 +0200
+++ new/yast2-x11-2.17.4/configure.in 2008-09-05 22:54:07.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-x11, 2.17.2, http://bugs.opensuse.org/, yast2-x11)
+AC_INIT(yast2-x11, 2.17.4, http://bugs.opensuse.org/, yast2-x11)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.2"
+VERSION="2.17.4"
RPMNAME="yast2-x11"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/src/dialog/x11Dialog.ycp new/yast2-x11-2.17.4/src/dialog/x11Dialog.ycp
--- old/yast2-x11-2.17.2/src/dialog/x11Dialog.ycp 2008-08-29 23:27:30.000000000 +0200
+++ new/yast2-x11-2.17.4/src/dialog/x11Dialog.ycp 2008-09-05 22:27:35.000000000 +0200
@@ -97,19 +97,17 @@
UI::CloseDialog();
if (ret == `cancel)
{
- UI::CloseDialog();
return currentDepth;
}
return color;
-
};
//================================
// setupResolutions
//--------------------------------
define string setupResolutions (list reslist, string currentText, string currentColor)
-{ // rewritten to be consistent with
+{ // rewritten to be consistent with
string topic = XMessages::resolution;
UI::OpenDialog( `MarginBox( 0.5, 0.5,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/src/proposal/x11_proposal.ycp new/yast2-x11-2.17.4/src/proposal/x11_proposal.ycp
--- old/yast2-x11-2.17.2/src/proposal/x11_proposal.ycp 2008-08-30 00:47:37.000000000 +0200
+++ new/yast2-x11-2.17.4/src/proposal/x11_proposal.ycp 2008-09-05 22:35:42.000000000 +0200
@@ -159,67 +159,64 @@
//======================================
// Monitor name and resolution...
//--------------------------------------
- if (monitorInch == "undef") {
- proposal = proposal
- + LI
- + XMessages::monitor + ""
- + monitorName + "</a> " + "("
- + XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
- + " - (" + resolution + "</a>)"
- + IL;
- } else {
- proposal = proposal
- + LI
- + XMessages::monitor + ""
- + monitorName + "</a> " + "("
- + monitorSize[0]:"" + " " + XMessages::Inches + ", "
- + XMessages::Aspect + " " + monitorSize[1]:"" + ":"
- + monitorSize[2]:"" + "</a>)"
- + " - (" + resolution + "</a>)"
- + IL;
- }
- //======================================
- // Colordepth and number of colors...
- //--------------------------------------
- proposal = proposal
- + LI
- + XMessages::colorDepth + ""
- + colorDepth + "</a> bit (" + colorCount + ")"
- + IL;
- //======================================
- // 3D acceleration status/availability
- //--------------------------------------
- if (is3DCard) {
- string status = XMessages::deactivated;
- if (has3D) {
- status = XMessages::activated;
- }
- proposal = proposal
- + LI
- + XMessages::acceleration + ""
- + status + "</a>"
- + IL;
+
+ // generate a proper string for the display size
+ string monitorSizeStr = XMessages::unconfigured;
+ if (monitorInch != "undef")
+ {
+ monitorSizeStr = monitorSize[0]:"" + " " + XMessages::Inches + " - " + XMessages::Aspect + " " + monitorSize[1]:"" + ":" + monitorSize[2]:"" ;
+ }
+
+ // open sublist for display settings
+ proposal = proposal + LI + XMessages::displaySettings
+ + UL + LI
+ + XMessages::monitor + " " + monitorName + " (change</a>)"
+ + IL + LI
+ + XMessages::Size + " " + monitorSizeStr + " (change</a>)"
+ + IL + LI
+ + XMessages::resolution + " " + resolution + " (change</a>)"
+ + IL + LI
+ + XMessages::colorDepth + " " + colorDepth + " bit - " + colorCount + " (change</a>)"
+ + IL ;
+ // sublist still open here - following items are within "display settings" section
+
+ // 3D acceleration status/availability
+ if (is3DCard)
+ {
+ string status = XMessages::deactivated;
+ if (has3D)
+ {
+ status = XMessages::activated;
+ }
+ proposal = proposal + LI
+ + XMessages::acceleration + " " + status + " (change</a>)"
+ + IL ;
+ }
+
+ // External VGA on NoteBooks
+ if (isNoteBook)
+ {
+ string status = XMessages::deactivated;
+ if (extVGAactive) { status = XMessages::activated; }
+
+ proposal = proposal + LI
+ + XMessages::externalvga + " " + status + " (change</a>"
+ + IL;
}
- //======================================
- // External VGA on NoteBooks
- //--------------------------------------
- if (isNoteBook) {
- string status = XMessages::deactivated;
- if (extVGAactive) {
- status = XMessages::activated;
- }
- proposal = proposal
- + LI
- + XMessages::externalvga + ""
- + status + "</a>"
- + IL;
- } else {
- if ((isNoteBookHW) && (! XMessages::popupDone)) {
- XMessages::popupDone = true;
- y2milestone ("X11: DualHead Mode not supported with this NoteBook");
- //warnNoteBookPopup();
+ else
+ {
+ if ((isNoteBookHW) && (! XMessages::popupDone))
+ {
+ XMessages::popupDone = true;
+ y2milestone ("X11: DualHead Mode not supported with this NoteBook");
+ //warnNoteBookPopup();
}
}
+
+ // close the display settings sublist
+ proposal = proposal + LU + IL ;
+
+
//======================================
// Tablet settings (fate#302888)
//--------------------------------------
@@ -312,19 +309,9 @@
if (chosenID == "sax-colors") {
y2milestone("X11: setup color depth...");
string depth = XLib::getActiveColorDepth();
- string colstr = XMessages::color8bit;
- if (depth == "15") {
- colstr = XMessages::color15bit;
- }
- if (depth == "16") {
- colstr = XMessages::color16bit;
- }
- if (depth == "24") {
- colstr = XMessages::color24bit;
- }
string selectedColor = setupColors (
XLib::getActiveResolutionString(),
- colstr
+ depth
);
y2milestone("X11: setup color depth <%1>",selectedColor);
XLib::setDefaultColorDepth ( selectedColor );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/src/XLib.pm new/yast2-x11-2.17.4/src/XLib.pm
--- old/yast2-x11-2.17.2/src/XLib.pm 2008-08-29 21:01:41.000000000 +0200
+++ new/yast2-x11-2.17.4/src/XLib.pm 2008-09-04 19:02:10.000000000 +0200
@@ -63,6 +63,8 @@
my $sinit = new SaX::SaXInit;
$ENV{HW_UPDATE} = 1;
$sinit -> doInit();
+ # do not set busid parameter in single chip mode, therefore try to set the primary chip (bnc#381644)
+ $sinit -> setPrimaryChip();
my @importID = (
$SaX::SAX_CARD,
$SaX::SAX_DESKTOP,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/src/XMessages.ycp new/yast2-x11-2.17.4/src/XMessages.ycp
--- old/yast2-x11-2.17.2/src/XMessages.ycp 2008-08-29 23:01:52.000000000 +0200
+++ new/yast2-x11-2.17.4/src/XMessages.ycp 2008-09-05 21:45:49.000000000 +0200
@@ -24,6 +24,15 @@
module "XMessages";
textdomain "x11";
+
+
+//
+// For historical reasons some strings contain a trailing space character.
+// These will be left untouched unless we need to change them.
+// In the long run no trailing spaces should be used, insert them where needed explicitly.
+//
+
+
//=============================================
// popup with message already showed
//---------------------------------------------
@@ -132,11 +141,14 @@
//---------------------------------------------
global string monitor = _("Monitor: ");
+// Display:
+global string display = _("Display:");
+
//=============================================
// colorDepth
//---------------------------------------------
global string colorDepthOld = _("Colordepth: ");
-global string colorDepth = _("Color Depth: ");
+global string colorDepth = _("Color Depth:");
//=============================================
// deactivated
@@ -178,6 +190,7 @@
//---------------------------------------------
global string selectMonitorOld = _("Select Monitor Vendor and Model:");
global string selectMonitor = _("Select Monitor Vendor and Model");
+global string selectDisplayVendorAndModel = _("Select Display Vendor and Model");
// selectTablet
global string selectTablet = _("Select Tablet Vendor and Model");
@@ -185,11 +198,30 @@
// tablet
global string Tablet = _("Tablet:");
-// vendor - meaning "monitor vendor" (like "hardware vendor")
+// vendor - meaning "monitor vendor" or "tablet vendor" (like "hardware vendor")
global string Vendor = _("Vendor:");
-// model - meaning "monitor model"
+// model - meaning "monitor model" or "tablet vendor"
global string Model = _("Model:");
+// Monitor Vendor and Model:
+global string monitorVendorAndModel = _("Monitor Vendor and Model:");
+
+// Monitor Vendor and Model:
+global string displayVendorAndModel = _("Display Vendor and Model:");
+
+// Tablet Vendor and Model:
+global string tabletVendorAndModel = _("Tablet Vendor and Model:");
+
+// Size
+global string Size = _("Size:");
+
+// Monitor Size
+global string monitorSize = _("Monitor Size:");
+
+// Monitor Size
+global string displaySize = _("Display Size:");
+
+
//=============================================
// selectLink
//---------------------------------------------
@@ -232,6 +264,9 @@
// configure - in lower case
global string configure = _("configure");
+// change - in lower case
+global string Change = _("change");
+
//=============================================
// warnNoteBook
//---------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.17.2/VERSION new/yast2-x11-2.17.4/VERSION
--- old/yast2-x11-2.17.2/VERSION 2008-09-01 20:21:11.000000000 +0200
+++ new/yast2-x11-2.17.4/VERSION 2008-09-05 22:39:41.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org