Hello community, here is the log from the commit of package kdemultimedia4 checked in at Mon Nov 3 18:13:14 CET 2008. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2008-09-25 18:59:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-10-31 11:12:26.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 31 11:12:28 CET 2008 - dmueller@suse.de + +- update to 4.1.3 + * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdemultimedia-4.1.2.tar.bz2 New: ---- kdemultimedia-4.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.b15722/_old 2008-11-03 18:12:58.000000000 +0100 +++ /var/tmp/diff_new_pack.b15722/_new 2008-11-03 18:12:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 4.1.2) +# spec file for package kdemultimedia4 (Version 4.1.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.1.2 +Version: 4.1.3 Release: 1 Source0: kdemultimedia-%version.tar.bz2 Source1: _upstream @@ -94,11 +94,11 @@ %package -n dragonplayer License: GPL v2 or later Group: Productivity/Multimedia/Video/Players -Summary: Xine-Based Multimedia Player +Summary: Multimedia Player Url: http://dragonplayer.org/ %description -n dragonplayer -Dragon Player is a simple video player for KDE 4. +Dragon Player is a simple KDE 4 video player. @@ -301,6 +301,9 @@ %doc COPYING COPYING.DOC README %changelog +* Fri Oct 31 2008 dmueller@suse.de +- update to 4.1.3 + * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php * Thu Sep 25 2008 dmueller@suse.de - update to 4.1.2 * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php @@ -336,7 +339,7 @@ * hopefully fixes kmix crash on exit (bnc#373639) * Mon Apr 14 2008 dmueller@suse.de - 4_0_BRANCH.diff update -* Fri Mar 28 2008 dmueller@suse.de +* Thu Mar 27 2008 dmueller@suse.de - update to 4.0.3 * Wed Feb 27 2008 dmueller@suse.de - update to 4.0.2 ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.b15722/_old 2008-11-03 18:12:58.000000000 +0100 +++ /var/tmp/diff_new_pack.b15722/_new 2008-11-03 18:12:58.000000000 +0100 @@ -1,15 +1,71 @@ -package: kdemultimedia-4.1.2.tar.bz2 +package: kdemultimedia-4.1.3.tar.bz2 kdemod: kdemultimedia --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: -+svn di between //tags/KDE/4.1.2/kdemultimedia and //branches/KDE/4.1/kdemultimedia ++current HEAD: 878038 ++svn di between //tags/KDE/4.1.3/kdemultimedia and //branches/KDE/4.1/kdemultimedia +--- dragonplayer/misc/dragonplayer_play_dvd.desktop ++++ dragonplayer/misc/dragonplayer_play_dvd.desktop +@@ -18,6 +18,7 @@ + Name[ga]=Seinn DVD le Dragon Player + Name[gl]=Reproducir o DVD co Dragon Player + Name[hu]=DVD-lejátszás a Dragon Playerrel ++Name[is]=Spila DVD með Dragon spilaranum + Name[it]=Riproduci DVD con Dragon Player + Name[ja]=Dragon Player で DVD を再生 + Name[km]=ចាក់ DVD ជាមួយកម្មវិធីចាក់ Dragon +--- dragonplayer/misc/dragonplayer_part.desktop ++++ dragonplayer/misc/dragonplayer_part.desktop +@@ -14,6 +14,7 @@ + Name[ga]=Comhpháirt Dragon Player + Name[gl]=Componente do Dragon Player + Name[hu]=Dragon Player objektum ++Name[is]=Dragon spilaraeining + Name[it]=Componente Dragon Player + Name[ja]=Dragon Player コンポーネント + Name[km]=ផ្នែកកម្មវិធីចាក់របស់ Dragon +@@ -47,6 +48,7 @@ + Comment[ga]=Seinnteoir Inleabaithe Físe + Comment[gl]=Reproductor incrustábel de vídeo + Comment[hu]=Beágyazható videólejátszó ++Comment[is]=Ígræðanlegur vídeóspilari + Comment[it]=Lettore video integrabile + Comment[ja]=埋め込み可能な動画プレーヤー + Comment[km]=កម្មវិធីចាក់វីដេអូដែលអាចបង្កប់បាន +--- dragonplayer/misc/dragonplayer.desktop ++++ dragonplayer/misc/dragonplayer.desktop +@@ -7,6 +7,7 @@ + Name[el]=Αναπαραγωγέας Dragon + Name[es]=Reproductor Dragón + Name[et]=Dragoni mängija ++Name[is]=Dragon spilari + Name[km]=កម្មវិធីចាក់ Dragon + Name[ko]=Dragon 플레이어 + Name[nds]=Drakenspeler +@@ -30,6 +31,7 @@ + GenericName[ga]=Seinnteoir Físe + GenericName[gl]=Reproductor de vídeo + GenericName[hu]=Videólejátszó ++GenericName[is]=Vídeóspilari + GenericName[it]=Riproduttore video + GenericName[ja]=動画プレーヤー + GenericName[km]=កម្មវិធីចាក់វីដេអូ +--- kioslave/audiocd/data/audiocd.desktop ++++ kioslave/audiocd/data/audiocd.desktop +@@ -15,6 +15,7 @@ + Name[ga]=Brabhsálaí Dlúthdhioscaí Fuaime + Name[gl]=Navegador de Audio CD + Name[hu]=Hang-CD-böngésző ++Name[is]=Tónlistardiskaflakkari + Name[it]=Browser di CD Audio + Name[ja]=オーディオ CD ブラウザ + Name[km]=កម្មវិធីរុករកស៊ីឌីអូឌីយ៉ូ -Eigenschaftsänderungen: . +Property changes on: . ___________________________________________________________________ -Gelöscht: svn:mergeinfo -Hinzugefügt: svn:externals +Deleted: svn:mergeinfo +Added: svn:externals + ++++++ kdemultimedia-4.1.2.tar.bz2 -> kdemultimedia-4.1.3.tar.bz2 ++++++ Files old/kdemultimedia-4.1.2/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.1.3/doc/dragonplayer/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/doc/dragonplayer/index.docbook new/kdemultimedia-4.1.3/doc/dragonplayer/index.docbook --- old/kdemultimedia-4.1.2/doc/dragonplayer/index.docbook 2008-09-25 14:01:51.000000000 +0200 +++ new/kdemultimedia-4.1.3/doc/dragonplayer/index.docbook 2008-10-30 14:24:13.000000000 +0100 @@ -132,23 +132,23 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>Space</keycap></keycombo> +<keycap>Space</keycap> </shortcut> <guimenu>Play</guimenu> -<guimenuitem>Play</guimenuitem> +<guimenuitem>Play/Pause</guimenuitem> </menuchoice></term> -<listitem><para><action>If a movie is loaded, this option allows you to pause playback.</action></para></listitem> +<listitem><para><action>If a movie is loaded, this option allows you to pause and resume playback.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>S</keycap></keycombo> +<keycap>S</keycap> </shortcut> <guimenu>Play</guimenu> <guimenuitem>Stop</guimenuitem> </menuchoice></term> -<listitem><para><action>If a movie is loaded, this option allows you to resume playback.</action></para></listitem> +<listitem><para><action>If a movie is loaded, this option allows you to stop playback.</action></para></listitem> </varlistentry> @@ -173,7 +173,7 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo><keycap>F</keycap></keycombo> +<keycap>F</keycap> </shortcut> <guimenu>Settings</guimenu> <guimenuitem>Full Screen Mode</guimenuitem> Files old/kdemultimedia-4.1.2/doc/juk/index.cache.bz2 and new/kdemultimedia-4.1.3/doc/juk/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/doc/juk/index.docbook new/kdemultimedia-4.1.3/doc/juk/index.docbook --- old/kdemultimedia-4.1.2/doc/juk/index.docbook 2008-09-25 14:01:51.000000000 +0200 +++ new/kdemultimedia-4.1.3/doc/juk/index.docbook 2008-10-30 14:24:13.000000000 +0100 @@ -1330,7 +1330,7 @@ <varlistentry> <term><menuchoice> -<shortcut><keycombo action="simul"><keycap>Ctrl</keycap><keycap>T</keycap></keycombo></shortcut> +<shortcut><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></shortcut> <guimenu>Tagger</guimenu><guimenuitem>Save</guimenuitem> </menuchoice> </term> @@ -1354,7 +1354,7 @@ <varlistentry> <term><menuchoice> -<shortcut><keycombo action="simul"><keycap>Ctrl</keycap><keycap>F</keycap></keycombo></shortcut> +<shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Tagger</guimenu><guisubmenu>Guess Tag Information</guisubmenu><guimenuitem>From Filename</guimenuitem> </menuchoice> @@ -1369,7 +1369,7 @@ <varlistentry> <term><menuchoice> -<shortcut><keycombo action="simul"><keycap>Ctrl</keycap><keycap>I</keycap></keycombo></shortcut> +<shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></shortcut> <guimenu>Tagger</guimenu><guisubmenu>Guess Tag Information</guisubmenu><guimenuitem>From Internet</guimenuitem> </menuchoice> Files old/kdemultimedia-4.1.2/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.1.3/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-4.1.2/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.1.3/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/doc/kscd/index.docbook new/kdemultimedia-4.1.3/doc/kscd/index.docbook --- old/kdemultimedia-4.1.2/doc/kscd/index.docbook 2008-09-25 14:01:51.000000000 +0200 +++ new/kdemultimedia-4.1.3/doc/kscd/index.docbook 2008-10-30 14:24:13.000000000 +0100 @@ -374,7 +374,7 @@ <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>arts</guilabel>. You can also select the device the audio backend uses by entering the device location in +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> @@ -441,7 +441,7 @@ </mediaobject> </screenshot> -<para>The f<guilabel>Submit</guilabel> tab sets up connection to a mail +<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> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/dragonplayer/misc/dragonplayer.desktop new/kdemultimedia-4.1.3/dragonplayer/misc/dragonplayer.desktop --- old/kdemultimedia-4.1.2/dragonplayer/misc/dragonplayer.desktop 2008-08-28 10:08:27.000000000 +0200 +++ new/kdemultimedia-4.1.3/dragonplayer/misc/dragonplayer.desktop 2008-10-30 14:24:12.000000000 +0100 @@ -9,7 +9,7 @@ Name[et]=Dragoni mängija Name[km]=កម្មវិធីចាក់ Dragon Name[ko]=Dragon 플레이어 -Name[nds]=Draken-Speler +Name[nds]=Drakenspeler Name[pl]=Odtwarzacz Dragon Player Name[sv]=Dragon videospelare Name[th]=โปรแกรมเล่นสื่อ Dragon Player diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/dragonplayer/misc/dragonplayer_part.desktop new/kdemultimedia-4.1.3/dragonplayer/misc/dragonplayer_part.desktop --- old/kdemultimedia-4.1.2/dragonplayer/misc/dragonplayer_part.desktop 2008-08-28 10:08:27.000000000 +0200 +++ new/kdemultimedia-4.1.3/dragonplayer/misc/dragonplayer_part.desktop 2008-10-30 14:24:12.000000000 +0100 @@ -20,7 +20,7 @@ Name[ko]=Dragon 플레이어 부분 Name[lt]=Dragon Player dalis Name[lv]=Dragon Player daļa -Name[nds]=Draken-Spelerkomponent +Name[nds]=Drakenspeler-Komponent Name[nl]=Dragon Player-component Name[nn]=Dragon Player-del Name[pl]=Moduł odtwarzacza Dragon Player diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/dragonplayer/misc/dragonplayer_play_dvd.desktop new/kdemultimedia-4.1.3/dragonplayer/misc/dragonplayer_play_dvd.desktop --- old/kdemultimedia-4.1.2/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-08-28 10:08:27.000000000 +0200 +++ new/kdemultimedia-4.1.3/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-10-30 14:24:12.000000000 +0100 @@ -24,7 +24,7 @@ Name[ko]=Dragon 플레이어로 DVD 보기 Name[lt]=Groti DVD su Dragon Player Name[lv]=Atskaņot DVD ar Dragon Player -Name[nds]=DVD mit den Draken-Speler afspelen +Name[nds]=DVD mit den Drakenspeler afspelen Name[nl]=DVD met Dragon Player afspelen Name[nn]=Spel DVD med Dragon Player Name[pl]=Odtwórz DVD za pomocą Dragon Playera diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/kioslave/audiocd/audiocd.cpp new/kdemultimedia-4.1.3/kioslave/audiocd/audiocd.cpp --- old/kdemultimedia-4.1.2/kioslave/audiocd/audiocd.cpp 2008-08-28 10:08:27.000000000 +0200 +++ new/kdemultimedia-4.1.3/kioslave/audiocd/audiocd.cpp 2008-10-30 14:24:17.000000000 +0100 @@ -27,8 +27,11 @@ #include <kdemacros.h> extern "C" { + //cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like + #define private _private #include <cdda_interface.h> #include <cdda_paranoia.h> + #undef private void paranoiaCallback(long, int); KDE_EXPORT int kdemain(int argc, char ** argv); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/flac/encoderflac.cpp new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/flac/encoderflac.cpp --- old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/flac/encoderflac.cpp 2008-01-29 10:20:24.000000000 +0100 +++ new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/flac/encoderflac.cpp 2008-10-30 14:24:16.000000000 +0100 @@ -177,8 +177,8 @@ // d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE) typedef QPair<QString, QVariant> Comment; - Comment comments[7] = { Comment("Title", info.track(track).get(Title)), - Comment("Artist", info.track(track).get(Artist)), + Comment comments[7] = { Comment("Title", info.track(track-1).get(Title)), + Comment("Artist", info.track(track-1).get(Artist)), Comment("Album", info.get(Title)), Comment("Genre", info.get(Genre)), Comment("Tracknumber", QString::number(track)), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/lame/encoderlame.cpp new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/lame/encoderlame.cpp --- old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/lame/encoderlame.cpp 2008-08-28 10:08:27.000000000 +0200 +++ new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/lame/encoderlame.cpp 2008-10-30 14:24:17.000000000 +0100 @@ -341,10 +341,10 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment ){ trackInfo.clear(); trackInfo.append("--tt"); - trackInfo.append(info.track(track).get(Title).toString()); + trackInfo.append(info.track(track-1).get(Title).toString()); trackInfo.append("--ta"); - trackInfo.append(info.track(track).get(Artist).toString()); + trackInfo.append(info.track(track-1).get(Artist).toString()); trackInfo.append("--tl"); trackInfo.append(info.get(Title).toString()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp --- old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp 2008-01-05 01:02:15.000000000 +0100 +++ new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp 2008-10-30 14:24:13.000000000 +0100 @@ -306,13 +306,13 @@ typedef QPair<QByteArray, QVariant> CommentField; Q3ValueList<CommentField> commentFields; - commentFields.append(CommentField("title", info.track(track).get(Title))); - commentFields.append(CommentField("artist", info.track(track).get(Artist))); + commentFields.append(CommentField("title", info.track(track-1).get(Title))); + commentFields.append(CommentField("artist", info.track(track-1).get(Artist))); commentFields.append(CommentField("album", info.get(Title))); commentFields.append(CommentField("genre", info.get(Genre))); commentFields.append(CommentField("tracknumber", QString::number(track))); commentFields.append(CommentField("comment", comment)); - + if (info.get(Year).toInt() > 0) { QDateTime dt( QDate(info.get(Year).toInt(), 1, 1) ); commentFields.append(CommentField("date", dt.toString(Qt::ISODate).toUtf8().data())); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/wav/encodercda.cpp new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/wav/encodercda.cpp --- old/kdemultimedia-4.1.2/kioslave/audiocd/plugins/wav/encodercda.cpp 2008-01-05 01:02:15.000000000 +0100 +++ new/kdemultimedia-4.1.3/kioslave/audiocd/plugins/wav/encodercda.cpp 2008-10-30 14:24:16.000000000 +0100 @@ -42,7 +42,10 @@ // Remove this by calculating CD_FRAMESIZE_RAW from the frames extern "C" { + //cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like + #define private _private #include <cdda_interface.h> + #undef private } inline int16_t swap16 (int16_t i) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/libkcddb/kcmcddb/kcmcddb.cpp new/kdemultimedia-4.1.3/libkcddb/kcmcddb/kcmcddb.cpp --- old/kdemultimedia-4.1.2/libkcddb/kcmcddb/kcmcddb.cpp 2008-01-05 01:02:06.000000000 +0100 +++ new/kdemultimedia-4.1.3/libkcddb/kcmcddb/kcmcddb.cpp 2008-10-30 14:24:12.000000000 +0100 @@ -46,7 +46,7 @@ : KCModule(KCDDBFactory::componentData(), parent) { KGlobal::locale()->insertCatalog("libkcddb"); - setButtons(Default | Apply); + setButtons(Default | Apply | Help); widget_ = new CDDBConfigWidget(this); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.1.2/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-4.1.3/libkcddb/kcmcddb/libkcddb.desktop --- old/kdemultimedia-4.1.2/libkcddb/kcmcddb/libkcddb.desktop 2008-08-28 10:08:27.000000000 +0200 +++ new/kdemultimedia-4.1.3/libkcddb/kcmcddb/libkcddb.desktop 2008-10-30 14:24:12.000000000 +0100 @@ -7,7 +7,7 @@ X-KDE-Library=kcm_cddb X-KDE-ParentApp=kcontrol - +X-DocPath=kscd/index.html#cddb-page Name=CDDB Retrieval Name[bg]=Извличане от CDDB ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org