commit kdiamond for openSUSE:Factory

28 Aug 2017

Hello community,

here is the log from the commit of package kdiamond for openSUSE:Factory checked in at 2017-08-28 15:06:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdiamond (Old)
 and      /work/SRC/openSUSE:Factory/.kdiamond.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdiamond"

Mon Aug 28 15:06:34 2017 rev:64 rq:516355 version:17.08.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/kdiamond/kdiamond.changes	2017-07-29 08:57:13.000353680 +0200
+++ /work/SRC/openSUSE:Factory/.kdiamond.new/kdiamond.changes	2017-08-28 15:06:49.851917246 +0200
@@ -1,0 +2,17 @@
+Fri Aug 11 22:45:25 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.08.0
+  * New feature release
+  * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+  * Use Q_DECLARE_OVERRIDE 
+
+-------------------------------------------------------------------
+Sat Aug  5 18:17:38 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.07.90
+  * KDE Applications 17.07.90
+  * https://www.kde.org/announcements/announce-applications-17.07.90.php
+
+
+-------------------------------------------------------------------

Old:
----
  kdiamond-17.04.3.tar.xz

New:
----
  kdiamond-17.08.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdiamond.spec ++++++
--- /var/tmp/diff_new_pack.MJZAlB/_old	2017-08-28 15:06:50.919767040 +0200
+++ /var/tmp/diff_new_pack.MJZAlB/_new	2017-08-28 15:06:50.967760289 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kdiamond
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %bcond_without lang
 
 Name:           kdiamond
-Version:        17.04.3
+Version:        17.08.0
 Release:        0
 %define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 Summary:        Single player puzzle game
 License:        GPL-2.0+
@@ -48,7 +49,9 @@
 BuildRequires:  pkgconfig(Qt5Widgets)
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
+%if %{with lang}
 Recommends:     %{name}-lang
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -74,16 +77,16 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING COPYING.DOC
-%{_kf5_bindir}/kdiamond
+%doc COPYING*
+%doc %lang(en) %{_kf5_htmldir}/en/kdiamond/
 %{_kf5_applicationsdir}/org.kde.kdiamond.desktop
-%{_kf5_htmldir}/en/kdiamond/
+%{_kf5_bindir}/kdiamond
+%config %{_kf5_configdir}/kdiamond.knsrc
 %{_kf5_iconsdir}/hicolor/*/apps/kdiamond.*
-%{_datadir}/kdiamond/
-%{_kf5_configdir}/kdiamond.knsrc
-%{_datadir}/sounds/KDiamond-*
-%{_datadir}/knotifications5/kdiamond.notifyrc
-%{_datadir}/kxmlgui5/kdiamond/
+%{_kf5_kxmlguidir}/kdiamond/
+%{_kf5_notifydir}/kdiamond.notifyrc
+%{_kf5_sharedir}/kdiamond/
+%{_kf5_sharedir}/sounds/KDiamond-*
 
 %if %{with lang}
 %files lang -f %{name}.lang

++++++ kdiamond-17.04.3.tar.xz -> kdiamond-17.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/de/docs/kdiamond/index.docbook new/kdiamond-17.08.0/po/de/docs/kdiamond/index.docbook
--- old/kdiamond-17.04.3/po/de/docs/kdiamond/index.docbook	2017-07-11 02:21:42.000000000 +0200
+++ new/kdiamond-17.08.0/po/de/docs/kdiamond/index.docbook	2017-08-11 02:39:30.000000000 +0200
@@ -345,7 +345,7 @@
...
Hilfe</guimenu
, weitere Informationen dazu finden Sie in den Abschnitten über die Menüs <ulink url="help:/fundamentals/ui.html#menus-settings"
Einstellungen</ulink
-> und <ulink url="help:/fundamentals/uihtml#menus-help"
+> und <ulink url="help:/fundamentals/ui.html#menus-help"
Hilfe</ulink
der &kde;-Grundlagen. </para>
...
Stefan Majewsky</holder>
 </copyright>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/pt/docs/kdiamond/index.docbook new/kdiamond-17.08.0/po/pt/docs/kdiamond/index.docbook
--- old/kdiamond-17.04.3/po/pt/docs/kdiamond/index.docbook	2017-07-11 02:21:42.000000000 +0200
+++ new/kdiamond-17.08.0/po/pt/docs/kdiamond/index.docbook	2017-08-11 02:39:30.000000000 +0200
@@ -1,12 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY kdiamond "<application
->KDiamond</application
->">
-<!ENTITY kappname "&kdiamond;">
-<!ENTITY package "kdegames">
-<!ENTITY % Portuguese "INCLUDE"
-> 
+<!ENTITY % Portuguese "INCLUDE">
 <!ENTITY % addindex "IGNORE">
 ]>
 
@@ -51,14 +45,14 @@
 <holder
-    
+
 <legalnotice
...
&FDLNotice;</legalnotice>
<date
->2010-01-21</date>
+>2016-05-09</date>
 <releaseinfo
->1.3.1</releaseinfo>
+>1.5 (Aplicações 16.04)</releaseinfo>
 
 <abstract>
 <para
@@ -86,6 +80,18 @@
 <para
...
O &kdiamond; é um jogo de 'puzzle' apenas para um jogador. </para>
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="gameboard.png" format="PNG"/>
+</imageobject>
+<textobject>
+<phrase
+>Tabuleiro de jogo do &kdiamond;</phrase>
+</textobject>
+</mediaobject>
+</screenshot>
+
 <para
...
O objectivo do jogo é criar linhas com três diamantes semelhantes. </para>
 </chapter>
@@ -141,11 +147,9 @@
 <title
Apresentação à Interface</title>
...
Jogo</guimenu
<guimenuitem
Pausa</guimenuitem
-></menuchoice
+> </menuchoice
</term>
 <listitem>
 <para
@@ -201,7 +205,7 @@
Jogo</guimenu
<guimenuitem
Mostrar os Recordes</guimenuitem
-></menuchoice
+> </menuchoice
</term>
 <listitem>
 <para
@@ -229,17 +233,7 @@
Sai do programa. </para>
 </listitem>
 </varlistentry>
-</variablelist>
...
<menuchoice
@@ -258,47 +252,6 @@
Realça um diamante que poderá ser movido. </para>
 </listitem>
 </varlistentry>
-</variablelist>
...
<guimenu
Configuração</guimenu
<guimenuitem
->Configurar os Atalhos...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para>
-<action
->Abre uma janela que lhe permite definir de novo todos os atalhos de teclado.</action>
-</para
-></listitem>
-</varlistentry>
-<sect1 id="game-menu">
- <title
->O Menu <guimenu
->Jogo</guimenu
-></title>
+<sect1 id="menu">
+<title
+>Opções do Menu</title>
 
 <variablelist>
 <varlistentry>
@@ -180,7 +184,7 @@
-
-</sect1>
-
-<sect1 id="move-menu">
-<title
->O Menu <guimenu
->Mover</guimenu
-></title>
 
-<variablelist>
 <varlistentry>
 <term
-
-</sect1>
-
-<sect1 id="settings-menu">
-<title
->O Menu <guimenu
->Configuração</guimenu
-></title>
-
-<variablelist>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Configuração</guimenu
-> <guimenuitem
->Mostrar a Barra de Ferramentas</guimenuitem
-> </menuchoice
-></term>
-<listitem>
-<para
->Activa ou desactiva a visibilidade da barra de ferramentas. </para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Configuração</guimenu
-> <guimenuitem
->Mostrar a Barra de Estado</guimenuitem
-> </menuchoice
-></term>
-<listitem>
-<para
->Activa ou desactiva a visibilidade da barra de estado. </para>
-</listitem>
-</varlistentry>
 
 <varlistentry>
 <term
@@ -355,40 +308,8 @@
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Configuração</guimenu
-> <guimenuitem
->Configurar as Barras de Ferramentas...</guimenuitem
-> </menuchoice
-></term>
-<listitem
-><para
->Mostra a janela normal do &kde; para configurar os ícones da barra de ferramentas.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Configuração</guimenu
-><guimenuitem
...
Configurar as Notificações...</guimenuitem
-></menuchoice
+> </menuchoice
</term>
 <listitem
<para
@@ -412,14 +333,19 @@
 </varlistentry>
...
Ajuda</guimenu
-></title>
-&help.menu.documentation; </sect1>
+> normais do &kde;; para mais informações, leia as secções acerca dos menus de <ulink url="help:/fundamentals/ui.html#menus-settings"
+>Configuração</ulink
+> e <ulink url="help:/fundamentals/ui.html#menus-help"
+>Ajuda</ulink
+> dos Fundamentos do &kde;. </para>
</variablelist>
-</sect1>
 
-<sect1 id="help">
-<title
->O Menu <guimenu
+<para
+>Para além disso, o &kdiamond; tem os menus de <guimenu
+>Configuração</guimenu
+> e <guimenu
+
+</sect1>
 
 <sect1 id="keybindings">
 <title id="keybindings-title"
@@ -529,23 +455,7 @@
...
&underFDL; &underGPL; </chapter>
 
-<appendix id="installation">
-<title
->Instalação</title>
-
-<sect1 id="getting-kdiamond">
-<title
->Como obter o &kdiamond;</title>
-&install.intro.documentation; </sect1>
-
-<sect1 id="compilation">
-<title
->Compilação e Instalação</title>
-&install.compile.documentation; </sect1>
-</appendix>
-
-
-&documentation.index; 
+&documentation.index;
 </book>
 <!--
 Local Variables:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/tr/kdiamond.po new/kdiamond-17.08.0/po/tr/kdiamond.po
--- old/kdiamond-17.04.3/po/tr/kdiamond.po	2017-07-11 02:21:42.000000000 +0200
+++ new/kdiamond-17.08.0/po/tr/kdiamond.po	2017-08-11 02:39:30.000000000 +0200
@@ -13,8 +13,8 @@
 "POT-Creation-Date: 2016-11-19 20:14+0100\n"
 "PO-Revision-Date: 2014-06-08 13:55+0000\n"
 "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
-"Language-Team: Turkish "
-"(http://www.transifex.com/projects/p/kdegames-k-tr/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/kdegames-k-tr/"
+"language/tr/)\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -191,6 +191,6 @@
 "or multiple lines at one time.</p>"
 msgstr ""
 "<h3>Oyun Kuralları</h3><p>Amacınız en az üç benzer elmastan oluşan diziler "
-"oluşturmaktır. Yerlerini değiştirmek için iki komşu elmas üzerine "
-"tıklayın.</p><p>Katlar inşa ederek fazladan puan ve aynı anda uzun dizeler "
-"ya da çoklu dizeler oluşturarak fazladan saniyeler kazanın.</p>"
+"oluşturmaktır. Yerlerini değiştirmek için iki komşu elmas üzerine tıklayın.</"
+"p><p>Katlar inşa ederek fazladan puan ve aynı anda uzun dizeler ya da çoklu "
+"dizeler oluşturarak fazladan saniyeler kazanın.</p>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/zh_CN/kdiamond.po new/kdiamond-17.08.0/po/zh_CN/kdiamond.po
--- old/kdiamond-17.04.3/po/zh_CN/kdiamond.po	2017-07-11 02:21:42.000000000 +0200
+++ new/kdiamond-17.08.0/po/zh_CN/kdiamond.po	2017-08-11 02:39:30.000000000 +0200
@@ -1,22 +1,20 @@
-# translation of kdiamond.po to 简体中文
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Ni Hui <shuizhuyuanluo@126.com>, 2008, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdiamond\n"
+"Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2016-11-19 20:14+0100\n"
-"PO-Revision-Date: 2010-07-27 21:41+0800\n"
-"Last-Translator: Ni Hui <shuizhuyuanluo@126.com>\n"
-"Language-Team: Chinese Simplified <kde-china@kde.org>\n"
+"PO-Revision-Date: 2017-08-05 09:35-0400\n"
+"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n"
+"Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-stable/messages/kdegames/kdiamond.pot\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -190,52 +188,3 @@
 "<h3>游戏规则</h3><p>您的目标就是将至少三个相同钻石连成线。在两颗钻石上分别点"
 "击便能交换它们。</p><p>建立连锁消去能赢得额外的分数，一次连成长串或多行钻石可"
 "赢得额外时间。</p>"
-
-#~ msgid "Theme"
-#~ msgstr "主题"
-
-#~ msgid "The graphical theme to be used."
-#~ msgstr "要使用的图形主题。"
-
-#~ msgid "Start with Very Easy difficulty level"
-#~ msgstr "以非常简单难度开始"
-
-#~ msgid "Start with Easy difficulty level"
-#~ msgstr "以简单难度开始"
-
-#~ msgid "Start with Medium difficulty level"
-#~ msgstr "以中等难度开始"
-
-#~ msgid "Start with Hard difficulty level"
-#~ msgstr "以困难难度开始"
-
-#~ msgid "Start with Very Hard difficulty level"
-#~ msgstr "以非常困难难度开始"
-
-#~ msgid "The difficulty level."
-#~ msgstr "难度级别。"
-
-#~ msgid "Failed to load \"%1\" theme. Please check your installation."
-#~ msgstr "装入“%1”主题失败。请检查您的安装。"
-
-#~ msgid "Time left: 1 second"
-#~ msgid_plural "Time left: %1 seconds"
-#~ msgstr[0] "剩余时间：%1 秒"
-
-#~ msgid "1 second"
-#~ msgid_plural "%1 seconds"
-#~ msgstr[0] "%1 秒"
-
-#~ msgid "1 minute"
-#~ msgid_plural "%1 minutes"
-#~ msgstr[0] "%1 分钟"
-
-#~ msgctxt "The two parameters are strings like '2 minutes' or '1 second'."
-#~ msgid "Time left: %1, %2"
-#~ msgstr "剩余时间：%1，%2"
-
-#~ msgid "Show minutes on timer"
-#~ msgstr "在计时器中显示分钟数"
-
-#~ msgid "Show minutes separately on the timer."
-#~ msgstr "在计时器中单独显示分钟数。"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/board.h new/kdiamond-17.08.0/src/board.h
--- old/kdiamond-17.04.3/src/board.h	2017-06-18 05:31:54.000000000 +0200
+++ new/kdiamond-17.08.0/src/board.h	2017-07-15 16:14:38.000000000 +0200
@@ -49,8 +49,8 @@
 
     KGameRenderer *renderer() const;
 
-    virtual QRectF boundingRect() const;
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+    QRectF boundingRect() const Q_DECL_OVERRIDE;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE;
 public Q_SLOTS:
     void setPaused(bool paused);
 Q_SIGNALS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/diamond.h new/kdiamond-17.08.0/src/diamond.h
--- old/kdiamond-17.04.3/src/diamond.h	2017-06-18 05:31:54.000000000 +0200
+++ new/kdiamond-17.08.0/src/diamond.h	2017-07-15 16:14:38.000000000 +0200
@@ -49,9 +49,9 @@
     void clicked();
     void dragged(const QPoint &direction);
 protected:
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent *);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
+    void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
 private:
     KDiamond::Color m_color;
     bool m_mouseDown;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/game-state.h new/kdiamond-17.08.0/src/game-state.h
--- old/kdiamond-17.04.3/src/game-state.h	2017-06-18 05:31:54.000000000 +0200
+++ new/kdiamond-17.08.0/src/game-state.h	2017-07-15 16:14:38.000000000 +0200
@@ -65,7 +65,7 @@
     void pointsChanged(int points);
     void leftTimeChanged(int seconds);
 protected:
-    virtual void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
 private:
     GameStatePrivate *p;
 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/game.h new/kdiamond-17.08.0/src/game.h
--- old/kdiamond-17.04.3/src/game.h	2017-06-18 05:31:54.000000000 +0200
+++ new/kdiamond-17.08.0/src/game.h	2017-07-15 16:14:38.000000000 +0200
@@ -62,7 +62,7 @@
     void numberMoves(int moves);
     void pendingAnimationsFinished();
 protected:
-    virtual void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
 private:
     QList<QPoint> findCompletedRows();
     void getMoves();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/view.h new/kdiamond-17.08.0/src/view.h
--- old/kdiamond-17.04.3/src/view.h	2017-06-18 05:31:54.000000000 +0200
+++ new/kdiamond-17.08.0/src/view.h	2017-07-15 16:14:38.000000000 +0200
@@ -31,8 +31,8 @@
 
     void setScene(QGraphicsScene *scene);
 protected:
-    virtual void resizeEvent(QResizeEvent *event);
-    virtual void wheelEvent(QWheelEvent *event);
+    void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
+    void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
 };
 
 }

    

root＠hilbert.suse.de

tags

participants (1)