Hello community, here is the log from the commit of package juk for openSUSE:Factory checked in at 2013-12-02 12:33:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/juk (Old) and /work/SRC/openSUSE:Factory/.juk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "juk" Changes: -------- --- /work/SRC/openSUSE:Factory/juk/juk.changes 2013-10-03 15:49:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.juk.new/juk.changes 2013-12-02 12:33:21.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 16 18:00:28 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.90 + * KDE 4.12 Beta 2 release + * See http://www.kde.org/announcements/announce-4.12-beta2.php + +------------------------------------------------------------------- +Sat Nov 9 23:01:52 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.80 + * KDE 4.12 Beta 1 release + * See http://www.kde.org/announcements/announce-4.12-beta1.php + +------------------------------------------------------------------- +Sat Nov 2 15:15:17 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- Old: ---- juk-4.11.2.tar.xz New: ---- juk-4.11.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ juk.spec ++++++ --- /var/tmp/diff_new_pack.6zZeSd/_old 2013-12-02 12:33:21.000000000 +0100 +++ /var/tmp/diff_new_pack.6zZeSd/_new 2013-12-02 12:33:21.000000000 +0100 @@ -25,7 +25,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.kde.org -Version: 4.11.2 +Version: 4.11.90 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ juk-4.11.2.tar.xz -> juk-4.11.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/CMakeLists.txt new/juk-4.11.90/CMakeLists.txt --- old/juk-4.11.2/CMakeLists.txt 2013-08-28 19:09:48.000000000 +0200 +++ new/juk-4.11.90/CMakeLists.txt 2013-11-11 09:03:09.000000000 +0100 @@ -138,9 +138,9 @@ kde4_add_app_icon(juk_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-juk.png") kde4_add_executable(juk ${juk_SRCS}) -if(NOT MSVC) +if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) set( LIBMATH m ) -endif(NOT MSVC) +endif(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) target_link_libraries(juk ${LIBMATH} ${KDE4_KHTML_LIBS} ${TAGLIB_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_PHONON_LIBS}) if(TUNEPIMP_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/doc/index.docbook new/juk-4.11.90/doc/index.docbook --- old/juk-4.11.2/doc/index.docbook 2013-08-28 19:09:48.000000000 +0200 +++ new/juk-4.11.90/doc/index.docbook 2013-11-11 09:03:09.000000000 +0100 @@ -42,8 +42,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-06-16</date> -<releaseinfo>3.11 (&kde; 4.11)</releaseinfo> +<date>2013-11-08</date> +<releaseinfo>3.11 (&kde; 4.12)</releaseinfo> <abstract> <para> @@ -1503,11 +1503,22 @@ </menuchoice> </term> <listitem><para>This is a toggle option. If enabled, &juk; will remain -running if you close the main window. The Dock in System Tray option must + running if you close the main window. The <guimenuitem>Dock in System Tray</guimenuitem> option must also be enabled. To quit &juk;, use the <menuchoice><guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem></menuchoice> command from the main window, or the <guimenuitem>Quit</guimenuitem> command from the system tray's context menu.</para> +<para> +If &juk; is started up when it is set to dock in the system tray on startup +a simple notification will be shown (as otherwise the user may wonder why &juk; +window did not open up). It is possible to remove this additional +notification by going to <menuchoice><guimenu>Common Appearance and Behavior</guimenu> +<guimenuitem>Application and System Notifications</guimenuitem></menuchoice> in +&systemsettings; to manage <guilabel>JuK music player</guilabel> application notifications. +Just uncheck <guilabel>Show a message in a popup</guilabel> item for <guimenuitem>JuK running +in dock mode</guimenuitem>. More information on &kde; notification settings can be found +<ulink url="help:/kcontrol/kcmnotify">here</ulink>. +</para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/juk.desktop new/juk-4.11.90/juk.desktop --- old/juk-4.11.2/juk.desktop 2013-08-28 19:09:48.000000000 +0200 +++ new/juk-4.11.90/juk.desktop 2013-11-11 09:03:09.000000000 +0100 @@ -49,6 +49,7 @@ Name[sr@latin]=Juk Name[sv]=Juk Name[tr]=JuK +Name[ug]=JuK Name[uk]=JuK Name[x-test]=xxJuKxx Name[zh_CN]=JuK @@ -95,6 +96,7 @@ GenericName[sr@latin]=Muzički plejer GenericName[sv]=Musikspelare GenericName[tr]=Müzik Çalar +GenericName[ug]=نەغمە قويغۇ GenericName[uk]=Програвач музики GenericName[x-test]=xxMusic Playerxx GenericName[zh_CN]=音乐播放器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/juk.notifyrc new/juk-4.11.90/juk.notifyrc --- old/juk-4.11.2/juk.notifyrc 2013-08-28 19:09:48.000000000 +0200 +++ new/juk-4.11.90/juk.notifyrc 2013-11-11 09:03:09.000000000 +0100 @@ -41,6 +41,7 @@ Comment[sr@latin]=Muzički plejer Juk Comment[sv]=Juk musikspelare Comment[tr]=Juk Müzik Çalar +Comment[ug]=Juk نەغمە چالغۇچ Comment[uk]=Програвач музики JuK Comment[x-test]=xxJuk Music Playerxx Comment[zh_CN]=Juk 音乐播放器 @@ -87,6 +88,7 @@ Name[sr@latin]=Juk Name[sv]=Juk Name[tr]=JuK +Name[ug]=JuK Name[uk]=JuK Name[x-test]=xxJuKxx Name[zh_CN]=JuK @@ -135,6 +137,7 @@ Name[sr@latin]=Omot uspešno preuzet Name[sv]=Omslag nerladdat med lyckat resultat Name[tr]=Kapak Başarılı Şekilde İndirildi +Name[ug]=مۇقاۋا مۇۋەپپەقىيەتلىك چۈشۈرۈلدى Name[uk]=Обкладинку успішно звантажено Name[x-test]=xxCover Successfully Downloadedxx Name[zh_CN]=下载封面成功 @@ -181,6 +184,7 @@ Comment[sr@latin]=Zatraženi omot je preuzet Comment[sv]=Ett begärt omslag har laddats ner Comment[tr]=İstenilen kapak indirildi +Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋا چۈشۈرۈلدى Comment[uk]=Потрібну обкладинку було звантажено Comment[x-test]=xxA requested cover has been downloadedxx Comment[zh_CN]=已下载请求的封面 @@ -230,6 +234,7 @@ Name[sr@latin]=Omot se ne može preuzeti Name[sv]=Nerladdning av omslag misslyckades Name[tr]=Kapak İndirilemedi +Name[ug]=مۇقاۋىنى چۈشۈرەلمىدى Name[uk]=Невдала спроба звантаження обкладинки Name[x-test]=xxCover Failed to Downloadxx Name[zh_CN]=下载封面失败 @@ -276,8 +281,56 @@ Comment[sr@latin]=Preuzimanje zatraženog omota nije uspelo Comment[sv]=Nerladdning av ett begärt omslag har misslyckats Comment[tr]=İstenilen kapak indirilemedi +Comment[ug]=ئىلتىماس قىلىنغان مۇقاۋىنى چۈشۈرەلمىدى Comment[uk]=Потрібну обкладинку не вдалося звантажити Comment[x-test]=xxA requested cover has failed to downloadxx Comment[zh_CN]=请求的封面下载失败 Comment[zh_TW]=要求的封面無法成功下載 Action=Popup + +[Event/dock_mode] +Name=JuK running in dock mode +Name[bs]=Juk u usidrenom režimu +Name[da]=JuK kører i doktilstand +Name[de]=JuK läuft im Systemabschnitt der Kontrollleiste +Name[gl]=JuK está no modo acoplado +Name[hu]=A JuK dokkolt módban fut +Name[ia]=Juck executante de modo dock +Name[kk]=JuK бүктелген күйде жегілген +Name[nl]=JuK actief in verankerde modus +Name[pt]=JuK em execução no modo acoplado +Name[pt_BR]=JuK em execução no modo acoplado +Name[sk]=JuK beží v dokovanom režime +Name[sl]=Juk je v zasidranem načinu +Name[sr]=Џук ради у сидришном режиму +Name[sr@ijekavian]=Џук ради у сидришном режиму +Name[sr@ijekavianlatin]=Juk radi u sidrišnom režimu +Name[sr@latin]=Juk radi u sidrišnom režimu +Name[sv]=JuK kör i dockningsläge +Name[tr]=JuK yerleşik kipte çalışıyor +Name[uk]=JuK запущено у згорнутому режимі +Name[x-test]=xxJuK running in dock modexx +Name[zh_TW]=JuK 以嵌入模式執行中 +Comment=Use context menu in system tray to restore. +Comment[bs]=Koristi kontekstni meni u sistemskom uglu za obnovu. +Comment[da]=Brug kontekstmenuen i statusområdet til at gendanne. +Comment[de]=Kontextmenü im Systemabschnitt der Kontrollleiste zum Wiederherstellen verwenden +Comment[gl]=Use o menú contextual na bandexa do sistema para restauralo. +Comment[hu]=Helyi menü használata a rendszertálcán a visszaállításhoz. +Comment[ia]=Usa menu de contexto in tabuliero de systema pro restabilir. +Comment[kk]=Қалпына келтіруге жүйелік сөре контекстті мәзірін пайдаланыңыз. +Comment[nl]=Contextmenu in systeemvak gebruiken voor herstellen. +Comment[pt]=Use o menu de contexto da bandeja para repor. +Comment[pt_BR]=Use o menu de contexto da área de notificação para restaurar. +Comment[sk]=Použite kontextovú ponuku v systémovej lište na obnovenie. +Comment[sl]=Uporabite vsebinski meni v sistemski vrstici za obnovitev. +Comment[sr]=Употребите контекстни мени у системској касети за обнављање. +Comment[sr@ijekavian]=Употребите контекстни мени у системској касети за обнављање. +Comment[sr@ijekavianlatin]=Upotrebite kontekstni meni u sistemskoj kaseti za obnavljanje. +Comment[sr@latin]=Upotrebite kontekstni meni u sistemskoj kaseti za obnavljanje. +Comment[sv]=Använd sammanhangsberoende meny i systembrickan för att återställa. +Comment[tr]=Geri yüklemek için sistem çekmecesindeki bağlam menüsünü kullanın. +Comment[uk]=Скористайтеся контекстним меню піктограми системного лотка, щоб розгорнути вікно програми. +Comment[x-test]=xxUse context menu in system tray to restore.xx +Comment[zh_TW]=用系統匣的內文選單來回復。 +Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/jukservicemenu.desktop new/juk-4.11.90/jukservicemenu.desktop --- old/juk-4.11.2/jukservicemenu.desktop 2013-08-28 19:09:48.000000000 +0200 +++ new/juk-4.11.90/jukservicemenu.desktop 2013-11-11 09:03:09.000000000 +0100 @@ -46,6 +46,7 @@ Name[sr@latin]=Dodaj u Jukovu zbirku Name[sv]=Lägg till i Juk-samlingslista Name[tr]=JuK Koleksiyonuna Ekle +Name[ug]=JuK توپلىمىغا قوش Name[uk]=Додати до збірки JuK Name[x-test]=xxAdd to JuK Collectionxx Name[zh_CN]=添加到 Juk 收藏 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/lyricswidget.cpp new/juk-4.11.90/lyricswidget.cpp --- old/juk-4.11.2/lyricswidget.cpp 2013-08-28 19:09:48.000000000 +0200 +++ new/juk-4.11.90/lyricswidget.cpp 2013-11-11 09:03:09.000000000 +0100 @@ -66,11 +66,11 @@ m_lyricsCurrent = true; if(m_playingFile.isNull()) { - setHtml(QLatin1String("<i>No m_playingFile playing.</i>")); + setHtml(i18n("<i>No file playing.</i>")); return; } - setHtml("<i>Loading...</i>"); + setHtml(i18n("<i>Loading...</i>")); QUrl listUrl("http://lyrics.wikia.com/api.php";); listUrl.addQueryItem("action", "lyrics"); @@ -105,7 +105,7 @@ disconnect(m_networkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(receiveListReply(QNetworkReply*))); if (reply->error() != QNetworkReply::NoError) { kWarning() << "Error while fetching lyrics: " << reply->errorString(); - setHtml("<span style='color:red'>Error while retrieving lyrics!</span>"); + setHtml(i18n("<span style='color:red'>Error while retrieving lyrics!</span>")); return; } @@ -130,7 +130,7 @@ disconnect(m_networkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(receiveLyricsReply(QNetworkReply*))); if (reply->error() != QNetworkReply::NoError) { kWarning() << "Error while fetching lyrics: " << reply->errorString(); - setHtml("<span style='color:red'>Error while retrieving lyrics!</span>"); + setHtml(i18n("<span style='color:red'>Error while retrieving lyrics!</span>")); return; } @@ -139,7 +139,7 @@ int rIndex = content.indexOf("</lyrics>"); if (lIndex == -1 || rIndex == -1) { kWarning() << Q_FUNC_INFO << "Unable to find lyrics in text"; - setText("No lyrics available."); + setText(i18n("No lyrics available.")); return; } lIndex += 15; // We skip the tag @@ -148,5 +148,5 @@ //setText(content); setHtml("<h1>" + m_title + "</h1>" + content + - "<br /><br /><i>Lyrics provided by <a href='http://lyrics.wikia.com/Lyrics_Wiki'>LyricWiki</a></i>"); + i18n("<br /><br /><i>Lyrics provided by <a href='http://lyrics.wikia.com/Lyrics_Wiki'>LyricWiki</a></i>")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-4.11.2/main.cpp new/juk-4.11.90/main.cpp --- old/juk-4.11.2/main.cpp 2013-09-26 21:25:39.000000000 +0200 +++ new/juk-4.11.90/main.cpp 2013-11-11 09:03:09.000000000 +0100 @@ -21,6 +21,7 @@ #include <klocale.h> #include <kglobal.h> #include <kconfiggroup.h> +#include <knotification.h> #include "juk.h" @@ -49,7 +50,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.10.1", ki18n(description), KAboutData::License_GPL, + "3.11", ki18n(description), KAboutData::License_GPL, ki18n("© 2002–2013, Scott Wheeler, Michael Pyne, and others"), KLocalizedString(), "http://www.kde.org/applications/multimedia/juk/";); @@ -98,8 +99,13 @@ juk->restore(1, false /* don't show */); KConfigGroup config(KGlobal::config(), "Settings"); - if(!config.readEntry("StartDocked", false)) + if(!config.readEntry("StartDocked", false)) { juk->show(); + } + else if(!a.isSessionRestored()) { + QString message = i18n("JuK running in docked mode\nUse context menu in system tray to restore."); + KNotification::event("dock_mode",i18n("JuK Docked"), message); + } return a.exec(); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
