Hello community,
here is the log from the commit of package yast2-qt
checked in at Fri Oct 27 19:15:28 CEST 2006.
--------
--- yast2-qt/yast2-qt.changes 2006-10-26 18:55:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2006-10-27 14:35:28.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Oct 27 13:43:42 CEST 2006 - sh@suse.de
+
+- Added missing icon to dist tarball
+- V 2.13.71
+
+-------------------------------------------------------------------
+Thu Oct 26 18:57:05 CEST 2006 - sh@suse.de
+
+- Fixed bug #162164: pattern detection does not work
+- Fixed bug #173488: Status satisfied for a patch is displayed like
+ uninstalled
+- V 2.13.70
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.13.69.tar.bz2
New:
----
yast2-qt-2.13.71.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.1ISEj1/_old 2006-10-27 19:15:16.000000000 +0200
+++ /var/tmp/diff_new_pack.1ISEj1/_new 2006-10-27 19:15:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.13.69)
+# spec file for package yast2-qt (Version 2.13.71)
#
# 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-qt
-Version: 2.13.69
+Version: 2.13.71
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.13.69.tar.bz2
+Source0: yast2-qt-2.13.71.tar.bz2
prefix: /usr
BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools
Summary: YaST2 - Graphical User Interface
@@ -42,7 +42,7 @@
Stefan Hundhammer
%prep
-%setup -n yast2-qt-2.13.69
+%setup -n yast2-qt-2.13.71
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +85,14 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog -n yast2-qt
+* Fri Oct 27 2006 - sh@suse.de
+- Added missing icon to dist tarball
+- V 2.13.71
+* Thu Oct 26 2006 - sh@suse.de
+- Fixed bug #162164: pattern detection does not work
+- Fixed bug #173488: Status satisfied for a patch is displayed like
+ uninstalled
+- V 2.13.70
* Thu Oct 26 2006 - sh@suse.de
- Fixed bug #183735 - YOU should display only relevant patches by
default
++++++ yast2-qt-2.13.69.tar.bz2 -> yast2-qt-2.13.71.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/VERSION new/yast2-qt-2.13.71/VERSION
--- old/yast2-qt-2.13.69/VERSION 2006-10-26 17:26:16.000000000 +0200
+++ new/yast2-qt-2.13.71/VERSION 2006-10-27 13:43:39.000000000 +0200
@@ -1 +1 @@
-2.13.69
+2.13.71
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/configure new/yast2-qt-2.13.71/configure
--- old/yast2-qt-2.13.69/configure 2006-10-26 18:54:41.000000000 +0200
+++ new/yast2-qt-2.13.71/configure 2006-10-27 13:44:48.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-qt 2.13.69.
+# Generated by GNU Autoconf 2.59 for yast2-qt 2.13.71.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-qt'
PACKAGE_TARNAME='yast2-qt'
-PACKAGE_VERSION='2.13.69'
-PACKAGE_STRING='yast2-qt 2.13.69'
+PACKAGE_VERSION='2.13.71'
+PACKAGE_STRING='yast2-qt 2.13.71'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -971,7 +971,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-qt 2.13.69 to adapt to many kinds of systems.
+\`configure' configures yast2-qt 2.13.71 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1042,7 +1042,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-qt 2.13.69:";;
+ short | recursive ) echo "Configuration of yast2-qt 2.13.71:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-qt configure 2.13.69
+yast2-qt configure 2.13.71
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1205,7 +1205,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-qt $as_me 2.13.69, which was
+It was created by yast2-qt $as_me 2.13.71, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1935,7 +1935,7 @@
# Define the identity of the package.
PACKAGE='yast2-qt'
- VERSION='2.13.69'
+ VERSION='2.13.71'
cat >>confdefs.h <<_ACEOF
@@ -2146,7 +2146,7 @@
-VERSION="2.13.69"
+VERSION="2.13.71"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -20508,7 +20508,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-qt $as_me 2.13.69, which was
+This file was extended by yast2-qt $as_me 2.13.71, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20571,7 +20571,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-qt config.status 2.13.69
+yast2-qt config.status 2.13.71
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/configure.in new/yast2-qt-2.13.71/configure.in
--- old/yast2-qt-2.13.69/configure.in 2006-10-26 18:54:28.000000000 +0200
+++ new/yast2-qt-2.13.71/configure.in 2006-10-27 13:44:33.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-qt, 2.13.69, http://bugs.opensuse.org/, yast2-qt)
+AC_INIT(yast2-qt, 2.13.71, http://bugs.opensuse.org/, yast2-qt)
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.69"
+VERSION="2.13.71"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/YQPkgObjList.cc new/yast2-qt-2.13.71/src/YQPkgObjList.cc
--- old/yast2-qt-2.13.69/src/YQPkgObjList.cc 2006-10-26 18:53:16.000000000 +0200
+++ new/yast2-qt-2.13.71/src/YQPkgObjList.cc 2006-10-26 18:55:56.000000000 +0200
@@ -53,6 +53,8 @@
_instVersionCol = -42;
_summaryCol = -42;
_sizeCol = -42;
+ _brokenIconCol = -42;
+ _satisfiedIconCol = -42;
createActions();
@@ -840,6 +842,82 @@
bool enabled = editable() && _pkgObjList->editable();
setPixmap( statusCol(), _pkgObjList->statusIcon( status(), enabled, bySelection() ) );
}
+
+ //
+ // Set special icon for zyppObjs that are not marked as installed,
+ // but satisfied anyway (e.g. for patches or patterns where the user
+ // selected all required packages manually)
+ //
+
+ if ( brokenIconCol() >= 0 )
+ {
+ // Reset this icon now - it might be the same column as satisfiedIconCol()
+ setPixmap( brokenIconCol(), QPixmap() );
+ }
+
+ if ( satisfiedIconCol() >= 0 )
+ {
+ if ( ! _selectable->hasInstalledObj() &&
+ _selectable->installedPoolItem().status().isSatisfied() )
+ {
+#warning FIXME: Use another icon
+ setPixmap( satisfiedIconCol(), YQIconPool::pkgSelAutoInstall() );
+ }
+ else
+ {
+ setPixmap( satisfiedIconCol(), QPixmap() );
+ }
+ }
+
+
+ //
+ // Set special icon for zyppObjs that are installed, but broken
+ // (dependencies no longer satisfied, e.g. for patches or patterns)
+ //
+
+ if ( brokenIconCol() >= 0 )
+ {
+ if ( _selectable->hasInstalledObj() )
+ {
+ bool isBroken = _selectable->installedPoolItem().status().isIncomplete();
+ bool willBeFixed = false;
+
+ switch ( status() )
+ {
+ case S_KeepInstalled:
+ case S_Protected:
+
+ willBeFixed = false;
+ break;
+
+ case S_Update:
+ case S_AutoUpdate:
+ case S_Del:
+ case S_AutoDel:
+ case S_NoInst:
+
+ willBeFixed = true;
+ break;
+
+ case S_Install:
+ case S_AutoInstall:
+ case S_Taboo:
+
+ y2error( "Expected uninstalled zyppObj" );
+ break;
+ }
+
+ if ( isBroken && ! willBeFixed )
+ {
+ setPixmap( brokenIconCol(), YQIconPool::warningSign() );
+
+ y2warning( "Broken object: %s - %s",
+ _selectable->theObj()->name().c_str(),
+ _selectable->theObj()->summary().c_str() );
+ }
+ }
+ }
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/YQPkgPatchList.cc new/yast2-qt-2.13.71/src/YQPkgPatchList.cc
--- old/yast2-qt-2.13.69/src/YQPkgPatchList.cc 2006-10-26 18:53:16.000000000 +0200
+++ new/yast2-qt-2.13.71/src/YQPkgPatchList.cc 2006-10-26 18:55:56.000000000 +0200
@@ -56,6 +56,13 @@
addColumn( _( "Patch" ) ); _summaryCol = numCol++;
addColumn( _( "Category" ) ); _categoryCol = numCol++;
addColumn( _( "Size" ) ); _sizeCol = numCol++;
+
+ // Can use the same colum for "broken" and "satisfied":
+ // Both states are mutually exclusive
+
+ _satisfiedIconCol = _summaryCol;
+ _brokenIconCol = _summaryCol;
+
setAllColumnsShowFocus( true );
setColumnAlignment( sizeCol(), Qt::AlignRight );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/YQPkgPatternList.cc new/yast2-qt-2.13.71/src/YQPkgPatternList.cc
--- old/yast2-qt-2.13.69/src/YQPkgPatternList.cc 2006-10-26 18:53:16.000000000 +0200
+++ new/yast2-qt-2.13.71/src/YQPkgPatternList.cc 2006-10-26 18:55:56.000000000 +0200
@@ -55,6 +55,12 @@
addColumn( _( "Pattern" ) ); _summaryCol = numCol++;
+ // Can use the same colum for "broken" and "satisfied":
+ // Both states are mutually exclusive
+
+ _satisfiedIconCol = _summaryCol;
+ _brokenIconCol = _summaryCol;
+
header()->setStretchEnabled( _statusCol , false );
header()->setStretchEnabled( _summaryCol, true );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/include/YQPkgObjList.h new/yast2-qt-2.13.71/src/include/YQPkgObjList.h
--- old/yast2-qt-2.13.69/src/include/YQPkgObjList.h 2006-10-26 18:53:16.000000000 +0200
+++ new/yast2-qt-2.13.71/src/include/YQPkgObjList.h 2006-10-26 18:55:56.000000000 +0200
@@ -64,6 +64,8 @@
int sizeCol() const { return _sizeCol; }
int versionCol() const { return _versionCol; }
int instVersionCol() const { return _instVersionCol; }
+ int brokenIconCol() const { return _brokenIconCol; }
+ int satisfiedIconCol() const { return _satisfiedIconCol; }
/**
* Return whether or not items in this list are generally editable,
@@ -167,7 +169,7 @@
* this method, too, if the other one is reimplemented.
**/
virtual void updateActions();
-
+
/**
* Emit an updatePackages() signal.
**/
@@ -296,7 +298,7 @@
const QString & key = QString::null,
bool enabled = false );
-
+
// Data members
@@ -306,6 +308,8 @@
int _sizeCol;
int _versionCol;
int _instVersionCol;
+ int _brokenIconCol;
+ int _satisfiedIconCol;
bool _editable;
@@ -418,7 +422,7 @@
* Overwritten from QY2ListViewItem.
**/
virtual void updateStatus();
-
+
/**
* Cycle the package status to the next valid value.
**/
@@ -443,14 +447,14 @@
/**
* Display a selectable's license agreement (if there is any) that
* corresponds to its current status (S_Install, S_Update) in a pop-up
- * window.
+ * window.
*
* Returns 'true' if the user agreed to that license , 'false' otherwise.
* The item's status may have changed to S_Taboo, S_Proteced or S_Del if
* the user disagreed with the license.
**/
static bool showLicenseAgreement( ZyppSel sel );
-
+
/**
* Display this item's license agreement (if there is any) that corresponds
* to its current status (S_Install, S_Update) in a pop-up window.
@@ -506,6 +510,8 @@
int sizeCol() const { return _pkgObjList->sizeCol(); }
int versionCol() const { return _pkgObjList->versionCol(); }
int instVersionCol() const { return _pkgObjList->instVersionCol(); }
+ int brokenIconCol() const { return _pkgObjList->brokenIconCol(); }
+ int satisfiedIconCol() const { return _pkgObjList->satisfiedIconCol(); }
protected:
@@ -514,7 +520,7 @@
* Initialize internal data and set fields accordingly.
**/
void init();
-
+
/**
* Apply changes hook. This is called each time the user changes the status
* of a list item manually (if the old status is different from the new
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/include/icons/Makefile.am new/yast2-qt-2.13.71/src/include/icons/Makefile.am
--- old/yast2-qt-2.13.69/src/include/icons/Makefile.am 2006-10-06 14:51:27.000000000 +0200
+++ new/yast2-qt-2.13.71/src/include/icons/Makefile.am 2006-10-27 13:31:21.000000000 +0200
@@ -39,7 +39,8 @@
tree_plus.xpm \
unresolvable_conflict.xpm \
update.xpm \
- update_disabled.xpm
+ update_disabled.xpm \
+ warning_sign.xpm
#tree_plus and tree_minus added here to compile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/include/icons/Makefile.in new/yast2-qt-2.13.71/src/include/icons/Makefile.in
--- old/yast2-qt-2.13.69/src/include/icons/Makefile.in 2006-10-26 18:54:46.000000000 +0200
+++ new/yast2-qt-2.13.71/src/include/icons/Makefile.in 2006-10-27 13:44:53.000000000 +0200
@@ -249,7 +249,8 @@
tree_plus.xpm \
unresolvable_conflict.xpm \
update.xpm \
- update_disabled.xpm
+ update_disabled.xpm \
+ warning_sign.xpm
#tree_plus and tree_minus added here to compile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.69/src/include/icons/warning_sign.xpm new/yast2-qt-2.13.71/src/include/icons/warning_sign.xpm
--- old/yast2-qt-2.13.69/src/include/icons/warning_sign.xpm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.13.71/src/include/icons/warning_sign.xpm 2006-10-26 13:00:44.000000000 +0200
@@ -0,0 +1,77 @@
+/* XPM */
+static const char * warning_sign_xpm[] = {
+"16 16 58 1",
+" c None",
+". c #760000",
+"+ c #770000",
+"@ c #9E0000",
+"# c #8B0000",
+"$ c #D72929",
+"% c #BB1414",
+"& c #AF0000",
+"* c #E1AEAE",
+"= c #8C0000",
+"- c #D94141",
+"; c #E5E5E5",
+"> c #B40000",
+", c #E2ABAB",
+"' c #313131",
+") c #8E0000",
+"! c #DA3C3C",
+"~ c #E8E7E7",
+"{ c #404040",
+"] c #B80000",
+"^ c #E4AAAA",
+"/ c #E9E9E9",
+"( c #4D4D4D",
+"_ c #900000",
+": c #DB3939",
+"< c #EAE8E8",
+"[ c #EAEAEA",
+"} c #5B5B5B",
+"| c #BC0000",
+"1 c #E5A7A7",
+"2 c #ECECEC",
+"3 c #EBEBEB",
+"4 c #686868",
+"5 c #920000",
+"6 c #DC3333",
+"7 c #EDEAEA",
+"8 c #EDEDED",
+"9 c #E1E1E1",
+"0 c #C00000",
+"a c #E7A4A4",
+"b c #EFEFEF",
+"c c #EEEEEE",
+"d c #434343",
+"e c #940000",
+"f c #DC2F2F",
+"g c #F0ECEC",
+"h c #F0F0F0",
+"i c #5A5A5A",
+"j c #750000",
+"k c #C40000",
+"l c #E69393",
+"m c #F2F2F2",
+"n c #F1F1F1",
+"o c #990000",
+"p c #D10000",
+"q c #D60000",
+"r c #930000",
+"s c #9F0000",
+" .. ",
+" +@@+ ",
+" #$%# ",
+" +&**&+ ",
+" =-;;-= ",
+" +>,'',>+ ",
+" )!~{{~!) ",
+" +]^/((/^]+ ",
+" _:<[}}[<:_ ",
+" .|12344321|. ",
+" 567829928765 ",
+" #0abc8dd8cba0# ",
+" efghbciicbhgfe ",
+"jklmnhbccbhnmlkj",
+"opqqqqqqqqqqqqpo",
+"jrssssssssssssrj"};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org