Hello community,
here is the log from the commit of package yast2-control-center
checked in at Wed Aug 29 22:49:50 CEST 2007.
--------
--- yast2-control-center/yast2-control-center.changes 2007-08-03 13:06:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-control-center/yast2-control-center.changes 2007-08-29 15:51:35.239602000 +0200
@@ -1,0 +2,21 @@
+Wed Aug 29 14:41:07 CEST 2007 - tgoettlicher@suse.de
+
+- controlcenter shows titlebar depending on existence of title-bar-gradient.png
+- r40572
+- V 2.15.4
+
+-------------------------------------------------------------------
+Fri Aug 24 16:41:49 CEST 2007 - sh@suse.de
+
+- Added borders around group icons (bug #295712)
+- V 2.15.3
+
+-------------------------------------------------------------------
+Fri Aug 24 14:10:08 CEST 2007 - sh@suse.de
+
+- Don't show menu entry in desktops other than KDE or GNOME
+ (won't run properly anyway without root permission which is a
+ non-standard extension of the desktop file format)
+- V 2.15.2
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-2.15.1.tar.bz2
New:
----
yast2-control-center-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.Ds3566/_old 2007-08-29 22:49:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Ds3566/_new 2007-08-29 22:49:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-control-center (Version 2.15.1)
+# spec file for package yast2-control-center (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-control-center
-Version: 2.15.1
+Version: 2.15.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.15.1.tar.bz2
+Source0: yast2-control-center-2.15.4.tar.bz2
prefix: /usr
BuildRequires: libdrm-devel libjpeg-devel pkgconfig qt3-devel update-desktop-files yast2-devtools
Summary: YaST2 - Control Center
@@ -45,7 +45,7 @@
%prep
-%setup -n yast2-control-center-2.15.1
+%setup -n yast2-control-center-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,18 @@
%doc %{prefix}/share/doc/packages/yast2-control-center
%changelog
+* Wed Aug 29 2007 - tgoettlicher@suse.de
+- controlcenter shows titlebar depending on existence of title-bar-gradient.png
+- r40572
+- V 2.15.4
+* Fri Aug 24 2007 - sh@suse.de
+- Added borders around group icons (bug #295712)
+- V 2.15.3
+* Fri Aug 24 2007 - sh@suse.de
+- Don't show menu entry in desktops other than KDE or GNOME
+ (won't run properly anyway without root permission which is a
+ non-standard extension of the desktop file format)
+- V 2.15.2
* Fri Aug 03 2007 - sh@suse.de
- V 2.15.1
- Fixed bug #274326: yast2-control-center-* needs PreReq: yast2-control-center
++++++ yast2-control-center-2.15.1.tar.bz2 -> yast2-control-center-2.15.4.tar.bz2 ++++++
++++ 4778 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-control-center-2.15.1/configure.in new/yast2-control-center-2.15.4/configure.in
--- old/yast2-control-center-2.15.1/configure.in 2007-08-03 13:05:14.000000000 +0200
+++ new/yast2-control-center-2.15.4/configure.in 2007-08-29 14:12:18.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-control-center
dnl
-dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-control-center, 2.15.1, http://bugs.opensuse.org/, yast2-control-center)
+AC_INIT(yast2-control-center, 2.15.3, http://bugs.opensuse.org/, yast2-control-center)
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.15.1"
+VERSION="2.15.3"
RPMNAME="yast2-control-center"
MAINTAINER="Stefan Hundhammer "
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-control-center-2.15.1/Makefile.am new/yast2-control-center-2.15.4/Makefile.am
--- old/yast2-control-center-2.15.1/Makefile.am 2007-08-03 13:05:14.000000000 +0200
+++ new/yast2-control-center-2.15.4/Makefile.am 2007-08-29 14:12:18.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = src
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-control-center-2.15.1/missing new/yast2-control-center-2.15.4/missing
--- old/yast2-control-center-2.15.1/missing 2007-08-03 13:05:30.000000000 +0200
+++ new/yast2-control-center-2.15.4/missing 2007-08-29 14:12:31.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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-control-center-2.15.1/src/y2controlcenterview.cpp new/yast2-control-center-2.15.4/src/y2controlcenterview.cpp
--- old/yast2-control-center-2.15.1/src/y2controlcenterview.cpp 2007-05-21 13:12:51.000000000 +0200
+++ new/yast2-control-center-2.15.4/src/y2controlcenterview.cpp 2007-08-29 14:19:53.000000000 +0200
@@ -39,6 +39,9 @@
#define NONSTANDARD__LIST_BOX_COLORS 0
#define USE_BUTTONS 0
+#define GROUP_ICON_HORIZ_BORDER 1
+#define GROUP_ICON_VERT_BORDER 1
+
#define LEFTLISTBOXWIDTH 200
//just guessed
@@ -57,11 +60,13 @@
setMargin( 5 );
-#if 0
- QWidget * title_bar = layoutTitleBar( this );
- CHECK_PTR( title_bar );
- title_bar->setMinimumWidth(640);
-#endif
+ // show titlebar only if title-bar-gradient.png exists
+ if ( !QPixmap( PIXMAP_DIR "/title-bar-gradient.png" ).isNull() )
+ {
+ QWidget * title_bar = layoutTitleBar( this );
+ CHECK_PTR( title_bar );
+ title_bar->setMinimumWidth(640);
+ }
#if 0
QFrame * separator = new QFrame( this );
@@ -276,21 +281,37 @@
{
QString icon,groupname;
QString icondir = ICON_DIR "/";
- int i=0,firstenabled=-1;
- QListBoxPixmap* pixmap;
+ int i = 0;
+ int firstenabled = -1;
-// _modules->dumpgroups();
+ // _modules->dumpgroups();
- //walk through groups and insert icons for them into listbox
- for ( const ModGroup* ptr=_modules->firstGroup();ptr;ptr=_modules->nextGroup(),i++)
- {
- icon=ptr->getIcon();
- groupname=ptr->getName();
- pixmap=new QListBoxPixmap(QPixmap(icondir + icon),groupname);
- _listBox->insertItem(pixmap);
+ //
+ // Walk through groups and insert icons for them into listbox
+ //
+
+ for ( const ModGroup* ptr = _modules->firstGroup();
+ ptr != 0;
+ ptr = _modules->nextGroup(), i++)
+ {
+ icon = ptr->getIcon();
+ groupname = ptr->getName();
+
+ QPixmap origIcon( QPixmap( icondir + icon ) );
+ QPixmap iconWithBorder( origIcon.width() + 2 * GROUP_ICON_HORIZ_BORDER,
+ origIcon.height() + 2 * GROUP_ICON_VERT_BORDER,
+ origIcon.depth() );
+ QBitmap mask( iconWithBorder.width(), iconWithBorder.height(), true );
+ bitBlt( &mask, GROUP_ICON_HORIZ_BORDER, GROUP_ICON_VERT_BORDER, origIcon.mask() );
+ iconWithBorder.setMask( mask );
+ bitBlt( &iconWithBorder, GROUP_ICON_HORIZ_BORDER, GROUP_ICON_VERT_BORDER, &origIcon );
+
+ QListBoxPixmap * pixmapItem = new QListBoxPixmap( iconWithBorder, groupname );
+ _listBox->insertItem( pixmapItem );
+
if (ptr->isEmpty())
{
- pixmap->setSelectable(false);
+ pixmapItem->setSelectable(false);
}
else if (firstenabled<0)
{
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-control-center-2.15.1/src/YaST.desktop new/yast2-control-center-2.15.4/src/YaST.desktop
--- old/yast2-control-center-2.15.1/src/YaST.desktop 2007-07-24 10:34:37.000000000 +0200
+++ new/yast2-control-center-2.15.4/src/YaST.desktop 2007-08-29 13:20:09.000000000 +0200
@@ -4,6 +4,7 @@
Icon=yast
GenericName=Control Center
Exec=/sbin/yast2
+OnlyShowIn=KDE;GNOME;
X-KDE-SubstituteUID=true
X-KDE-RootOnly=true
Encoding=UTF-8
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-control-center-2.15.1/VERSION new/yast2-control-center-2.15.4/VERSION
--- old/yast2-control-center-2.15.1/VERSION 2007-08-03 13:03:26.000000000 +0200
+++ new/yast2-control-center-2.15.4/VERSION 2007-08-29 14:54:46.000000000 +0200
@@ -1 +1 @@
-2.15.1
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org