April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit tomboy for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package tomboy for openSUSE:Factory checked in at Thu Apr 1 16:11:39 CEST 2010. -------- --- GNOME/tomboy/tomboy.changes 2010-03-08 23:10:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/tomboy/tomboy.changes 2010-03-29 22:18:00.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Mar 29 22:14:49 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 1.2.0: + + Handle new application/x-note mimetype (bgo#611865) + + Add a text/path-list target when drag-and-dropping from Search + window, allowing basic note transfer via Empathy (bgo#611858) + + Allow icon themes to customize the panel/tray icon separately + (bgo#612887) + + Fix icon embedding in Mac build (bgo#612893) + + Fix errors when using GTK+ >= 2.19.7 + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tomboy-1.1.4.tar.bz2 New: ---- tomboy-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.SU8c5s/_old 2010-04-01 16:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.SU8c5s/_new 2010-04-01 16:11:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tomboy (Version 1.1.4) +# spec file for package tomboy (Version 1.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: tomboy -Version: 1.1.4 +Version: 1.2.0 Release: 1 License: LGPLv2.1+ Summary: GNOME Note Taking Application @@ -109,6 +109,8 @@ %{_libdir}/bonobo/servers/GNOME_TomboyApplet.server %doc %{_mandir}/man1/%{name}.1.gz %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/mimetypes/application-x-note.png +%{_datadir}/mime/packages/tomboy.xml %{_datadir}/tomboy %{_datadir}/dbus-1/services/org.gnome.Tomboy.service %{_datadir}/applications/tomboy.desktop ++++++ tomboy-1.1.4.tar.bz2 -> tomboy-1.2.0.tar.bz2 ++++++ GNOME/tomboy/tomboy-1.1.4.tar.bz2 /mounts/work_src_done/STABLE/tomboy/tomboy-1.2.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeedu4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdeedu4 for openSUSE:Factory checked in at Thu Apr 1 16:11:07 CEST 2010. -------- --- KDE/kdeedu4/kdeedu4-noarch.changes 2010-03-08 18:13:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4-noarch.changes 2010-04-01 16:10:30.849552000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 26 19:17:48 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- kdeedu4.changes: same change calling whatdependson for head-i586 Old: ---- kdeedu-4.4.1.tar.bz2 New: ---- kdeedu-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.xuvM1K/_old 2010-04-01 16:11:00.000000000 +0200 +++ /var/tmp/diff_new_pack.xuvM1K/_new 2010-04-01 16:11:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4-noarch (Version 4.4.1) +# spec file for package kdeedu4-noarch (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdeedu-%version.tar.bz2 Patch0: 4_4_BRANCH.diff kdeedu4.spec: same change ++++++ kdeedu-4.4.1.tar.bz2 -> kdeedu-4.4.2.tar.bz2 ++++++ KDE/kdeedu4/kdeedu-4.4.1.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu-4.4.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Thu Apr 1 16:11:02 CEST 2010. -------- --- KDE/kdebase4/kdebase4.changes 2010-02-26 20:49:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2010-03-26 19:01:26.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:01:22 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-4.4.1.tar.bz2 New: ---- kdebase-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.QY2diH/_old 2010-04-01 16:10:52.000000000 +0200 +++ /var/tmp/diff_new_pack.QY2diH/_new 2010-04-01 16:10:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.4.1) +# spec file for package kdebase4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdebase-%version.tar.bz2 Source1: baselibs.conf ++++++ kdebase-4.4.1.tar.bz2 -> kdebase-4.4.2.tar.bz2 ++++++ ++++ 2531 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-utils for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package gnome-utils for openSUSE:Factory checked in at Thu Apr 1 16:10:59 CEST 2010. -------- --- GNOME/gnome-utils/gnome-utils.changes 2010-01-16 03:39:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-utils/gnome-utils.changes 2010-03-30 20:21:58.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Mar 30 20:19:27 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 2.30.0: + + Baobab: + - do not set up dnd before the widgets are created + + Updated translations. + +------------------------------------------------------------------- +Sun Mar 28 18:51:35 CEST 2010 - vuntz(a)opensuse.org + +- Update gnome-utils-logview-run-as-root.patch to not add a + X-KDE-SubstitudeUID key to gnome-system-log.desktop, but instead + call xdg-su directly in Exec. +- Add a xdg-utils Requires to make sure xdg-su is installed. +- This is for bnc#540627. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-utils-2.29.5.tar.bz2 New: ---- gnome-utils-2.30.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-utils.spec ++++++ --- /var/tmp/diff_new_pack.LjHDwQ/_old 2010-04-01 15:37:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LjHDwQ/_new 2010-04-01 15:37:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-utils (Version 2.29.5) +# spec file for package gnome-utils (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-utils -Version: 2.29.5 +Version: 2.30.0 Release: 1 License: GPLv2+ ; GPLv3 Summary: Basic Utilities for the GNOME 2.x Desktop @@ -47,6 +47,8 @@ Requires: %{name}-lang = %{version} Requires: gnome-icon-theme Requires: tango-icon-theme +# We need xdg-su for gnome-utils-logview-run-as-root.patch +Requires: xdg-utils Provides: gnome-utils2 Obsoletes: gnome-utils2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ gnome-utils-2.29.5.tar.bz2 -> gnome-utils-2.30.0.tar.bz2 ++++++ GNOME/gnome-utils/gnome-utils-2.29.5.tar.bz2 /mounts/work_src_done/STABLE/gnome-utils/gnome-utils-2.30.0.tar.bz2 differ: char 11, line 1 ++++++ gnome-utils-logview-run-as-root.patch ++++++ --- /var/tmp/diff_new_pack.LjHDwQ/_old 2010-04-01 15:37:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LjHDwQ/_new 2010-04-01 15:37:53.000000000 +0200 @@ -1,12 +1,13 @@ Index: logview/data/gnome-system-log.desktop.in.in =================================================================== ---- logview/data/gnome-system-log.desktop.in.in.orig 2009-04-20 04:32:32.000000000 +1000 -+++ logview/data/gnome-system-log.desktop.in.in 2010-01-14 12:50:05.000000000 +1100 -@@ -4,6 +4,7 @@ _Comment=View or monitor system log file - Exec=gnome-system-log +--- logview/data/gnome-system-log.desktop.in.in.orig ++++ logview/data/gnome-system-log.desktop.in.in +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Log File Viewer + _Comment=View or monitor system log files +-Exec=gnome-system-log ++Exec=xdg-su -c gnome-system-log Icon=logviewer Terminal=false -+X-KDE-SubstituteUID=true Type=Application - StartupNotify=true - Categories=GTK;GNOME;System;Monitor; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdemultimedia4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at Thu Apr 1 16:10:23 CEST 2010. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2010-02-26 20:55:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2010-03-26 19:19:37.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:19:34 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdemultimedia-4.4.1.tar.bz2 New: ---- kdemultimedia-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.OtmmET/_old 2010-04-01 16:10:18.000000000 +0200 +++ /var/tmp/diff_new_pack.OtmmET/_new 2010-04-01 16:10:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 4.4.1) +# spec file for package kdemultimedia4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,7 +31,7 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdemultimedia-%version.tar.bz2 Patch0: 4_4_BRANCH.diff @@ -262,6 +262,8 @@ %files -n libkcddb4 -f filelists/libkcddb %defattr(-,root,root) %doc COPYING COPYING.DOC README +%dir %{_kde4_htmldir}/en/kcontrol +%doc %lang(en) %{_kde4_htmldir}/en/kcontrol/cddbretrieval %package -n libkcddb4-devel License: GPLv2+ ++++++ kdemultimedia-4.4.1.tar.bz2 -> kdemultimedia-4.4.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/doc/CMakeLists.txt new/kdemultimedia-4.4.2/doc/CMakeLists.txt --- old/kdemultimedia-4.4.1/doc/CMakeLists.txt 2009-10-06 23:37:54.000000000 +0200 +++ new/kdemultimedia-4.4.2/doc/CMakeLists.txt 2010-03-26 18:28:51.000000000 +0100 @@ -4,14 +4,10 @@ endif() endif(TAGLIB_FOUND) add_subdirectory(kioslave) +add_subdirectory(kcontrol) if(BUILD_kmix) add_subdirectory(kmix) endif() if(BUILD_dragonplayer) add_subdirectory(dragonplayer) endif() -if (NOT APPLE) - if(BUILD_kscd) - add_subdirectory(kscd) - endif() -endif (NOT APPLE) Files old/kdemultimedia-4.4.1/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.4.2/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.4.1/doc/juk/index.cache.bz2 and new/kdemultimedia-4.4.2/doc/juk/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/doc/kcontrol/CMakeLists.txt new/kdemultimedia-4.4.2/doc/kcontrol/CMakeLists.txt --- old/kdemultimedia-4.4.1/doc/kcontrol/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdemultimedia-4.4.2/doc/kcontrol/CMakeLists.txt 2010-03-26 18:28:48.000000000 +0100 @@ -0,0 +1,4 @@ +add_subdirectory(cddbretrieval) + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/CMakeLists.txt new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/CMakeLists.txt --- old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/CMakeLists.txt 2010-03-26 18:28:48.000000000 +0100 @@ -0,0 +1,2 @@ +########### install files ############### +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cddbretrieval) Files old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/index.cache.bz2 and new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/index.docbook new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/index.docbook --- old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/index.docbook 2010-03-26 18:28:48.000000000 +0100 @@ -0,0 +1,283 @@ +<?xml version="1.0" ?> +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kappname "&kscd;"> + <!ENTITY package "kdemultimedia"> + <!ENTITY % English "INCLUDE" >  + <!ENTITY % addindex "IGNORE"> +]> + +<article lang="&language;"> + +<articleinfo> +<title>CDDB Retrieval</title> + +<authorgroup> + +<author> +<firstname>Mike</firstname> +<surname>McBride</surname> +<affiliation><address>&Mike.McBride.mail;</address></affiliation> +</author> + +<author> +<firstname>Jonathan</firstname> +<surname>Singer</surname> +<affiliation><address>&Jonathan.Singer.mail;</address></affiliation> +</author> + +<author> +<firstname>David</firstname> +<surname>White</surname> +<affiliation><address><email>a9403784(a)unet.univie.ac.at</email></address> +</affiliation> +</author> + +<othercredit role="developer"> +<firstname>Bernd</firstname> +<othername>Johannes</othername> +<surname>Wuebben</surname> +<affiliation><address>&Bernd.Johannes.Wuebben.mail;</address></affiliation> +<contrib>Developer</contrib> +</othercredit> + +<othercredit role="developer"> +<firstname>Dirk</firstname> +<surname>Forsterling</surname> +<affiliation><address><email>milliByte(a)gmx.net</email></address></affiliation> +<contrib>Developer</contrib> +</othercredit> + +<othercredit role="developer"> +<firstname>Dirk</firstname> +<surname>Foersterling</surname> +<affiliation><address><email>milliByte(a)gmx.net</email></address></affiliation> +<contrib>Developer</contrib> +</othercredit> + +<othercredit role="reviewer"> +<firstname>Lauri</firstname> +<surname>Watts</surname> +<affiliation><address>&Lauri.Watts.mail;</address></affiliation> +<contrib>Reviewer</contrib> +</othercredit> + +</authorgroup> + +<copyright> +<year>2000</year><year>2004</year> +<holder>J Singer</holder> + +</copyright> +<copyright> + +<year>2005-2006</year> +<holder>&Mike.McBride;</holder> +</copyright> + +<date>2010-02-19</date> +<releaseinfo>&kde; 4.4</releaseinfo> + +</articleinfo> + +<sect1 id="cddb-page"> +<title>CDDB Retrieval</title> +<para>The module <guilabel>CDDB Retrieval</guilabel> is divided in the <guilabel>Lookup</guilabel> tab +and the <guilabel>Submit</guilabel> tab.</para> + +<sect2 id="lookup-tab"> +<title>The <guilabel>Lookup</guilabel> Tab</title> +<screenshot> +<screeninfo>The <guilabel>Lookup</guilabel> tab</screeninfo> +<mediaobject> +<imageobject> <imagedata fileref="kscd14.png" format="PNG"/> </imageobject> +<textobject><phrase>The <guilabel>Lookup</guilabel> tab</phrase></textobject> +</mediaobject> +</screenshot> + +<para> The <guilabel>Lookup</guilabel> tab sets up the <acronym>CDDB</acronym> functions +of &kde;.</para> + +<para>You can select the options <guilabel>Enable MusicBrainz lookup</guilabel> or <guilabel>Enable freedb lookup</guilabel>.</para> + +<para>The <guilabel>Freedb server</guilabel> section determines which CDDB mirror site is used by &kde; to +get album information. You can enter a server name, port number and protocol using the text boxes and drop +down boxes or you can click the <guibutton>Show Mirror List</guibutton> button. Clicking this button will +open a new window with a list of CDDB mirrors and their locations. Simply select the server you want from +the list and click <guibutton>OK</guibutton>.</para> + +<para>The section labeled <guilabel>Cache Locations</guilabel> lets you determine where the CDDB information +is saved on your computer. To add a folder, enter the folder location in the text box at the top of the section and click +<guibutton>Add</guibutton>. You can also select a +folder by clicking on the blue file folder to the right of the text box. To delete a folder, click on the folder name +once with the &LMB; and click <guibutton>Remove</guibutton>. You can change the order the folders are searched by +clicking on the folder name and clicking on the <guibutton>Move Up</guibutton> and <guibutton>Move Down</guibutton> buttons.</para> + +<para>The <guibutton>Help</guibutton> button opens the this help contents +page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; +<guibutton>Apply</guibutton> saves the current settings without exiting.</para> + +</sect2> + +<sect2 id="submit-tab"> +<title>The <guilabel>Submit</guilabel> Tab</title> + +<screenshot> +<screeninfo>The Submit tab</screeninfo> +<mediaobject> +<imageobject><imagedata fileref="kscd16.png" format="PNG"/></imageobject> +</mediaobject> +</screenshot> + +<para>The <guilabel>Submit</guilabel> tab sets up connection to a mail +server or a web server to submit new <acronym>CDDB</acronym> entries. This is useful +if you do not have your own system configured as a server. </para> + +<para>If you plan to submit a CDDB entry, enter your email address into the first textbox, +then you must decide between submitting between &HTTP; +and submitting the entry as an email (via &SMTP;). </para> + +<tip><para>It is simpler to submit new entries using &HTTP;. Some firewalls block this traffic. If your +firewall prevents you from sending new entries using &HTTP;, you can use &SMTP;.</para></tip> + +<para>First select either <guilabel>&HTTP;</guilabel> or <guilabel>SMTP (Email)</guilabel> to determine which +protocol to use.</para> + +<sect3 id="http-options"> +<title>Using &HTTP; to send CDDB information</title> +<para>You can enter a server name or port number in the text boxes provided. If +you want to send this information to the international servers, you do not need to +change anything.</para> +</sect3> + +<sect3 id="smtp-options"> +<title>Using &SMTP; (Email) to send CDDB information</title> + +<para>To prepare to submit information using email, enter your email address in the +text box labeled <guilabel>Reply-To:</guilabel>, your email server in the text box +labeled <guilabel>SMTP server:</guilabel> and select the port number in the spinbox +labeled <guilabel>Port:</guilabel>.</para> +<para>If you need to use a password to send email using the email server, place a mark in the +check box labeled <guilabel>Server needs authentication</guilabel> and enter your +username in the text box labeled <guilabel>Username</guilabel>.</para> + +</sect3> +</sect2> +</sect1> + + +<sect1 id="cddb-editor"> +<title>The CD Database Editor</title> + +<screenshot> +<screeninfo>The &CD; Database Editor</screeninfo> +<mediaobject> +<imageobject><imagedata fileref="kscd13.png" format="PNG"/></imageobject> +<textobject><phrase>The &CD; Database Editor</phrase></textobject> +</mediaobject> +</screenshot> + +<para>The &CD; Database Editor allows you to modify, download, save, annotate, +and upload <link linkend="cddb-support"><acronym>CDDB</acronym> (Compact Disc +Data Base)</link> entries.</para> + +<para>If there is an entry in your local <acronym>CDDB</acronym> tree +(see the <link linkend="cddb-page">CDDB subsection</link> in the +Configuration chapter) for the &CD; in your &CD-ROM; drive, or if the +disc could be found in the freedb, you will see the name of the artist +and the title of the &CD; in the <guilabel>Artist:</guilabel> and +<guilabel>Title</guilabel> fields and a list of tracks with song +titles in the <interface>Tracks</interface> selection box. Otherwise, +you will see a list of tracks and play times without titles.</para> + +<para>You can make an annotation for the entire disc with the +<guilabel>Comment</guilabel> field under the +<guilabel>Title</guilabel> field, or for a selected track in the +<guilabel>Tracks</guilabel> selection box with the adjacent +<guibutton>Comment</guibutton> button. If you select a track in the +<guilabel>Tracks</guilabel> selection box, the title, if present, will +appear in the <guilabel>Title</guilabel> field below. You can type a +title for the track in the box, or edit the entry to suit your +needs. Press the <keycap>Return</keycap> key on your keyboard, and the +text will appear in the proper line in the selection box.</para> + +<para>Once all tracks have been given titles and the +<guilabel>Artist:</guilabel> and <guilabel>Title</guilabel> fields have +been filled out, you can press the <guibutton>Upload</guibutton> +button to send your submission by email to freedb.</para> + +<para>You will be prompted to select a category for the +submission. The <guilabel>Disc ID</guilabel> section displays the 32 +bit <acronym>ID</acronym> code used by freedb to identify a compact +disc. Above the <acronym>ID</acronym> code is the category of the +<guilabel>freedb</guilabel> entry. These categories correspond to the +subfolders tree of the folder chosen in the <guilabel>freedb +Base Folder:</guilabel> in the <link +linkend="cddb-page"><guilabel>CDDB</guilabel> page</link> of the +configuration window.</para> + +<para>The <guilabel>Length:</guilabel> display shows the total play time of +the &CD;.</para> + +<para>Press the <guibutton>Fetch Info</guibutton> button to download +<acronym>CDDB</acronym> data. +Press the <guibutton>OK</guibutton> button to save your changes locally. +The <guibutton>Cancel</guibutton> button closes the &CD; +Database Editor without saving.</para> + +</sect1> + +<sect1 id="cddb-support"> +<title><acronym>CDDB</acronym> Support</title> + +<para>freedb is a distributed network database accessible +over the Internet that contains information about most audio &CD;s in +circulation. If you have Internet access, you will likely never have to manually +enter track information for your &CD;s if you have this set up properly. See +<link linkend="cddb-page">The CDDB Page</link> section +for detailed instructions on how to configure this service, and +the <link linkend="cddb-editor">&CD; Database Editor</link> section for +instructions on how to edit <acronym>CDDB</acronym> entries.</para> + +<para>Use of the <acronym>CDDB</acronym> is free. Submissions from users are +encouraged.</para> + +<para>When preparing entries for the <acronym>CDDB</acronym>, please keep the +following points in mind:</para> + +<itemizedlist> +<listitem><para>Use <quote>standard</quote> latin characters in the entries. Some +special characters are supported, but Cyrillic or Greek alphabet submissions, +for example, cannot be accepted.</para></listitem> +<listitem><para>Use only one <keysym>/</keysym> character in the +<guilabel>Disc Artist / Title</guilabel> field in the &CD; Database +Editor.</para> + +<para>For classical &CD;s, it is standard practice to put the composer's name in +the Artist section (before the slash) and the performer's name in the Title +section (after the slash).</para></listitem> +<listitem><para>If you send an entry that already exists in the database, any +additional information you provide may be added to the existing entry.</para> +</listitem> +</itemizedlist> + +<para>By default, the standard <acronym>CDDB</acronym> +categories are installed in <filename class="directory">$HOME/.cddb</filename>. You can create as +many category subfolders as you like. However, when uploading, only the +official <acronym>CDDB</acronym> categories are displayed. The default upload +address is <email>freedb-submit(a)freedb.org</email>. For more information about +<abbrev>freedb</abbrev> visit the <abbrev>freedb</abbrev> homepage.</para> + +<para>The local <acronym>CDDB</acronym> entry for a particular &CD; is stored in +the file <filename><replaceable>category name</replaceable>/<replaceable>disc +ID</replaceable></filename> under the <acronym>CDDB</acronym> Base +Folder. These files can be edited with any text editor.</para> +</sect1> + +</article> + Files old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/kscd13.png and new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/kscd13.png differ Files old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/kscd14.png and new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/kscd14.png differ Files old/kdemultimedia-4.4.1/doc/kcontrol/cddbretrieval/kscd16.png and new/kdemultimedia-4.4.2/doc/kcontrol/cddbretrieval/kscd16.png differ Files old/kdemultimedia-4.4.1/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.4.2/doc/kioslave/audiocd/index.cache.bz2 differ Files old/kdemultimedia-4.4.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.4.2/doc/kmix/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/doc/kscd/CMakeLists.txt new/kdemultimedia-4.4.2/doc/kscd/CMakeLists.txt --- old/kdemultimedia-4.4.1/doc/kscd/CMakeLists.txt 2008-01-05 01:02:08.000000000 +0100 +++ new/kdemultimedia-4.4.2/doc/kscd/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -########### install files ############### -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) Files old/kdemultimedia-4.4.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.4.2/doc/kscd/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/doc/kscd/index.docbook new/kdemultimedia-4.4.2/doc/kscd/index.docbook --- old/kdemultimedia-4.4.1/doc/kscd/index.docbook 2009-01-28 00:07:47.000000000 +0100 +++ new/kdemultimedia-4.4.2/doc/kscd/index.docbook 1970-01-01 01:00:00.000000000 +0100 @@ -1,902 +0,0 @@ -<?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kappname "&kscd;"> - <!ENTITY package "kdemultimedia"> - <!ENTITY % English "INCLUDE" >  - <!ENTITY % addindex "IGNORE"> -]> - -<book lang="&language;"> - -<bookinfo> -<title>The &kscd; Handbook</title> - -<authorgroup> - -<author> -<firstname>Mike</firstname> -<surname>McBride</surname> -<affiliation><address>&Mike.McBride.mail;</address></affiliation> -</author> - -<author> -<firstname>Jonathan</firstname> -<surname>Singer</surname> -<affiliation><address>&Jonathan.Singer.mail;</address></affiliation> -</author> - -<author> -<firstname>David</firstname> -<surname>White</surname> -<affiliation><address><email>a9403784(a)unet.univie.ac.at</email></address> -</affiliation> -</author> - -<othercredit role="developer"> -<firstname>Bernd</firstname> -<othername>Johannes</othername> -<surname>Wuebben</surname> -<affiliation><address>&Bernd.Johannes.Wuebben.mail;</address></affiliation> -<contrib>Developer</contrib> -</othercredit> - -<othercredit role="developer"> -<firstname>Dirk</firstname> -<surname>Forsterling</surname> -<affiliation><address><email>milliByte(a)gmx.net</email></address></affiliation> -<contrib>Developer</contrib> -</othercredit> - -<othercredit role="developer"> -<firstname>Dirk</firstname> -<surname>Foersterling</surname> -<affiliation><address><email>milliByte(a)gmx.net</email></address></affiliation> -<contrib>Developer</contrib> -</othercredit> - -<othercredit role="reviewer"> -<firstname>Lauri</firstname> -<surname>Watts</surname> -<affiliation><address>&Lauri.Watts.mail;</address></affiliation> -<contrib>Reviewer</contrib> -</othercredit> - -</authorgroup> - -<copyright> -<year>2000</year><year>2004</year> -<holder>J Singer</holder> - -</copyright> -<copyright> - -<year>2005-2006</year> -<holder>&Mike.McBride;</holder> -</copyright> -<legalnotice>&FDLNotice;</legalnotice> - - -<date>2008-08-01</date> -<releaseinfo>1.5</releaseinfo> - -<abstract> -<para>&kscd; is a small, fast, <abbrev>CDDB</abbrev> enabled audio -<abbrev>&CD;</abbrev> player for &UNIX;, &Windows; and &MacOS; platforms.</para> -</abstract> - -<keywordset> -<keyword>KDE</keyword> -<keyword>kdemultimedia</keyword> -<keyword>kscd</keyword> -<keyword>music</keyword> -<keyword>CD</keyword> -<keyword>audio</keyword> -</keywordset> - -</bookinfo> - -<chapter id="introduction"> -<title>Introduction</title> - -<para>&kscd; is a fast, <acronym>CDDB</acronym> enabled &CD; player for &UNIX;, -&Windows; and &MacOS; platforms. &kscd; stands for <quote>The &kde; Project's small/simple &CD; -player</quote>.</para> - -<para><emphasis>New</emphasis>: the <filename>workman2cddb.pl</filename> Perl -script provided in order to facilitate transition for users of workman.</para> - -<para>I hope you will enjoy this &CD; player.</para> - -<para>&Bernd.Johannes.Wuebben;</para> - -<para>&Bernd.Johannes.Wuebben.mail;</para> - -<sect1 id="supported-platforms"> -<title>Supported Platforms</title> - -<para>&kscd; explicitly supports the following platforms:</para> - -<itemizedlist> -<listitem><para>&Linux;</para></listitem> -<listitem><para>FreeBSD</para></listitem> -<listitem><para>NetBSD</para></listitem> -<listitem><para>BSD386</para></listitem> -<listitem><para>Sun</para></listitem> -<listitem><para>&Solaris; (including <acronym>cdda</acronym> -support)</para></listitem> -<listitem><para>&HP-UX;</para></listitem> -<listitem><para>&SGI; Irix (including <abbrev>cdda</abbrev> -support)</para></listitem> -<listitem><para>Sony NEWS</para></listitem> -<listitem><para>OSF/1</para></listitem> -<listitem><para>Ultrix</para></listitem> -<listitem><para>&Windows;</para></listitem> -<listitem><para>&MacOS;</para></listitem> -</itemizedlist> - -<para>and should compile on many others with few modifications.</para> - -</sect1> - -</chapter> - -<chapter id="onscreen-fundamentals"> -<title>Onscreen fundamentals</title> - -<sect1 id="basic-operation"> -<title>Basic Operation</title> - -<screenshot> -<screeninfo>The &kscd; Interface</screeninfo> -<mediaobject> -<imageobject> -<imagedata fileref="kscd.png" format="PNG"/></imageobject> -<textobject><phrase>The &kscd; Interface</phrase></textobject> -</mediaobject> -</screenshot> - -<para>This is the main window of &kscd;. You should see something like this when -you start &kscd;. The controls in this window are explained below, in no -particular order.</para> - -<sect2 id="control-panel"> -<title>The Control Panel</title> - -<screenshot> -<screeninfo>The Control Panel</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd2.png" format="PNG"/></imageobject> -<textobject><phrase>The Control Panel</phrase></textobject> -</mediaobject> -</screenshot> - -<para> This is the main control panel for &kscd;. The function of these buttons -should be familiar to anyone who has ever used a &CD; player.</para> - -<para>The uppermost button in the above diagram toggles between playing and -pausing the &CD;. The left button in the second row stops playing the &CD;. The -right button in the second row ejects the &CD;. The two buttons in the third row -skip forward (right) or backward (left) to the beginning of the next or previous track. -The left button in the bottom row toggles random play order on and off; the right button -in the bottom row toggles looping, so that the &CD; will start -playing again from the beginning when the end of the last audio track is -reached.</para> -</sect2> - - -<sect2 id="status-display"> -<title>The Status Display</title> - -<screenshot> -<screeninfo>The Status Display</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd3.png" format="PNG"/></imageobject> -<textobject><phrase>The Status Display</phrase></textobject> -</mediaobject> -</screenshot> - -<para>This is the status display. Starting at the top, from right to left, is -the main time display (see below for a discussion of the various possible time -display modes), the status of the &CD-ROM; drive, the total play time of the -audio &CD;, the current volume setting, and the current and maximum track -numbers (curr./max.). The bottommost two lines of text display the artist and -title of the &CD;, and then the title of the track, assuming that appropriate -entries exist in the local or network <acronym>CDDB</acronym> (&CD; Data -Base.)</para> - -<para>Click the time display to toggle between the possible main time display modes. By -default, &kscd; displays the elapsed time of the current track, if the &CD; is -playing, or either ––:–– or 00:00 if the &CD; is not playing. -Clicking the display toggles in sequence between remaining track time, total -elapsed time, and total remaining time.</para> -</sect2> - -<sect2 id="configuration-button"> -<title>The <guibutton>Extras</guibutton> button</title> - -<screenshot> -<screeninfo>The Extras button</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd5.png" format="PNG"/></imageobject> -<textobject><phrase>The Extras button</phrase></textobject> -</mediaobject> -</screenshot> - -<para>This button brings up a menu with a number of options. You can choose to open the &kscd; -configuration panel or configure keyboard shortcuts. These allow you to -configure &kscd; to work exactly to your tastes. See <link linkend="configuring-kscd">the configuring &kscd;</link> section, for details -about configuring &kscd;</para> -<para>The menu provides several tools to help you search for information about the artist on the -Internet. You can find out about performance dates, purchase information, and -other information by pressing this button and choosing the appropriate option in -the popup menu that appears.</para> -<para>This menu also allows you to open this help document, report bugs, learn more -about &kscd; and &kde; and to quit &kscd;.</para> -</sect2> - -<sect2 id="cddb-button"> -<title>The <guibutton>CDDB</guibutton> button</title> - -<screenshot> -<screeninfo>The <acronym>CDDB</acronym> button</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd6.png" format="PNG"/></imageobject> -<textobject><phrase>The <acronym>CDDB</acronym> button</phrase></textobject> -</mediaobject> -</screenshot> - -<para> This button opens the <acronym>CDDB</acronym> (Compact Disc Data Base) entry -editor panel. </para> - -<para>The <acronym>CDDB</acronym> can identify your &CD; and often download a -list of tracks for that &CD; or load it from the filesystem. See the <link -linkend="cddb-editor">&CD; Database Editor</link> section for more details about -using this tool.</para> -</sect2> - - -<sect2> -<title>The Volume slider</title> - -<screenshot> -<screeninfo>The Volume slider</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd9.png" format="PNG"/></imageobject> -<textobject><phrase>The Volume slider</phrase></textobject> -</mediaobject> -</screenshot> - -<para> This slider controls the volume of the audio output -of the &CD;. Moving it to the right makes the music louder, left makes it quieter. If you are playing your &CD; through your sound card, -the sound card mixer will affect the playback volume as well.</para> -</sect2> - - -<sect2> -<title>The track selector</title> - -<screenshot> -<screeninfo>The track selector</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd11.png" format="PNG"/></imageobject> -<textobject><phrase>The Track selector</phrase></textobject> -</mediaobject> -</screenshot> - -<para>This drop down box shows you the current track number, the name of the track and the time (in minutes and seconds). You can use this drop down box to directly select -any track on the &CD;. </para> -</sect2> - -</sect1> -</chapter> - -<chapter id="configuring-kscd"> -<title>Configuring &kscd;</title> -<sect1 id="configuration-intro"> -<title>The primary configuration window</title> - -<para>You configure &kscd; by clicking on the <guibutton>Extras</guibutton> button. This will bring up a menu, select -<guilabel>Configure &kscd;...</guilabel> to open a new window.</para> -<para>The primary configuration window for &kscd; is divided into two -major sections. </para> - -<itemizedlist> -<listitem><para><link linkend="kscd-options-tab"><guilabel>CD -Player</guilabel></link> to determine the look and behavior of &kscd;.</para></listitem> -<listitem><para><guilabel>CDDB</guilabel> which is used to configure the CDDB lookup features of &kscd;.</para></listitem> -</itemizedlist> - -<para>You can switch between these two sections using the icons on the left side of the dialog.</para> -</sect1> - -<sect1 id="kscd-options-tab"> -<title>The <guilabel>CD Player</guilabel> dialog</title> - -<screenshot> -<screeninfo>The <guilabel>CD Player</guilabel> dialog</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd12.png" format="PNG"/></imageobject> -<textobject><phrase>The <guilabel>CD Player</guilabel> dialog</phrase></textobject> -</mediaobject> -</screenshot> - -<para>The <guilabel>LCD font</guilabel> text box lists the currently selected font to display all information in the &kscd; status display. To change the font, click the <guibutton>Choose...</guibutton> button.</para> - -<para>The <guilabel>LCD color</guilabel> and <guilabel>Background -color</guilabel> fields show the color selected for the foreground and -background of the status display. Press the color bars to change -these colors.</para> - -<para>Placing a mark in the check box labeled <guilabel>Show icon in system tray</guilabel> causes a &kscd; control to -appear in the &kicker; panel.</para> - -<para>Placing a mark in the check box labeled <guilabel>Show track announcement</guilabel> causes a small information window to appear on -top of the kicker window each time the &CD; track changes. This window will automatically disappear in 5 seconds.</para> - -<screenshot> -<screeninfo>Sample track announcement</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscdannounc.png" format="PNG"/></imageobject> -<textobject><phrase>Sample track announcement</phrase></textobject> -</mediaobject> -</screenshot> - -<para><guilabel>Autoplay when CD inserted</guilabel> causes &kscd; to start playing the &CD; -when the tray is closed, with no need to press the -<guibutton>Play</guibutton> button.</para> - -<para><guilabel>Eject CD when finished playing</guilabel> causes the -&CD; to be automatically ejected when playback ends.</para> - -<para><guilabel>Stop playing CD on exit</guilabel> causes &CD; playback to stop -when &kscd; is closed.</para> - -<para>The <guilabel>CD-ROM Device</guilabel> field contains the name -of the &CD-ROM; device to be used to play audio &CD;s. The default -value is <filename>/dev/cdrom</filename>. The permissions on this -device must be set to allow opening this device read-only. Changing -the permissions on this device file will in almost all cases require -superuser privileges and can be done from the command line, or in the -Super User Mode of &konqueror;.</para> - -<note><para>Before we discuss the options that follow, it is important to understand that there are two -ways that personal computers can play a &CD;.</para> - -<para>The first method (which &kscd; refers to as direct digital playback), is performed by reading the digital data from the -&CD; using Digital Audio Extraction (DAE). This data is sent to your machines CPU which converts the digital data to sound. This method requires -a &CD; drive that is capable of DAE (most new drives are) and it requires some CPU processing time to generate the sounds you hear.</para> - -<para>The second method uses the internal circuitry available on most &CD; drives to read the data and generate the sounds you will hear -without using your computers CPU. This data is transmitted by a dedicated cable directly to the sound card in your computer. This method requires -less CPU proccessing time, but it does require that the dedicated cable be connected inside your computer. Not all computers have this connection.</para></note> - -<para>The check box labeled <guilabel>Use direct digital playback</guilabel> determines which method &kscd; uses to read the audio tracts. If there is a mark in the check box, the first method is used. If there is no mark in the check box, the second method is utilized.</para> - -<para>If you have selected direct digital playback, a drop down box labeled <guilabel>Select audio backend</guilabel> will let you select which -sound backend the digital information should be sent to. The contents of the drop down box will vary depending on your system. -Most users should select <guilabel>phonon</guilabel>. You can also select the device the audio backend uses by entering the device location in -the text box labeled <guilabel>Select audio device</guilabel>. A full discussion of audio devices and audio backends is beyond the scope of this manual.</para> - -<para>If a mark is placed in the check box labeled <guilabel>Allow encoding selection</guilabel>, you can select the text encoding for the results of a CDDB request.</para> -<tip><para>The standard describes CDDB results as being strictly Latin 1. If you are not having problems with your CDDB information, leave this box unchecked.</para></tip> - - - -<para>The <guibutton>Help</guibutton> button opens the &kscd; help contents -page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; -<guibutton>Apply</guibutton> saves the current settings without exiting; -<guibutton>Cancel</guibutton> exits without saving. </para> -</sect1> - - -<sect1 id="cddb-page"> -<title>The <guilabel>CDDB</guilabel> Page</title> -<para>The <guilabel>CDDB</guilabel> page is divided in the <guilabel>Lookup</guilabel> tab -and the <guilabel>Submit</guilabel> tab.</para> - -<sect2 id="lookup-tab"> -<title>The <guilabel>Lookup</guilabel> Tab</title> -<screenshot> -<screeninfo>The <guilabel>Lookup</guilabel> tab of the configuration dialog</screeninfo> -<mediaobject> -<imageobject> <imagedata fileref="kscd14.png" format="PNG"/> </imageobject> -<textobject><phrase>The <guilabel>Lookup</guilabel> tab of the configuration -dialog</phrase></textobject> -</mediaobject> -</screenshot> - -<para> The <guilabel>Lookup</guilabel> tab sets up the <acronym>CDDB</acronym> functions -of &kscd;.</para> - -<para>You can select the options <guilabel>Enable MusicBrainz lookup</guilabel> or <guilabel>Enable freedb lookup</guilabel>.</para> - -<para>The <guilabel>Freedb server</guilabel> section determines which CDDB mirror site is used by &kscd; to -get album information. You can enter a server name, port number and protocol using the text boxes and drop -down boxes or you can click the <guibutton>Show Mirror List</guibutton> button. Clicking this button will -open a new window with a list of CDDB mirrors and their locations. Simply select the server you want from -the list and click <guibutton>OK</guibutton>.</para> - -<para>The section labeled <guilabel>Cache Locations</guilabel> lets you determine where &kscd; saves CDDB information -on your computer. To add a folder, enter the folder location in the text box at the top of the section and click -<guibutton>Add</guibutton>. You can also select a -folder by clicking on the blue file folder to the right of the text box. To delete a folder, click on the folder name -once with the &LMB; and click <guibutton>Remove</guibutton>. You can change the order that &kscd; searches the folders by -clicking on the folder name and clicking on the <guibutton>Move Up</guibutton> and <guibutton>Move Down</guibutton> buttons.</para> - -<para>The <guibutton>Help</guibutton> button opens the &kscd; help contents -page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; -<guibutton>Apply</guibutton> saves the current settings without exiting; -<guibutton>Cancel</guibutton> exits without saving. </para> - -</sect2> - -<sect2 id="submit-tab"> -<title>The <guilabel>Submit</guilabel> Tab</title> - -<screenshot> -<screeninfo>The Submit tab</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd16.png" format="PNG"/></imageobject> -</mediaobject> -</screenshot> - -<para>The <guilabel>Submit</guilabel> tab sets up connection to a mail -server or a web server to submit new <acronym>CDDB</acronym> entries. This is useful -if you do not have your own system configured as a server. </para> - -<para>If you plan to submit a CDDB entry, enter your email address into the first textbox, -then you must decide between submitting between &HTTP; -and submitting the entry as an email (via &SMTP;). </para> - -<tip><para>It is simpler to submit new entries using &HTTP;. Some firewalls block this traffic. If your -firewall prevents you from sending new entries using &HTTP;, you can use &SMTP;.</para></tip> - -<para>First select either <guilabel>&HTTP;</guilabel> or <guilabel>SMTP (Email)</guilabel> to determine which -protocol to use.</para> - -<sect3 id="http-options"> -<title>Using &HTTP; to send CDDB information</title> -<para>You can enter a server name or port number in the text boxes provided. If -you want to send this information to the international servers, you do not need to -change anything.</para> -</sect3> - -<sect3 id="smtp-options"> -<title>Using &SMTP; (Email) to send CDDB information</title> - -<para>To prepare to submit information using email, enter your email address in the -text box labeled <guilabel>Reply-To:</guilabel>, your email server in the text box -labeled <guilabel>SMTP server:</guilabel> and select the port number in the spinbox -labeled <guilabel>Port:</guilabel>.</para> -<para>If you need to use a password to send email using the email server, place a mark in the -check box labeled <guilabel>Server needs authentication</guilabel> and enter your -username in the text box labeled <guilabel>Username</guilabel>.</para> - -<para>The <guibutton>Help</guibutton> button opens the &kscd; help contents -page. The <guibutton>Defaults</guibutton> button restores the default values of all entries in this dialog; <guibutton>OK</guibutton> saves the current settings and exits; -<guibutton>Apply</guibutton> saves the current settings without exiting; -<guibutton>Cancel</guibutton> exits without saving. </para> -</sect3> -</sect2> -</sect1> - -</chapter> - - -<chapter id="cddb-editor"> -<title>The CD Database Editor</title> - -<screenshot> -<screeninfo>The &CD; Database Editor</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd13.png" format="PNG"/></imageobject> -<textobject><phrase>The &CD; Database Editor</phrase></textobject> -</mediaobject> -</screenshot> - -<para>The &CD; Database Editor allows you to modify, download, save, annotate, -and upload <link linkend="cddb-support"><acronym>CDDB</acronym> (Compact Disc -Data Base)</link> entries.</para> - -<para>If there is an entry in your local <acronym>CDDB</acronym> tree -(see the <link linkend="cddb-page">CDDB subsection</link> in the -Configuration chapter) for the &CD; in your &CD-ROM; drive, or if the -disc could be found in the freedb, you will see the name of the artist -and the title of the &CD; in the <guilabel>Artist:</guilabel> and -<guilabel>Title</guilabel> fields and a list of tracks with song -titles in the <interface>Tracks</interface> selection box. Otherwise, -you will see a list of tracks and play times without titles.</para> - -<para>You can make an annotation for the entire disc with the -<guilabel>Comment</guilabel> field under the -<guilabel>Title</guilabel> field, or for a selected track in the -<guilabel>Tracks</guilabel> selection box with the adjacent -<guibutton>Comment</guibutton> button. If you select a track in the -<guilabel>Tracks</guilabel> selection box, the title, if present, will -appear in the <guilabel>Title</guilabel> field below. You can type a -title for the track in the box, or edit the entry to suit your -needs. Press the <keycap>Return</keycap> key on your keyboard, and the -text will appear in the proper line in the selection box.</para> - -<para>Once all tracks have been given titles and the -<guilabel>Artist:</guilabel> and <guilabel>Title</guilabel> fields have -been filled out, you can press the <guibutton>Upload</guibutton> -button to send your submission by email to freedb.</para> - -<para>You will be prompted to select a category for the -submission. The <guilabel>Disc ID</guilabel> section displays the 32 -bit <acronym>ID</acronym> code used by freedb to identify a compact -disc. Above the <acronym>ID</acronym> code is the category of the -<guilabel>freedb</guilabel> entry. These categories correspond to the -subfolders tree of the folder chosen in the <guilabel>freedb -Base Folder:</guilabel> in the <link -linkend="cddb-page"><guilabel>CDDB</guilabel> page</link> of the &kscd; -Configuration window.</para> - -<para>The <guilabel>Length:</guilabel> display shows the total play time of -the &CD;.</para> - -<para>Press the <guibutton>Fetch Info</guibutton> button to download -<acronym>CDDB</acronym> data. -Press the <guibutton>OK</guibutton> button to save your changes locally. -The <guibutton>Cancel</guibutton> button closes the &CD; -Database Editor without saving.</para> - -</chapter> - -<chapter id="using-kscd-in-the-panel"> -<title>Using &kscd; in the &kde; Panel</title> - -<screenshot> -<screeninfo>Using &kscd; in the &kde; Panel</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd18.png" format="PNG"/></imageobject> -<textobject><phrase>Using &kscd; in the &kde; Panel</phrase></textobject> -</mediaobject> -</screenshot> - -<para>When the <guilabel>Show icon in system tray</guilabel> box is checked, a -small &kscd; applet is also displayed in the panel. Unlike the main &kscd; window, this applet is available on -any desktop. <mousebutton>Right</mousebutton> click on the applet to pop up a -menu to control &CD; playback. A &LMB; click on the -applet hides the main &kscd; window. If the main window is hidden, a second -&LMB; click on the applet restores it. </para> - -<note><para>To be precise, the applet is displayed in the <application>system -tray</application> in the panel. If no applet appears when &kscd; is minimized, -you may have removed the tray. To add it, <mousebutton>right</mousebutton> click -on an empty spot on the panel and select <guimenuitem>Add Widgets...</guimenuitem>. -In the upcoming dialog, choose <guimenuitem>System Tray</guimenuitem></para></note> - -</chapter> - -<chapter id="cddb-support"> -<title><acronym>CDDB</acronym> Support</title> - -<para>freedb is a distributed network database accessible -over the Internet that contains information about most audio &CD;s in -circulation. If you have Internet access, you will likely never have to manually -enter track information for your &CD;s if you have this set up properly. See -<link linkend="cddb-page">The CDDB Page</link> subsection in the configuring -&kscd; chapter for detailed instructions on how to configure this service, and -the <link linkend="cddb-editor">The &CD; Database Editor</link> section for -instructions on how to edit <acronym>CDDB</acronym> entries.</para> - -<para>Use of the <acronym>CDDB</acronym> is free. Submissions from users are -encouraged.</para> - -<para>When preparing entries for the <acronym>CDDB</acronym>, please keep the -following points in mind:</para> - -<itemizedlist> -<listitem><para>Use <quote>standard</quote> latin characters in the entries. Some -special characters are supported, but Cyrillic or Greek alphabet submissions, -for example, cannot be accepted.</para></listitem> -<listitem><para>Use only one <keysym>/</keysym> character in the -<guilabel>Disc Artist / Title</guilabel> field in the &CD; Database -Editor.</para> - -<para>For classical &CD;s, it is standard practice to put the composer's name in -the Artist section (before the slash) and the performer's name in the Title -section (after the slash).</para></listitem> -<listitem><para>If you send an entry that already exists in the database, any -additional information you provide may be added to the existing entry.</para> -</listitem> -</itemizedlist> - -<para>By default, &kscd; installs the standard <acronym>CDDB</acronym> -categories in <filename class="directory">$KDEDIR/share/apps/kscd/cddb</filename>. You can create as -many category subfolders as you like. However, when uploading, only the -official <acronym>CDDB</acronym> categories are displayed. The default upload -address is <email>freedb-submit(a)freedb.org</email>. For more information about -<abbrev>freedb</abbrev> visit the <abbrev>freedb</abbrev> homepage.</para> - -<para>The local <acronym>CDDB</acronym> entry for a particular &CD; is stored in -the file <filename><replaceable>category name</replaceable>/<replaceable>disc -ID</replaceable></filename> under the <acronym>CDDB</acronym> Base -Folder. These files can be edited with any text editor if you have nothing -better to do with your spare time.</para> - -</chapter> - -<chapter id="questions-and-answers"> -<title>Questions and answers</title> - -<qandaset> -<qandaentry> -<question><para>I see this dialog when I start &kscd;. What's wrong?</para> -<screenshot> -<screeninfo>Error dialog</screeninfo> -<mediaobject> -<imageobject><imagedata fileref="kscd19.png" format ="PNG"/></imageobject> -<textobject><phrase>Error dialog</phrase></textobject> -</mediaobject> -</screenshot> -</question> -<answer><para>This means that &kscd; couldn't open your &CD-ROM; drive. The name of -the device in the <guilabel>&CD-ROM; Device</guilabel> field of the -<guilabel>Kscd Configuration</guilabel> must actually refer to the block device -associated with your &CD-ROM; drive. This will often be a hardlink to the -appropriate <acronym>IDE</acronym> (<filename>/dev/hdx</filename>) or -<acronym>SCSI</acronym> (<filename>/dev/sdx</filename>) device.</para> - -<para> The device file normally belongs to user root in group root, and does not -allow normal users to open it for reading, writing, or execution directly. This -has <emphasis>nothing</emphasis> to do with the <application>SUID</application> -(Set User <acronym>ID</acronym> programs use the <function>setuid()</function> -function in the standard Un*x library to assume the identity of another user) -<command>mount</command> command, which has no problems with permissions; &kscd; -must be able to get a read-only file descriptor referring to the &CD; device to -control the &CD-ROM; drive and read raw data off the disk.</para> - -<para> If you have the root password, you can fix this quickly and easily. -Become root and type <userinput><command>chmod</command> <option>a+r</option> -<filename><replaceable>/dev/cdrom</replaceable></filename></userinput> to allow -any user on your system to read from <filename>/dev/cdrom</filename>. If your -&CD-ROM; device is called something else, change the permissions on that device -with the same procedure. If you don't have the root password, ask your system -administrator nicely to give you read permission for the &CD-ROM; device.</para> - -<para>See also the chapter on <link linkend="configuring-kscd">configuring KSCD -</link></para></answer> -</qandaentry> - -<qandaentry> -<question><para>I cannot get the <acronym>CDDB</acronym> to work. Can I get any -detailed information about what may be going wrong?</para></question> -<answer><para>If you experience trouble with the <acronym>CDDB</acronym> -functionality try to starting &kscd; from the command line with the -<option>-d</option> switch and observe the debug output.</para></answer> -</qandaentry> -</qandaset> -</chapter> - -<chapter id="credits-and-license"> -<title>Credits and licenses</title> - -<para>&kscd; Copyright 1997,1998 &Bernd.Johannes.Wuebben; -&Bernd.Johannes.Wuebben.mail;</para> - -<para>&kscd; contains code from: </para> -<itemizedlist> -<listitem><para><application>workman</application> 1.4 beta 3 Copyright (c) -Steven Grimm <email>koreth(a)hyperion.com</email></para></listitem> -</itemizedlist> - - -<para>Special thanks to Ti Kan and Steve Scherf, the inventors of the -<acronym>CDDB</acronym> database concept. Visit <ulink -url="http://www.cddb.com/">http://www.cddb.com</ulink> for more information on -<acronym>CDDB</acronym>.</para> - -<para>A very special thank you also to David White who wrote the original &kscd; -help documention. Great Job David!</para> - -<para>Documentation updated for &kde; 2.0, and copyright by &Jonathan.Singer; -&Jonathan.Singer.mail;</para> - -<para>Documentation updated for &kde; 3.4, and copyright by &Mike.McBride; -&Mike.McBride.mail;</para> - - - -&underFDL; -&underGPL; - -</chapter> - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="how-to-obtain-kscd"> -<title>How to obtain &kscd;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="requirements"> -<title>Requirements</title> - -<para>In order to successfully compile &kscd;, you need the latest versions of -the &kde; libraries as well as the &Qt; C++ library. All required libraries as -well as &kscd; itself can be found at the &kde; &FTP; site, &kde-ftp;.</para> - -</sect1> - -<sect1 id="compilation-and-installation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -<para>Please inform the current maintainer, Aaron Seigo, at -&Aaron.J.Seigo.mail; of any modification you had to undertake in -order to get &kscd; to compile on your platform.</para> - -</sect1> - -</appendix> - -&documentation.index; -</book> - Files old/kdemultimedia-4.4.1/doc/kscd/kscd.png and new/kdemultimedia-4.4.2/doc/kscd/kscd.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd11.png and new/kdemultimedia-4.4.2/doc/kscd/kscd11.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd12.png and new/kdemultimedia-4.4.2/doc/kscd/kscd12.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd13.png and new/kdemultimedia-4.4.2/doc/kscd/kscd13.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd14.png and new/kdemultimedia-4.4.2/doc/kscd/kscd14.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd16.png and new/kdemultimedia-4.4.2/doc/kscd/kscd16.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd18.png and new/kdemultimedia-4.4.2/doc/kscd/kscd18.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd19.png and new/kdemultimedia-4.4.2/doc/kscd/kscd19.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd2.png and new/kdemultimedia-4.4.2/doc/kscd/kscd2.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd3.png and new/kdemultimedia-4.4.2/doc/kscd/kscd3.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd5.png and new/kdemultimedia-4.4.2/doc/kscd/kscd5.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd6.png and new/kdemultimedia-4.4.2/doc/kscd/kscd6.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscd9.png and new/kdemultimedia-4.4.2/doc/kscd/kscd9.png differ Files old/kdemultimedia-4.4.1/doc/kscd/kscdannounc.png and new/kdemultimedia-4.4.2/doc/kscd/kscdannounc.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/juk/juk.desktop new/kdemultimedia-4.4.2/juk/juk.desktop --- old/kdemultimedia-4.4.1/juk/juk.desktop 2010-01-20 00:22:05.000000000 +0100 +++ new/kdemultimedia-4.4.2/juk/juk.desktop 2010-03-26 18:28:39.000000000 +0100 @@ -112,7 +112,7 @@ GenericName[lt]=Muzikos grotuvas GenericName[lv]=Muzikas atskaņotājs GenericName[mk]=Изведувач на музика -GenericName[nb]=Musikkavspiller +GenericName[nb]=Musikkspiller GenericName[nds]=Musikafspeler GenericName[ne]=सङ्गीत प्लेयर GenericName[nl]=Muziekspeler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/juk/juk.notifyrc new/kdemultimedia-4.4.2/juk/juk.notifyrc --- old/kdemultimedia-4.4.1/juk/juk.notifyrc 2010-02-04 10:32:55.000000000 +0100 +++ new/kdemultimedia-4.4.2/juk/juk.notifyrc 2010-03-26 18:28:40.000000000 +0100 @@ -25,7 +25,7 @@ Comment[km]=កម្មវិធីចាក់តន្ត្រី Comment[ko]=음악 재생기 Comment[lv]=Muzikas atskaņotājs -Comment[nb]=Musikkavspiller +Comment[nb]=Musikkspiller Comment[nds]=Musikafspeler Comment[nl]=Muziekspeler Comment[nn]=Musikkspelar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/juk/tag.cpp new/kdemultimedia-4.4.2/juk/tag.cpp --- old/kdemultimedia-4.4.1/juk/tag.cpp 2010-02-26 19:33:39.000000000 +0100 +++ new/kdemultimedia-4.4.2/juk/tag.cpp 2010-03-26 18:28:40.000000000 +0100 @@ -52,7 +52,7 @@ } TagLib::File *file = MediaFiles::fileFactoryByType(fileName); - if(file->isValid()) { + if(file && file->isValid()) { setup(file); delete file; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/kioslave/audiocd/data/solid_audiocd.desktop new/kdemultimedia-4.4.2/kioslave/audiocd/data/solid_audiocd.desktop --- old/kdemultimedia-4.4.1/kioslave/audiocd/data/solid_audiocd.desktop 2010-02-04 10:32:56.000000000 +0100 +++ new/kdemultimedia-4.4.2/kioslave/audiocd/data/solid_audiocd.desktop 2010-03-26 18:28:51.000000000 +0100 @@ -23,6 +23,7 @@ Name[hu]=Megnyitás a fájlkezelővel Name[is]=Opna með skráastjóra Name[it]=Apri con il gestore dei file +Name[ja]=ファイルマネージャで開く Name[ko]=파일 관리자로 열기 Name[lv]=Atvērt failu pārvaldniekā Name[nb]=Åpne med filbehandler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/kmix/dialogviewconfiguration.cpp new/kdemultimedia-4.4.2/kmix/dialogviewconfiguration.cpp --- old/kdemultimedia-4.4.1/kmix/dialogviewconfiguration.cpp 2009-07-06 13:20:22.000000000 +0200 +++ new/kdemultimedia-4.4.2/kmix/dialogviewconfiguration.cpp 2010-03-26 18:28:51.000000000 +0100 @@ -331,9 +331,17 @@ for ( std::vector<ProfControl*>::const_iterator it = newControlset.begin(); it != itEnd; ++it) { ProfControl* control = *it; + control->id = "^" + control->id + "$"; // Create a regexp from the control name kDebug() << "Add control " << control->id; oldControlset.push_back(control); } + ProfControl* fallbackMatchAllControl = new ProfControl; + fallbackMatchAllControl->id = "^.*$"; + fallbackMatchAllControl->subcontrols = ".*"; + fallbackMatchAllControl->tab = "Base"; + fallbackMatchAllControl->show = "extended"; + oldControlset.push_back(fallbackMatchAllControl); + QString profileName; Mixer* mixer = _view.getMixer(); profileName = mixer->id() + "." + _view.id(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/kmix/mixer_oss4.cpp new/kdemultimedia-4.4.2/kmix/mixer_oss4.cpp --- old/kdemultimedia-4.4.1/kmix/mixer_oss4.cpp 2009-08-05 11:57:10.000000000 +0200 +++ new/kdemultimedia-4.4.2/kmix/mixer_oss4.cpp 2010-03-26 18:28:51.000000000 +0100 @@ -281,9 +281,11 @@ //skip unreadable controls if ( ext.flags & MIXF_READABLE - && (name.contains("mute") +#ifndef MIXT_MUTE + && (name.contains("mute")) +#endif #ifdef MIXT_MUTE - || ext.flags == MIXT_MUTE) + && (name.contains("mute") || ext.flags == MIXT_MUTE) #endif ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/kmix/version.h new/kdemultimedia-4.4.2/kmix/version.h --- old/kdemultimedia-4.4.1/kmix/version.h 2009-08-20 04:43:47.000000000 +0200 +++ new/kdemultimedia-4.4.2/kmix/version.h 2010-03-26 18:28:51.000000000 +0100 @@ -20,6 +20,6 @@ */ #ifndef APP_VERSION -#define APP_VERSION "3.6-alpha2" +#define APP_VERSION "3.6" #define KMIX_CONFIG_VERSION 3 #endif // APP_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.4.1/kscd/tests/CMakeLists.txt new/kdemultimedia-4.4.2/kscd/tests/CMakeLists.txt --- old/kdemultimedia-4.4.1/kscd/tests/CMakeLists.txt 2008-08-14 12:46:26.000000000 +0200 +++ new/kdemultimedia-4.4.2/kscd/tests/CMakeLists.txt 2010-03-26 18:28:37.000000000 +0100 @@ -17,6 +17,8 @@ # libraries needed for HWControler tests target_link_libraries(HWControler_test ${KDE4_KUTILS_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PHONON_LIBS} ${QT_QTTEST_LIBRARY} kcddb kcompactdisc @@ -26,6 +28,8 @@ # libraries needed for AudioCD tests target_link_libraries(AudioCD_test ${KDE4_KUTILS_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PHONON_LIBS} ${QT_QTTEST_LIBRARY} kcddb kcompactdisc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libindi for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package libindi for openSUSE:Factory checked in at Thu Apr 1 16:10:13 CEST 2010. -------- --- libindi/libindi.changes 2009-03-20 17:39:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/libindi/libindi.changes 2010-04-01 16:05:08.083317000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 1 16:04:52 CEST 2010 - llunak(a)novell.com + +- Add libfli as a buildrequire + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindi.spec ++++++ --- /var/tmp/diff_new_pack.Vo3kot/_old 2010-04-01 16:10:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Vo3kot/_new 2010-04-01 16:10:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libindi (Version 0.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,13 @@ Name: libindi BuildRequires: cmake gcc-c++ zlib-devel BuildRequires: libcfitsio-devel libnova-devel libusb-devel +BuildRequires: libfli-devel Url: http://indi.sourceforge.net/ -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: Instrument Neutral Distributed Interface Version: 0.6 -Release: 3 +Release: 4 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}0_%{version}.tar.bz2 Requires: libindi0 = %version @@ -47,7 +48,7 @@ Jasem Mutlaq <mutlaqja(a)ikarustech.com> %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: Instrument Neutral Distributed Interface Requires: libindi0 = %{version} glibc-devel @@ -68,7 +69,7 @@ Jasem Mutlaq <mutlaqja(a)ikarustech.com> %package -n libindi0 -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: Instrument Neutral Distributed Interface ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Thu Apr 1 16:09:54 CEST 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-03-08 18:13:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-04-01 16:09:20.397160000 +0200 @@ -1,0 +2,27 @@ +Fri Mar 26 19:05:07 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- +Tue Mar 23 12:17:23 UTC 2010 - llunak(a)novell.com + +- CVE-2010-0436 (bnc#584223) + +------------------------------------------------------------------- +Tue Mar 16 12:20:15 UTC 2010 - llunak(a)novell.com + +- include Aurorae theme docs in the kwin package + +------------------------------------------------------------------- +Mon Mar 15 15:23:28 UTC 2010 - llunak(a)novell.com + +- update kdm theme fixes for bnc#533189 + +------------------------------------------------------------------- +Fri Mar 5 17:18:04 UTC 2010 - llunak(a)novell.com + +- fix problems when fingerprint support is enabled (bnc#533189) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.4.1.tar.bz2 kdm-generic-same-pam.diff New: ---- bnc584223.diff kdebase-workspace-4.4.2.tar.bz2 kdm-fix-generic-greeter.diff kdm-fix-labelcolors.diff pam-translate.diff plasma-notifications-kill-timer.diff plasma-solid_hddtemp-no_timer.diff same-pam-generic-classic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.x1puFO/_old 2010-04-01 16:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.x1puFO/_new 2010-04-01 16:09:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.4.1) +# spec file for package kdebase4-wallpapers (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.x1puFO/_old 2010-04-01 16:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.x1puFO/_new 2010-04-01 16:09:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.4.1) +# spec file for package kdebase4-workspace (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -39,7 +39,7 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd @@ -60,7 +60,7 @@ Patch67: kdm-remove-duplicated-sessions.diff Patch68: kdm-make_it_cool.diff Patch69: kdm-all-users-nopass.diff -Patch70: kdm-generic-same-pam.diff +Patch70: same-pam-generic-classic.diff Patch71: kdm-kdmconf.diff # https://svn.kde.org/home/kde/trunk/playground/base/freespacenotifier Patch74: lowdiskspace.patch @@ -87,6 +87,12 @@ Patch111: plasma-new-default-panel.diff Patch112: plasma-obvious-configure.diff Patch115: plasma-dont-hide-jobs.diff +Patch123: kdm-fix-generic-greeter.diff +Patch124: kdm-fix-labelcolors.diff +Patch125: pam-translate.diff +Patch200: plasma-solid_hddtemp-no_timer.diff +Patch201: plasma-notifications-kill-timer.diff +Patch202: bnc584223.diff Requires: kde4-kgreeter-plugins = %version %kde4_runtime_requires %if %suse_version == 1110 @@ -116,7 +122,7 @@ Obsoletes: kde4-plasmoid-quicklauncher <= 0.4 Provides: PolicyKit-kde = 0.2.0 Obsoletes: PolicyKit-kde <= 0.2.0 -Obsoletes: PolicyKit-kde-lang <= 0.2.0 +Obsoletes: PolicyKit-kde-lang < 11.2 %description This package contains the basic packages for a K Desktop Environment @@ -153,7 +159,7 @@ %patch67 %patch68 %patch69 -%patch70 +%patch70 -p1 %patch71 %patch74 %patch77 @@ -182,6 +188,12 @@ #%patch112 ###KDE44: rediff! #%patch115 +%patch123 -p1 +%patch124 -p1 +%patch125 +%patch200 -p1 +%patch201 -p1 +%patch202 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build @@ -417,7 +429,7 @@ %files -n kwin -f filelists/kwin %defattr(-,root,root) -%doc COPYING COPYING.DOC README +%doc COPYING COPYING.DOC README kwin/clients/aurorae/theme-description %dir %_kde4_servicesdir/kwin %exclude %_kde4_appsdir/kwin/cubecap.png %exclude %_kde4_appsdir/kwin/titlebar_decor.png @@ -571,7 +583,7 @@ %doc %lang(en) %_kde4_htmldir/en/kmenuedit %doc %lang(en) %_kde4_htmldir/en/ksysguard %doc %lang(en) %_kde4_htmldir/en/kxkb -%doc %lang(en) %_kde4_htmldir/en/plasma +%doc %lang(en) %_kde4_htmldir/en/plasma-desktop %doc %lang(en) %_kde4_htmldir/en/systemsettings #/etc/systemsettingsrc %_kde4_modulesdir/fontthumbnail.so @@ -605,7 +617,7 @@ %_kde4_modulesdir/kded_khotkeys.so %_kde4_modulesdir/kded_networkstatus.so %_kde4_modulesdir/kfontviewpart.so -%_kde4_modulesdir/kgreet_*.so +#%_kde4_modulesdir/kgreet_*.so %_kde4_modulesdir/kio_fonts.so %_kde4_modulesdir/krunner_bookmarksrunner.so %_kde4_modulesdir/krunner_calculatorrunner.so ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.x1puFO/_old 2010-04-01 16:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.x1puFO/_new 2010-04-01 16:09:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.4.1) +# spec file for package python-kdebase4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ bnc584223.diff ++++++ diff --git a/kdm/ConfigureChecks.cmake b/kdm/ConfigureChecks.cmake index 36544a2..eab8df9 100644 --- a/kdm/ConfigureChecks.cmake +++ b/kdm/ConfigureChecks.cmake @@ -37,6 +37,35 @@ int main() } " HAVE_SETLOGIN) +check_c_source_runs(" +#include <sys/socket.h> +#include <sys/un.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <string.h> +#include <unistd.h> +#include <errno.h> +int main() +{ + int fd, fd2; + struct sockaddr_un sa; + + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) + return 2; + sa.sun_family = AF_UNIX; + strcpy(sa.sun_path, \"testsock\"); + unlink(sa.sun_path); + if (bind(fd, (struct sockaddr *)&sa, sizeof(sa))) + return 2; + chmod(sa.sun_path, 0); + setuid(getuid() + 1000); + if ((fd2 = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) + return 2; + connect(fd2, (struct sockaddr *)&sa, sizeof(sa)); + return errno != EACCES; +} +" HONORS_SOCKET_PERMS) + # for config-kdm.h check_function_exists(seteuid HAVE_SETEUID) diff --git a/kdm/backend/ctrl.c b/kdm/backend/ctrl.c index da35712..2b9c113 100644 --- a/kdm/backend/ctrl.c +++ b/kdm/backend/ctrl.c @@ -79,7 +79,25 @@ nukeSock( struct cmdsock *cs ) } +#ifdef HONORS_SOCKET_PERMS static CtrlRec ctrl = { 0, 0, -1, 0 }; +#else +static CtrlRec ctrl = { 0, 0, 0, -1, 0 }; + +static int mkTempDir( char *dir ) +{ + int i, l = strlen( dir ) - 6; + + for (i = 0; i < 100; i++) { + randomStr( dir + l ); + if (!mkdir( dir, 0700 )) + return True; + if (errno != EEXIST) + break; + } + return False; +} +#endif void openCtrl( struct display *d ) @@ -113,22 +131,50 @@ openCtrl( struct display *d ) if (strlen( cr->path ) >= sizeof(sa.sun_path)) logError( "path %\"s too long; control socket will not be available\n", cr->path ); - else if (mkdir( sockdir, 0755 ) && errno != EEXIST) +#ifdef HONORS_SOCKET_PERMS + else if (mkdir( sockdir, 0700 ) && errno != EEXIST) logError( "mkdir %\"s failed: %m; control socket will not be available\n", sockdir ); + else if (unlink( cr->path ) && errno != ENOENT) + logError( "unlink %\"s failed: %m; control socket will not be available\n", + cr->path ); else { - if (!d) - chown( sockdir, -1, fifoGroup ); +#else + else if (unlink( sockdir ) && errno != ENOENT) + logError( "unlink %\"s failed: %m; control socket will not be available\n", + sockdir ); + else if (!strApp( &cr->realdir, sockdir, "-XXXXXX", (char *)0)) + ; + else if (!mkTempDir( cr->realdir )) { + logError( "mkdir %\"s failed: %m; control socket will not be available\n", + cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; + } else if (symlink( cr->realdir, sockdir )) { + logError( "symlink %\"s => %\"s failed: %m; control socket will not be available\n", + sockdir, cr->realdir ); + rmdir( cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; + } else { + chown( sockdir, 0, d ? 0 : fifoGroup ); chmod( sockdir, 0750 ); +#endif if ((cr->fd = socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) logError( "Cannot create control socket: %m\n" ); else { - unlink( cr->path ); sa.sun_family = AF_UNIX; strcpy( sa.sun_path, cr->path ); if (!bind( cr->fd, (struct sockaddr *)&sa, sizeof(sa) )) { if (!listen( cr->fd, 5 )) { +#ifdef HONORS_SOCKET_PERMS + chmod( cr->path, 0660 ); + if (!d) + chown( cr->path, -1, fifoGroup ); + chmod( sockdir, 0755 ); +#else chmod( cr->path, 0666 ); +#endif registerCloseOnFork( cr->fd ); registerInput( cr->fd ); free( sockdir ); @@ -143,6 +189,14 @@ openCtrl( struct display *d ) close( cr->fd ); cr->fd = -1; } +#ifdef HONORS_SOCKET_PERMS + rmdir( sockdir ); +#else + unlink( sockdir ); + rmdir( cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; +#endif } free( cr->path ); cr->path = 0; @@ -163,7 +217,14 @@ closeCtrl( struct display *d ) cr->fd = -1; unlink( cr->path ); *strrchr( cr->path, '/' ) = 0; +#ifdef HONORS_SOCKET_PERMS rmdir( cr->path ); +#else + unlink( cr->path ); + rmdir( cr->realdir ); + free( cr->realdir ); + cr->realdir = 0; +#endif free( cr->path ); cr->path = 0; while (cr->css) { @@ -177,12 +238,12 @@ closeCtrl( struct display *d ) void chownCtrl( CtrlRec *cr, int uid ) { - if (cr->path) { - char *ptr = strrchr( cr->path, '/' ); - *ptr = 0; + if (cr->path) +#ifdef HONORS_SOCKET_PERMS chown( cr->path, uid, -1 ); - *ptr = '/'; - } +#else + chown( cr->realdir, uid, -1 ); +#endif } void diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h index 42d6a13..0696e2e 100644 --- a/kdm/backend/dm.h +++ b/kdm/backend/dm.h @@ -232,6 +232,9 @@ typedef struct { struct cmdsock *css; /* open connections */ char *path; /* filename of the socket */ +#ifndef HONORS_SOCKET_PERMS + char *realdir; /* real dirname of the socket */ +#endif int fd; /* fd of the socket */ int gid; /* owner group of the socket */ } CtrlRec; diff --git a/kdm/config-kdm.h.cmake b/kdm/config-kdm.h.cmake index a9bcce1..3e8912d 100644 --- a/kdm/config-kdm.h.cmake +++ b/kdm/config-kdm.h.cmake @@ -129,6 +129,9 @@ /* Define to 1 if the ck-connector library is found */ #cmakedefine HAVE_CKCONNECTOR 1 +/* Define to 1 if OS honors permission bits on socket inodes */ +#cmakedefine HONORS_SOCKET_PERMS 1 + /* $PATH defaults set by KDM */ #cmakedefine KDM_DEF_USER_PATH "${KDM_DEF_USER_PATH}" #cmakedefine KDM_DEF_SYSTEM_PATH "${KDM_DEF_SYSTEM_PATH}" -- 1.6.6.20.g9bfff ++++++ kdebase-workspace-4.4.1.tar.bz2 -> kdebase-workspace-4.4.2.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.4.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.4.2.tar.bz2 differ: char 11, line 1 ++++++ kdm-fix-generic-greeter.diff ++++++ Subject: Fix broken KDM layout with fingerprint support From: Lubos Lunak Patch-upstream: not yet Bug: bnc#533189 Relates: kdm-fix-labelcolors.diff, same-pam-generic-classic.diff --- workspace/kdm/kfrontend/kgreeter.cpp.sav 2010-03-11 13:59:41.000000000 +0100 +++ workspace/kdm/kfrontend/kgreeter.cpp 2010-03-15 15:45:39.000000000 +0100 @@ -915,8 +915,6 @@ KThemedGreeter::KThemedGreeter( KdmTheme timed_label = themer->findNode( "timed-label" ); KdmItem *itm; - if ((itm = themer->findNode( "pam-message" ))) // done via msgboxes - itm->setVisible( false ); if ((itm = themer->findNode( "language_button" ))) // not implemented yet itm->setVisible( false ); --- workspace/kdm/kfrontend/themes/greeter.dtd.sav 2010-03-11 13:59:41.000000000 +0100 +++ workspace/kdm/kfrontend/themes/greeter.dtd 2010-03-15 15:57:51.000000000 +0100 @@ -19,9 +19,9 @@ Items with these IDs get special treatme caps-lock-warning | xauth-warning | pam-error | timed-label | login_button | session_button | system_button Items with these IDs might get special treatment by conversation plugins: - talker | domain-entry | user-entry | pw-entry + talker | domain-entry | user-entry | pw-entry | pam-message | pam-prompt | user-pw-entry Items with these IDs are always hidden: - pam-message | language_button + language_button --> <!ATTLIST item --- workspace/libs/kdm/kgreet_generic.cpp.sav 2010-03-11 13:59:40.000000000 +0100 +++ workspace/libs/kdm/kgreet_generic.cpp 2010-03-15 16:20:56.000000000 +0100 @@ -41,24 +41,14 @@ extern KDE_EXPORT KGreeterPluginInfo kgr static int echoMode; -class KDMPasswordEdit : public KLineEdit { -public: - KDMPasswordEdit( QWidget *parent = 0 ) : KLineEdit( parent ) - { - if (::echoMode == -1) - setPasswordMode( true ); - else - setEchoMode( ::echoMode ? Password : NoEcho ); - setContextMenuPolicy( Qt::NoContextMenu ); - } -}; - KGenericGreeter::KGenericGreeter( KGreeterPluginHandler *_handler, QWidget *parent, const QString &_fixedEntity, Function _func, Context _ctx ) : QObject(), KGreeterPlugin( _handler ), + m_label( 0 ), + m_messageLabel( 0 ), m_lineEdit( 0 ), fixedUser( _fixedEntity ), func( _func ), @@ -66,22 +56,55 @@ KGenericGreeter::KGenericGreeter( KGreet exp( -1 ), running( false ) { - m_parentWidget = new QWidget( parent ); - m_parentWidget->setObjectName( "talker" ); - // XXX set some minimal size - widgetList << m_parentWidget; - m_grid = new QGridLayout( m_parentWidget ); - m_grid->setMargin( 0 ); + QGridLayout *grid = 0; + if (!_handler->gplugHasNode( "pam-prompt" ) || + !_handler->gplugHasNode( "user-pw-entry" ) || + !_handler->gplugHasNode( "pam-message" )) { + parent = new QWidget( parent ); + parent->setObjectName( "talker" ); + widgetList << parent; + grid = new QGridLayout( parent ); + grid->setMargin( 0 ); + } if (ctx == ExUnlock || ctx == ExChangeTok) fixedUser = KUser().loginName(); + + m_label = new QLabel( parent ); + if( grid ) { + m_label->setMinimumWidth( + m_label->fontMetrics().width( "A username" ) ); + grid->addWidget( m_label, 0, 0 ); + } else { + m_label->setObjectName( "pam-prompt" ); + widgetList << m_label; + } + m_lineEdit = new KLineEdit( parent ); + m_label->setBuddy( m_lineEdit ); + if( grid ) { + m_lineEdit->setMinimumWidth( + m_lineEdit->fontMetrics().width( "This is a long password" ) ); + grid->addWidget( m_lineEdit, 0, 1 ); + } else { + m_lineEdit->setObjectName( "user-pw-entry" ); + widgetList << m_lineEdit; + } + m_messageLabel = new QLabel( parent ); + if( grid ) { + m_messageLabel->setMinimumWidth( + m_messageLabel->fontMetrics().width( "Information text" ) ); + grid->addWidget( m_messageLabel, 1, 0 ); + } else { + m_messageLabel->setObjectName( "pam-message" ); + widgetList << m_messageLabel; + } } // virtual KGenericGreeter::~KGenericGreeter() { abort(); - delete m_parentWidget; + qDeleteAll( widgetList ); } void // virtual @@ -127,8 +150,7 @@ KGenericGreeter::setEnabled( bool enable { // assert( func == Authenticate && ctx == Shutdown ); // XXX this is likely to bear some bogosity - foreach (QWidget *w, m_children) - w->setEnabled( enable ); + m_lineEdit->setEnabled( enable ); if (enable && m_lineEdit) m_lineEdit->setFocus(); } @@ -143,9 +165,7 @@ KGenericGreeter::textMessage( const char revive(); QString qtext = QString::fromUtf8( text ); m_infoMsgs.append( qtext ); - QLabel *label = new QLabel( qtext, m_parentWidget ); - m_grid->addWidget( label, m_line++, 0, 1, 2 ); - m_children.append( label ); + m_messageLabel->setText( m_infoMsgs.join( "\n" )); return true; } @@ -168,15 +188,19 @@ KGenericGreeter::textPrompt( const char revive(); else m_infoMsgs.clear(); - - QLabel *label = new QLabel( QString::fromUtf8( prompt ).trimmed() ); - m_grid->addWidget( label, m_line, 0 ); - m_children.append( label ); m_echo = echo; + + m_label->setText( QString::fromUtf8( prompt ).trimmed()); + m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); + m_lineEdit->setCompletionObject( 0 ); + m_lineEdit->disconnect( this ); + m_lineEdit->clear(); + m_lineEdit->setPasswordMode( false ); + m_lineEdit->setEchoMode( QLineEdit::Normal ); if (echo) { - m_lineEdit = new KLineEdit; - m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); if (!exp) { + if (m_label->text().isEmpty()) + m_label->setText( i18n("&Username:")); if (!m_users.isEmpty()) { KCompletion *userNamesCompletion = new KCompletion; userNamesCompletion->setItems( m_users ); @@ -187,20 +211,18 @@ KGenericGreeter::textPrompt( const char if (!curUser.isEmpty()) { m_lineEdit->setText( curUser ); m_lineEdit->selectAll(); - connect( m_lineEdit, SIGNAL(selectionChanged()), SLOT(slotChanged()) ); } connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotLoginLostFocus()) ); } connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged()) ); connect( m_lineEdit, SIGNAL(textChanged( const QString & )), SLOT(slotChanged()) ); } else { - m_lineEdit = new KDMPasswordEdit; + if (::echoMode == -1) + m_lineEdit->setPasswordMode( true ); + else + m_lineEdit->setEchoMode( ::echoMode ? QLineEdit::Password : QLineEdit::NoEcho ); + connect( m_lineEdit, SIGNAL(editingFinished()), SLOT(slotChanged()) ); } - m_lineEdit->setMinimumWidth( - m_lineEdit->fontMetrics().width( "This is a long password" ) ); - m_grid->addWidget( m_lineEdit, m_line, 1 ); - m_children.append( m_lineEdit ); - m_lineEdit->show(); m_lineEdit->setFocus(); } @@ -235,7 +257,6 @@ KGenericGreeter::next() if (m_lineEdit) { m_lineEdit->setEnabled( false ); QString text = m_lineEdit->text(); - m_lineEdit = 0; handler->gplugReturnText( text.toLocal8Bit(), !m_echo ? KGreeterPluginHandler::IsSecret : @@ -272,8 +293,7 @@ KGenericGreeter::failed() revive(); handler->gplugMsgBox( QMessageBox::Information, text ); } else { - foreach (QWidget *w, m_children) - w->setEnabled( false ); + m_lineEdit->setEnabled( false ); } exp = -1; running = false; @@ -283,12 +303,9 @@ void // virtual KGenericGreeter::revive() { // assert( !running ); - foreach (QWidget *w, m_children) - w->deleteLater(); - m_children.clear(); m_infoMsgs.clear(); - m_lineEdit = 0; - m_line = 0; + m_lineEdit->clear(); + m_lineEdit->setEnabled( true ); } void // virtual --- workspace/libs/kdm/kgreet_generic.h.sav 2010-03-11 13:59:40.000000000 +0100 +++ workspace/libs/kdm/kgreet_generic.h 2010-03-15 16:02:30.000000000 +0100 @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fi #include <QObject> -class QGridLayout; class QWidget; class KLineEdit; @@ -68,11 +67,11 @@ class KGenericGreeter : public QObject, void slotChanged(); private: - QGridLayout *m_grid; QList<QWidget *> m_children; + QLabel *m_label; + QLabel *m_messageLabel; KLineEdit *m_lineEdit; - QWidget *m_parentWidget; - QList<QString> m_infoMsgs; + QStringList m_infoMsgs; QString fixedUser, curUser; QStringList m_users; Function func; --- workspace/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml.sav 2010-03-09 11:52:01.000000000 +0100 +++ workspace/kdm/kfrontend/themes/oxygen-air/oxygen-air.xml 2010-03-15 15:57:08.000000000 +0100 @@ -27,11 +27,12 @@ <stock type="welcome-label"/> </item> - <item type="rect" id="user-field"> + <item type="rect" id="talker"> <pos anchor="c" x="50%" y="43%" width="400" height="144"/> <box orientation="vertical" spacing="0" homogeneous="true"> - <item type="pixmap" butoon="true"> + <item type="pixmap" button="true"> + <show type="!plugin-specific-generic"/> <normal file="user-entry.png"/> <prelight file="user-entry-li.png"/> <active file="user-entry-li.png"/> @@ -39,18 +40,38 @@ </item> <item type="entry" id="user-entry"> + <show type="!plugin-specific-generic"/> <pos anchor="c" x="52%" y="0%" width="110" height="22"/> </item> <item type="pixmap"> + <show type="!plugin-specific-generic"/> <normal file="pw-entry.png"/> <prelight file="pw-entry-li.png"/> <pos anchor="c" x="50%" y="100%"/> </item> <item type="entry" id="pw-entry"> + <show type="!plugin-specific-generic"/> <pos anchor="c" x="52%" y="0%" width="110" height="22"/> </item> + + <item type="label" id="pam-message"> + <show type="plugin-specific-generic"/> + <pos anchor="n" x="50%" y="60%" width="90%" height="30%"/> + <text> </text> + </item> + + <item type="label" id="pam-prompt"> + <show type="plugin-specific-generic"/> + <pos anchor="n" x="50%" y="30%" width="90%" height="22"/> + <text> </text> + </item> + + <item type="entry" id="user-pw-entry"> + <show type="plugin-specific-generic"/> + <pos anchor="c" x="50%" y="30%" width="90%" height="22"/> + </item> </box> </item> ++++++ kdm-fix-labelcolors.diff ++++++ Subject: Fix broken KDM layout with fingerprint support From: Lubos Lunak Patch-upstream: yes Bug: bnc#533189 Relates: kdm-fix-generic-greeter.diff, same-pam-generic-classic.diff --- workspace/kdm/kfrontend/themer/kdmlabel.h.sav 2009-12-17 19:55:47.000000000 +0100 +++ workspace/kdm/kfrontend/themer/kdmlabel.h 2010-02-23 14:08:46.493126179 +0100 @@ -61,6 +61,8 @@ protected: virtual void doPlugActions( bool plug ); + virtual void updatePalette( QWidget *w ); + struct LabelStruct { QString text; bool isTimer; --- workspace/kdm/kfrontend/themer/kdmitem.cpp.sav 2009-12-17 19:55:47.000000000 +0100 +++ workspace/kdm/kfrontend/themer/kdmitem.cpp 2010-02-23 14:54:51.423875416 +0100 @@ -240,9 +240,9 @@ void KdmItem::setWidgetAttribs( QWidget *widget ) { widget->setPalette( style.palette ); + ::setWidgetAttribs( widget, style, style.frame ); widget->installEventFilter( this ); updatePalette( myWidget ); - ::setWidgetAttribs( widget, style, style.frame ); } void --- workspace/kdm/kfrontend/themer/kdmitem.h.sav 2009-12-17 19:55:47.000000000 +0100 +++ workspace/kdm/kfrontend/themer/kdmitem.h 2010-02-23 14:08:00.428124930 +0100 @@ -199,7 +199,7 @@ protected: bool eventFilter( QObject *o, QEvent *e ); void setWidgetAttribs( QWidget * ); - void updatePalette( QWidget *w ); + virtual void updatePalette( QWidget *w ); void updateThisVisible(); --- workspace/kdm/kfrontend/themer/kdmlabel.cpp.sav 2010-02-23 13:58:17.000000000 +0100 +++ workspace/kdm/kfrontend/themer/kdmlabel.cpp 2010-02-23 15:57:27.457125094 +0100 @@ -219,6 +219,8 @@ KdmLabel::statusChanged( bool descend ) if ((state == Sprelight && !label.prelight.present) || (state == Sactive && !label.active.present)) return; + if( myWidget ) + updatePalette( myWidget ); needUpdate(); } @@ -336,4 +338,19 @@ KdmLabel::lookupText( const QString &t ) return text; } +void +KdmLabel::updatePalette( QWidget *w ) +{ + struct LabelStruct::LabelClass *l = &label.normal; + if (state == Sactive && label.active.present) + l = &label.active; + else if (state == Sprelight && label.prelight.present) + l = &label.prelight; + w->setFont( l->font.font ); + QPalette p = w->palette(); + p.setColor( QPalette::WindowText, l->color ); + w->setPalette( p ); + KdmItem::updatePalette( w ); +} + #include "kdmlabel.moc" ++++++ pam-translate.diff ++++++ Subject: Translate messages from PAM From: Lubos Lunak Patch-upstream: not yet Bug: bnc#533189 --- libs/kdm/kgreet_generic.cpp.sav 2010-03-09 11:52:17.000000000 +0100 +++ libs/kdm/kgreet_generic.cpp 2010-03-09 15:04:49.000000000 +0100 @@ -163,7 +163,9 @@ KGenericGreeter::textMessage( const char if (m_infoMsgs.isEmpty()) revive(); - QString qtext = QString::fromUtf8( text ); + // PAM does not translate these + //(void) I18N_NOOP(""); + QString qtext = i18n( text ); m_infoMsgs.append( qtext ); m_messageLabel->setText( m_infoMsgs.join( "\n" )); @@ -191,7 +193,10 @@ KGenericGreeter::textPrompt( const char m_infoMsgs.clear(); m_echo = echo; - m_label->setText( QString::fromUtf8( prompt ).trimmed()); + // PAM does not translate these + ( void ) I18N_NOOP( "Password: " ); + ( void ) I18N_NOOP( "Password or swipe finger: " ); + m_label->setText( i18n( prompt ).trimmed()); m_lineEdit->setContextMenuPolicy( Qt::NoContextMenu ); m_lineEdit->setCompletionObject( 0 ); m_lineEdit->disconnect( this ); ++++++ plasma-notifications-kill-timer.diff ++++++ diff --git a/plasma/generic/dataengines/notifications/notificationsengine.cpp b/plasma/generic/dataengines/notifications/notificationsengine.cpp index 898b4f6..b75f2bd 100644 --- a/plasma/generic/dataengines/notifications/notificationsengine.cpp +++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp @@ -206,10 +206,12 @@ uint NotificationsEngine::Notify(const Q void NotificationsEngine::timerEvent(QTimerEvent *event) { + // qDebug() << "Timer: " << event->timerId(); const QString source = m_timeouts.value(event->timerId()); if (!source.isEmpty()) { m_sourceTimers.remove(source); m_timeouts.remove(event->timerId()); + killTimer(event->timerId()); removeSource(source); emit NotificationClosed(source.split(" ").last().toInt(), 1); return; ++++++ plasma-solid_hddtemp-no_timer.diff ++++++ diff --git a/plasma/generic/dataengines/soliddevice/hddtemp.cpp b/plasma/generic/dataengines/soliddevice/hddtemp.cpp index 9b74ac5..567137e 100644 --- a/plasma/generic/dataengines/soliddevice/hddtemp.cpp +++ b/plasma/generic/dataengines/soliddevice/hddtemp.cpp @@ -21,30 +21,39 @@ #include <QTcpSocket> +#include <QTimerEvent> + #include <KDebug> HddTemp::HddTemp(QObject* parent) : QObject(parent), m_failCount(0), - m_timer(0) + m_cacheValid(false) { updateData(); - m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), this, SLOT(updateData())); - m_timer->start(10000); } HddTemp::~HddTemp() { } -QStringList HddTemp::sources() const +QStringList HddTemp::sources() { + updateData(); return m_data.keys(); } +void HddTemp::timerEvent(QTimerEvent *event) +{ + killTimer(event->timerId()); + m_cacheValid = false; +} + bool HddTemp::updateData() { + if (m_cacheValid) { + return true; + } if (m_failCount > 4) { return false; } @@ -80,6 +89,9 @@ bool HddTemp::updateData() m_data[list[i]].append(list[i + 3]); i += 5; } + m_cacheValid = true; + startTimer(0); + return true; } diff --git a/plasma/generic/dataengines/soliddevice/hddtemp.h b/plasma/generic/dataengines/soliddevice/hddtemp.h index d03d59b..ea372ea 100644 --- a/plasma/generic/dataengines/soliddevice/hddtemp.h +++ b/plasma/generic/dataengines/soliddevice/hddtemp.h @@ -37,16 +37,17 @@ class HddTemp : public QObject HddTemp(QObject *parent=0); ~HddTemp(); - QStringList sources() const; + QStringList sources(); QVariant data(const QString source, const DataType type) const; - private Q_SLOTS: - bool updateData(); - + protected: + void timerEvent(QTimerEvent *event); + private: int m_failCount; + bool m_cacheValid; QMap<QString, QList<QVariant> > m_data; - QTimer *m_timer; + bool updateData(); }; ++++++ same-pam-generic-classic.diff ++++++ Subject: Use same PAM for generic greeter From: Dirk Mueller, Lubos Lunak Patch-upstream: no Bug: ? This patch makes KDM and screen lock use the same PAM for classic and generic authentication plugins. It also does some modifications that make it possible to preselect a user even with generic plugin, although I(=Lubos) am not completely sure about what exactly those parts do. --- workspace/kdm/backend/client.c.sav 2010-03-09 11:10:47.000000000 +0100 +++ workspace/kdm/backend/client.c 2010-03-09 11:52:35.000000000 +0100 @@ -537,7 +537,8 @@ verify( GConvFunc gconv, int rootok ) #ifdef USE_PAM pnopass = False; - if (!strcmp( curtype, "classic" )) { + pdata.usecur = False; + if (!strcmp( curtype, "classic" ) || !strcmp( curtype, "generic" )) { if (!gconv( GCONV_USER, 0 )) return False; if (isNoPassAllowed( curuser )) { @@ -550,11 +551,11 @@ verify( GConvFunc gconv, int rootok ) psrv = PAMService; } else psrv = PAMService; - pdata.usecur = True; + if (!strcmp( curtype, "classic")) + pdata.usecur = True; } else { sprintf( psrvb, "%.31s-%.31s", PAMService, curtype ); psrv = psrvb; - pdata.usecur = False; } pdata.gconv = gconv; if (!doPAMAuth( psrv, &pdata )) --- workspace/kcheckpass/checkpass_pam.c.sav 2010-03-09 11:10:47.000000000 +0100 +++ workspace/kcheckpass/checkpass_pam.c 2010-03-09 11:52:35.000000000 +0100 @@ -140,12 +140,14 @@ AuthReturn Authenticate(const char *call openlog("kcheckpass", LOG_PID, LOG_AUTH); PAM_data.conv = conv; - if (strcmp(method, "classic")) { - sprintf(pservb, "%.31s-%.31s", caller, method); - pam_service = pservb; - } else { + if (strcmp(method, "classic") == 0) { /* PAM_data.classic = 1; */ pam_service = caller; + } else if (strcmp(method, "generic") == 0) { + pam_service = caller; + } else { + sprintf(pservb, "%.31s-%.31s", caller, method); + pam_service = pservb; } pam_error = pam_start(pam_service, user, &PAM_conversation, &pamh); if (pam_error != PAM_SUCCESS) --- workspace/libs/kdm/kgreet_generic.cpp.sav 2010-03-09 11:52:17.000000000 +0100 +++ workspace/libs/kdm/kgreet_generic.cpp 2010-03-09 11:53:26.000000000 +0100 @@ -156,6 +156,7 @@ KGenericGreeter::textPrompt( const char exp = exp >= 0 || func != Authenticate || + !echo || !(kgreeterplugin_info.flags & KGreeterPluginInfo::Presettable); if (!exp && !fixedUser.isEmpty()) { @@ -325,7 +326,7 @@ static bool init( const QString &, echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt(); // Fielded entities are not supported per se. // This implies that the first field is the presettable entity, if any. - if (getConf( ctx, "generic.Presettable", QVariant( false ) ).toBool()) +// if (getConf( ctx, "generic.Presettable", QVariant( false ) ).toBool()) kgreeterplugin_info.flags |= KGreeterPluginInfo::Presettable; KGlobal::locale()->insertCatalog( "kgreet_generic" ); return true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Thu Apr 1 16:09:53 CEST 2010. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2010-02-26 20:54:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2010-03-26 19:19:19.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:19:13 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.4.1.tar.bz2 New: ---- kdegraphics-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.YB9HzC/_old 2010-04-01 16:09:44.000000000 +0200 +++ /var/tmp/diff_new_pack.YB9HzC/_new 2010-04-01 16:09:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.4.1) +# spec file for package kdegraphics4 (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdegraphics-%version.tar.bz2 Patch0: 4_4_BRANCH.diff ++++++ kdegraphics-4.4.1.tar.bz2 -> kdegraphics-4.4.2.tar.bz2 ++++++ ++++ 7015 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Thu Apr 1 16:09:19 CEST 2010. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2010-02-26 20:49:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2010-03-26 19:04:50.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 26 19:04:45 CET 2010 - dmueller(a)suse.de + +- update to 4.4.2 + * bugfixes over 4.4.1 + * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-runtime-4.4.1.tar.bz2 New: ---- kdebase-runtime-4.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.vhwOx5/_old 2010-04-01 16:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.vhwOx5/_new 2010-04-01 16:09:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.4.1) +# spec file for package kdebase4-runtime (Version 4.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.4.1 +Version: 4.4.2 Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu ++++++ 4_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.vhwOx5/_old 2010-04-01 16:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.vhwOx5/_new 2010-04-01 16:09:13.000000000 +0200 @@ -1,7 +1,7 @@ -package: kdebase-runtime-4.4.0.tar.bz2 +package: kdebase-runtime-4.4.1.tar.bz2 kdemod: kdebase/runtime --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1091745 -+svn di between //tags/KDE/4.4.0/kdebase/runtime and //branches/KDE/4.4/kdebase/runtime ++current HEAD: 1101856 ++svn di between //tags/KDE/4.4.1/kdebase/runtime and //branches/KDE/4.4/kdebase/runtime ++++++ kdebase-runtime-4.4.1.tar.bz2 -> kdebase-runtime-4.4.2.tar.bz2 ++++++ KDE/kdebase4-runtime/kdebase-runtime-4.4.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-4.4.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage for openSUSE:Factory
by root＠Hilbert.suse.de 01 Apr '10

01 Apr '10

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Thu Apr 1 16:09:11 CEST 2010. -------- --- yast2-storage/yast2-storage.changes 2010-03-19 15:42:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2010-04-01 14:14:27.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Mar 29 16:08:36 CEST 2010 - aschnell(a)suse.de + +- enable XFS on S390 (bnc #591846) +- 2.19.10 + +------------------------------------------------------------------- +Fri Mar 26 12:37:28 CET 2010 - aschnell(a)suse.de + +- increased size of boot partition to 200MB for various PPC + platforms (bnc #587777) + +------------------------------------------------------------------- +Thu Mar 25 18:24:35 CET 2010 - fehr(a)suse.de + +- fix problems with detection of data on newly unlocked encrypted + volumes (bnc #581341) + +------------------------------------------------------------------- +Wed Mar 24 11:37:57 CET 2010 - fehr(a)suse.de + +- do not use default swap mounts in AutoYaST + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.19.9.tar.bz2 New: ---- yast2-storage-2.19.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.KrAbgQ/_old 2010-04-01 16:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.KrAbgQ/_new 2010-04-01 16:08:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.19.9) +# spec file for package yast2-storage (Version 2.19.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-storage -Version: 2.19.9 +Version: 2.19.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.19.9.tar.bz2 +Source0: yast2-storage-2.19.10.tar.bz2 Prefix: /usr @@ -31,7 +31,7 @@ License: GPLv2+ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.12 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.13 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0 Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 @@ -55,7 +55,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.19.9 +%setup -n yast2-storage-2.19.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-storage-2.19.9.tar.bz2 -> yast2-storage-2.19.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/VERSION new/yast2-storage-2.19.10/VERSION --- old/yast2-storage-2.19.9/VERSION 2010-03-19 15:37:55.000000000 +0100 +++ new/yast2-storage-2.19.10/VERSION 2010-04-01 14:09:01.000000000 +0200 @@ -1 +1 @@ -2.19.9 +2.19.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/configure new/yast2-storage-2.19.10/configure --- old/yast2-storage-2.19.9/configure 2010-03-19 15:40:36.000000000 +0100 +++ new/yast2-storage-2.19.10/configure 2010-04-01 14:10:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.9. +# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.19.9' -PACKAGE_STRING='yast2-storage 2.19.9' +PACKAGE_VERSION='2.19.10' +PACKAGE_STRING='yast2-storage 2.19.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1537,7 +1537,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-storage 2.19.9 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.19.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1608,7 +1608,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.19.9:";; + short | recursive ) echo "Configuration of yast2-storage 2.19.10:";; esac cat <<\_ACEOF @@ -1720,7 +1720,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.19.9 +yast2-storage configure 2.19.10 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1734,7 +1734,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-storage $as_me 2.19.9, which was +It was created by yast2-storage $as_me 2.19.10, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2714,7 +2714,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.19.9' + VERSION='2.19.10' cat >>confdefs.h <<_ACEOF @@ -2836,7 +2836,7 @@ -VERSION="2.19.9" +VERSION="2.19.10" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" @@ -17373,7 +17373,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.19.9, which was +This file was extended by yast2-storage $as_me 2.19.10, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17436,7 +17436,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-storage config.status 2.19.9 +yast2-storage config.status 2.19.10 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/configure.in new/yast2-storage-2.19.10/configure.in --- old/yast2-storage-2.19.9/configure.in 2010-03-19 15:40:28.000000000 +0100 +++ new/yast2-storage-2.19.10/configure.in 2010-04-01 14:10:33.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.19.9, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.19.10, http://bugs.opensuse.org/, yast2-storage) 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.19.9" +VERSION="2.19.10" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/storage/src/inst_target_selection.ycp new/yast2-storage-2.19.10/storage/src/inst_target_selection.ycp --- old/yast2-storage-2.19.9/storage/src/inst_target_selection.ycp 2010-03-18 15:30:00.000000000 +0100 +++ new/yast2-storage-2.19.10/storage/src/inst_target_selection.ycp 2010-03-23 11:40:50.000000000 +0100 @@ -12,7 +12,7 @@ * "target_is":<devicename> (key to "targets" map) * if custom, set "target_is":"CUSTOM" * - * $Id: inst_target_selection.ycp 61385 2010-03-18 14:06:54Z aschnell $ + * $Id: inst_target_selection.ycp 61451 2010-03-23 10:40:49Z aschnell $ */ { textdomain "storage"; @@ -56,14 +56,12 @@ boolean custom_val = (Storage::GetPartMode() == "CUSTOM"); y2milestone( "custom_val %1", custom_val ); - if( size(targetMap) > 0) + if (!isempty(targetMap)) { // loop over targetMap and build radio buttons for selection // dont use foreach here since we need a counter (as a shortcut) // anyway - term buttonbox = `VBox(); - map<string, map> usable_target_map = filter(string d, map e, targetMap, { return Storage::IsPartitionable(e) && !contains([ `UB_DMRAID, `UB_DMMULTIPATH, `UB_MDPART ], e["used_by_type"]:`UB_NONE); @@ -72,18 +70,18 @@ integer dskcnt = size(usable_target_map); y2milestone("dskcnt:%1", dskcnt); + term buttonbox = `VBox(); + if (dskcnt >= 10) { - integer i = 1; list<term> disklist = []; foreach(string tname, map tdata, usable_target_map, { string tlinename = tdata["proposal_name"]:tdata["device"]:"?"; - string tline = sformat("%1: %2", i, tlinename); + string tline = sformat("%1", tlinename); disklist = add(disklist, `item(`id(tname), tline)); - i = i + 1; }); - buttonbox = add(buttonbox, `SelectionBox(`id(`disklist), `opt(`notify), - _("Available &Disks"), disklist)); + buttonbox = add(buttonbox, `MinWidth(40, `SelectionBox(`id(`disklist), `opt(`notify), + _("Available &Disks"), disklist))); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/storage/src/modules/FileSystems.ycp new/yast2-storage-2.19.10/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.19.9/storage/src/modules/FileSystems.ycp 2010-03-16 15:03:23.000000000 +0100 +++ new/yast2-storage-2.19.10/storage/src/modules/FileSystems.ycp 2010-03-29 16:12:57.000000000 +0200 @@ -8,7 +8,7 @@ * These module contains the supported filesystems and their settings. * * - * $Id: FileSystems.ycp 61335 2010-03-16 14:03:23Z aschnell $ + * $Id: FileSystems.ycp 61525 2010-03-29 14:12:57Z aschnell $ */ { module "FileSystems"; @@ -909,7 +909,6 @@ } if( Arch::s390() ) { - support[`xfs] = false; support[`vfat] = false; } if( Arch::ia64() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/storage/src/modules/Partitions.ycp new/yast2-storage-2.19.10/storage/src/modules/Partitions.ycp --- old/yast2-storage-2.19.9/storage/src/modules/Partitions.ycp 2010-01-29 14:31:34.000000000 +0100 +++ new/yast2-storage-2.19.10/storage/src/modules/Partitions.ycp 2010-03-26 12:41:55.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: Provides information about partitions * - * $Id: Partitions.ycp 60122 2009-12-16 12:58:52Z aschnell $ + * $Id: Partitions.ycp 61512 2010-03-26 11:41:53Z aschnell $ */ { module "Partitions"; @@ -194,15 +194,15 @@ } else if( Arch::board_chrp() ) { - minimal_needed_bootsize = 16*1024*1024; + minimal_needed_bootsize = 200*1024*1024; } else if( Arch::board_prep() ) { - minimal_needed_bootsize = 5*1024*1024; + minimal_needed_bootsize = 200*1024*1024; } else if( Arch::board_iseries() ) { - minimal_needed_bootsize = 8*1024*1024; + minimal_needed_bootsize = 200*1024*1024; } else if( Arch::board_mac() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/storage/src/modules/Storage.ycp new/yast2-storage-2.19.10/storage/src/modules/Storage.ycp --- old/yast2-storage-2.19.9/storage/src/modules/Storage.ycp 2010-03-19 11:58:22.000000000 +0100 +++ new/yast2-storage-2.19.10/storage/src/modules/Storage.ycp 2010-03-29 16:12:39.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 61401 2010-03-19 10:58:12Z aschnell $ + * $Id: Storage.ycp 61499 2010-03-25 17:26:38Z fehr $ */ { module "Storage"; @@ -3190,10 +3190,14 @@ search( diskdev, "/dev/evms" )!=0 ) || (contains( swaps, part["device"]:"" ))) { + y2milestone( "AddSwapMp %1", part ); boolean ok = true; if( !contains( swaps, part["device"]:"" )) { - ok = CheckSwapable( part["device"]:"" ); + string dev = part["device"]:""; + if( !isempty(part["crypt_device"]:"")) + dev = part["crypt_device"]:""; + ok = CheckSwapable( dev ); y2milestone( "AddSwapMp initial ok:%1", ok ); } if( ok ) @@ -3434,10 +3438,10 @@ ``(p["enc_type"]:`none==`luks )); in_cr = (list<map>)merge( in_cr, filter( map p, tmp, - ``(size(p["crypt_device"]:"")==0))); + ``(isempty(p["crypt_device"]:"")))); ac_cr = (list<map>)merge( ac_cr, filter( map p, tmp, - ``(size(p["crypt_device"]:"")>0))); + ``(!isempty(p["crypt_device"]:"")))); }); y2milestone( "GetCryptLists inactive:%1", in_cr ); y2milestone( "GetCryptLists active:%1", ac_cr ); @@ -3452,6 +3456,7 @@ { map crvol = GetCryptLists( target ); boolean ret = true; + boolean rescan_done = false; // text in help field string helptext = _( "Enter encryption password for any of the @@ -3510,10 +3515,17 @@ crvol["inactive"] = filter( string s, crvol["inactive"]:[], ``(!contains(rl,s))); RescanCrypted(); + rescan_done = true; } } } } + if( rescan_done ) + { + StorageMap[targets_key] = target; + UpdateTargetMap(); + target = StorageMap[targets_key]:$[]; + } return( target ); } @@ -3691,7 +3703,7 @@ if (Stage::initial()) { tmp = AddProposalName(tmp); - AskCryptPasswords( tmp ); + tmp = AskCryptPasswords( tmp ); } StorageMap[targets_key] = tmp; } @@ -3700,8 +3712,11 @@ { tmp = StorageMap[targets_key]:$[]; SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_i"), tmp ); - y2milestone ("AddSwapMp" ); - tmp = AddSwapMp( tmp ); + if( !Mode::autoinst() ) + { + y2milestone ("AddSwapMp" ); + tmp = AddSwapMp( tmp ); + } CreateTargetBackup( "initial" ); if( (Stage::initial() || Mode::repair()) && !Mode::autoinst() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.9/storage/src/modules/StorageFields.ycp new/yast2-storage-2.19.10/storage/src/modules/StorageFields.ycp --- old/yast2-storage-2.19.9/storage/src/modules/StorageFields.ycp 2010-01-11 11:14:07.000000000 +0100 +++ new/yast2-storage-2.19.10/storage/src/modules/StorageFields.ycp 2010-03-20 14:20:21.000000000 +0100 @@ -73,7 +73,7 @@ return "DM Multipath " + device; case `UB_MD: case `UB_MDPART: - return "RAID " + device; + return "MD RAID " + device; default: return device; } @@ -518,7 +518,7 @@ } else if (disk["type"]:`CT_UNKNOWN == `CT_MDPART) { - value = "MD " + disk["name"]:""; + value = "MD RAID " + disk["name"]:""; } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0