commit kollision for openSUSE:Factory
28 Aug
2017
28 Aug
'17
13:08
Hello community,
here is the log from the commit of package kollision for openSUSE:Factory checked in at 2017-08-28 15:08:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kollision (Old)
and /work/SRC/openSUSE:Factory/.kollision.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kollision"
Mon Aug 28 15:08:00 2017 rev:65 rq:516403 version:17.08.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kollision/kollision.changes 2017-07-29 08:58:33.836932927 +0200
+++ /work/SRC/openSUSE:Factory/.kollision.new/kollision.changes 2017-08-28 15:08:02.673673795 +0200
@@ -1,0 +2,17 @@
+Fri Aug 11 22:45:50 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:18:22 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:
----
kollision-17.04.3.tar.xz
New:
----
kollision-17.08.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kollision.spec ++++++
--- /var/tmp/diff_new_pack.xrXH6z/_old 2017-08-28 15:08:03.817512895 +0200
+++ /var/tmp/diff_new_pack.xrXH6z/_new 2017-08-28 15:08:03.829511207 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kollision
#
-# 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: kollision
-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: Kollision game
License: GPL-2.0+
@@ -53,7 +54,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
@@ -81,14 +84,14 @@
%files
%defattr(-,root,root)
%doc COPYING COPYING.DOC
-%{_kf5_bindir}/kollision
-%{_kf5_htmldir}/en/kollision/
+%doc %lang(en) %{_kf5_htmldir}/en/kollision/
%{_kf5_applicationsdir}/org.kde.kollision.desktop
+%{_kf5_appsdir}/kollision/
+%{_kf5_appstreamdir}/
+%{_kf5_bindir}/kollision
%{_kf5_iconsdir}/hicolor/*/*/kollision.*
%{_kf5_iconsdir}/oxygen/*/*/kollision.*
-%{_kf5_appsdir}/kollision/
%{_kf5_kxmlguidir}/kollision/
-%{_kf5_appstreamdir}/
%if %{with lang}
%files lang -f %{name}.lang
++++++ kollision-17.04.3.tar.xz -> kollision-17.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/animation.h new/kollision-17.08.0/animation.h
--- old/kollision-17.04.3/animation.h 2017-06-13 05:13:27.000000000 +0200
+++ new/kollision-17.08.0/animation.h 2017-07-15 16:19:12.000000000 +0200
@@ -38,9 +38,9 @@
public:
explicit PauseAnimation(int time);
- virtual void start(int t);
- virtual bool step(int t);
- virtual void stop() { }
+ void start(int t) Q_DECL_OVERRIDE;
+ bool step(int t) Q_DECL_OVERRIDE;
+ void stop() Q_DECL_OVERRIDE { }
};
class FadeAnimation : public Animation
@@ -56,9 +56,9 @@
public:
FadeAnimation(const SpritePtr& sprite, double from, double to, int time);
- virtual void start(int t);
- virtual bool step(int t);
- virtual void stop();
+ void start(int t) Q_DECL_OVERRIDE;
+ bool step(int t) Q_DECL_OVERRIDE;
+ void stop() Q_DECL_OVERRIDE;
};
class MovementAnimation : public Animation
@@ -73,9 +73,9 @@
MovementAnimation(const SpritePtr& sprite, const QPointF& from,
const QPointF& velocity, int time);
- virtual void start(int t);
- virtual bool step(int t);
- virtual void stop();
+ void start(int t) Q_DECL_OVERRIDE;
+ bool step(int t) Q_DECL_OVERRIDE;
+ void stop() Q_DECL_OVERRIDE;
};
@@ -90,9 +90,9 @@
void add(Animation* animation);
- virtual void start(int t);
- virtual bool step(int t);
- virtual void stop();
+ void start(int t) Q_DECL_OVERRIDE;
+ bool step(int t) Q_DECL_OVERRIDE;
+ void stop() Q_DECL_OVERRIDE;
};
class AnimationSequence : public Animation
@@ -105,9 +105,9 @@
void add(Animation* animation);
- virtual void start(int t);
- virtual bool step(int t);
- virtual void stop();
+ void start(int t) Q_DECL_OVERRIDE;
+ bool step(int t) Q_DECL_OVERRIDE;
+ void stop() Q_DECL_OVERRIDE;
};
#endif // ANIMATION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/ball.h new/kollision-17.08.0/ball.h
--- old/kollision-17.04.3/ball.h 2017-06-13 05:13:27.000000000 +0200
+++ new/kollision-17.08.0/ball.h 2017-07-15 16:19:12.000000000 +0200
@@ -23,14 +23,14 @@
public:
Ball(KGameRenderer* renderer, const QString& id, int size);
- virtual void setOpacityF(qreal opacity);
- virtual qreal opacityF() const;
+ void setOpacityF(qreal opacity) Q_DECL_OVERRIDE;
+ qreal opacityF() const Q_DECL_OVERRIDE;
- virtual void setVelocity(const QPointF& vel);
- virtual QPointF velocity() const;
+ void setVelocity(const QPointF& vel) Q_DECL_OVERRIDE;
+ QPointF velocity() const Q_DECL_OVERRIDE;
- virtual void setPosition(const QPointF& pos);
- virtual QPointF position() const;
+ void setPosition(const QPointF& pos) Q_DECL_OVERRIDE;
+ QPointF position() const Q_DECL_OVERRIDE;
qreal radius() const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/mainarea.h new/kollision-17.08.0/mainarea.h
--- old/kollision-17.04.3/mainarea.h 2017-06-13 05:13:27.000000000 +0200
+++ new/kollision-17.08.0/mainarea.h 2017-07-15 16:19:12.000000000 +0200
@@ -96,8 +96,8 @@
void onDeath();
void setManPosition(const QPointF& p);
protected:
- virtual void mousePressEvent(QGraphicsSceneMouseEvent* e);
- virtual void focusOutEvent(QFocusEvent*);
+ void mousePressEvent(QGraphicsSceneMouseEvent* e) Q_DECL_OVERRIDE;
+ void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE;
public:
MainArea();
void start();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/message.h new/kollision-17.08.0/message.h
--- old/kollision-17.04.3/message.h 2017-06-13 05:13:27.000000000 +0200
+++ new/kollision-17.08.0/message.h 2017-07-15 16:19:12.000000000 +0200
@@ -20,14 +20,14 @@
public:
Message(const QString& text, const QFont& font, int maxwidth);
- virtual void setOpacityF(qreal opacity);
- virtual qreal opacityF() const;
+ void setOpacityF(qreal opacity) Q_DECL_OVERRIDE;
+ qreal opacityF() const Q_DECL_OVERRIDE;
- virtual void setVelocity(const QPointF& vel);
- virtual QPointF velocity() const;
+ void setVelocity(const QPointF& vel) Q_DECL_OVERRIDE;
+ QPointF velocity() const Q_DECL_OVERRIDE;
- virtual void setPosition(const QPointF& pos);
- virtual QPointF position() const;
+ void setPosition(const QPointF& pos) Q_DECL_OVERRIDE;
+ QPointF position() const Q_DECL_OVERRIDE;
int height() const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/org.kde.kollision.appdata.xml new/kollision-17.08.0/org.kde.kollision.appdata.xml
--- old/kollision-17.04.3/org.kde.kollision.appdata.xml 2017-06-13 05:13:27.000000000 +0200
+++ new/kollision-17.08.0/org.kde.kollision.appdata.xml 2017-07-15 16:19:12.000000000 +0200
@@ -26,6 +26,7 @@
<name xml:lang="sr-ijekavian">Колизија</name>
<name xml:lang="sr-ijekavianlatin">Kolizija</name>
<name xml:lang="sv">Kollision</name>
+ <name xml:lang="tr">Kollision</name>
<name xml:lang="uk">Kollision</name>
<name xml:lang="x-test">xxKollisionxx</name>
<name xml:lang="zh-TW">Kollision</name>
@@ -52,6 +53,7 @@
<summary xml:lang="sr-ijekavian">Необавезна игра са лоптицама</summary>
<summary xml:lang="sr-ijekavianlatin">Neobavezna igra sa lopticama</summary>
<summary xml:lang="sv">Vardagligt bollspel</summary>
+ <summary xml:lang="tr">Sıradan bir top oyunu</summary>
<summary xml:lang="uk">Казуальна гра з кульками</summary>
<summary xml:lang="x-test">xxCasual ball gamexx</summary>
<summary xml:lang="zh-CN">休闲球游戏</summary>
@@ -83,6 +85,7 @@
<p xml:lang="sr-ijekavian">Колизија је необавезна игра у којој бацате своју лоптицу и избегавате друге лоптице на табли што дуже можете.</p>
<p xml:lang="sr-ijekavianlatin">Kolizija je neobavezna igra u kojoj bacate svoju lopticu i izbegavate druge loptice na tabli što duže možete.</p>
<p xml:lang="sv">Kollision är ett vardagsspel där man ska kasta en boll och undvika andras bollar på spelbordet så länge som möjligt.</p>
+ <p xml:lang="tr">Kollision, topu fırlatmayı ve masa üstünde olabildiğince diğer toplardan kaçmayı hedef alan sıradan bir top oyunudur.</p>
<p xml:lang="uk">Kollision — казуальна гра, у якій ви кидаєте кульку так, щоб вона якомога довше не стикалася з іншими кульками на полі.</p>
<p xml:lang="x-test">xxKollision is a casual game where you need to throw your ball and avoid the others balls on the table as long as possible.xx</p>
<p xml:lang="zh-CN">Kollision 是一个休闲游戏，扔出球的同时并尽量躲避其他在桌子上的球。</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/po/de/docs/kollision/index.docbook new/kollision-17.08.0/po/de/docs/kollision/index.docbook
--- old/kollision-17.04.3/po/de/docs/kollision/index.docbook 2017-07-11 02:22:20.000000000 +0200
+++ new/kollision-17.08.0/po/de/docs/kollision/index.docbook 2017-08-11 02:41:15.000000000 +0200
@@ -318,7 +318,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>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/po/pt/docs/kollision/index.docbook new/kollision-17.08.0/po/pt/docs/kollision/index.docbook
--- old/kollision-17.04.3/po/pt/docs/kollision/index.docbook 2017-07-11 02:22:21.000000000 +0200
+++ new/kollision-17.08.0/po/pt/docs/kollision/index.docbook 2017-08-11 02:41:15.000000000 +0200
@@ -1,10 +1,8 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
- <!ENTITY kappname "<application
+ <!ENTITY kollision "<application
>Kollision</application
>">
- <!ENTITY kappversion "0.1">
- <!ENTITY package "kdegames">
<!ENTITY % Portuguese "INCLUDE">
<!ENTITY % addindex "IGNORE">
]>
@@ -12,7 +10,7 @@
<book id="kollision" lang="&language;">
<bookinfo>
<title
->Manual do &kappname;</title>
+>O Manual do &kollision;</title>
<authorgroup>
<author
><firstname
@@ -46,13 +44,13 @@
>&FDLNotice;</legalnotice>
<date
->2011-09-17</date>
+>2016-05-10</date>
<releaseinfo
->&kappversion; (&kde; 4.7)</releaseinfo
+>0.3 (Aplicações 16.04)</releaseinfo
>
<abstract>
<para
->Esta documentação descreve o jogo &kappname; na versão &kappversion;</para>
+>Esta documentação descreve o jogo &kollision; na versão 0.3</para>
</abstract>
<keywordset>
@@ -98,6 +96,19 @@
><para
>Faça com que a bola azul se mova pelo campo sem tocar nas bolas vermelhas.</para
></note>
+
+<screenshot>
+<mediaobject>
+<imageobject>
+<imagedata fileref="gameboard.png" format="PNG"/>
+</imageobject>
+<textobject>
+<phrase
+>Tabuleiro de Jogo do &kollision;</phrase>
+</textobject>
+</mediaobject>
+</screenshot>
+
<para
>Carregue no campo em branco para começar um jogo: uma bola azul irá substituir imediatamente o seu cursor do rato, começando a aparecer bolas vermelhas no campo. </para>
<para
@@ -161,11 +172,11 @@
<chapter id="interface"
><title
>Apresentação à Interface</title>
-<sect1 id="game-menu">
+
+<sect1 id="menu">
<title
->O Menu <guimenu
->Jogo</guimenu
-></title>
+>Opções do Menu</title>
+
<variablelist>
<varlistentry>
@@ -242,18 +253,9 @@
></term>
<listitem
><para
->Se seleccionar este item, irá terminar o seu jogo actual, saindo do &kappname;.</para
+>Se seleccionar este item, irá terminar o seu jogo actual, saindo do &kollision;.</para
></listitem>
</varlistentry>
-</variablelist>
-</sect1>
-
-<sect1 id="settings-menu">
-<title
->O Menu <guimenu
->Configuração</guimenu
-></title>
-<variablelist>
<varlistentry>
<term>
@@ -277,21 +279,6 @@
><menuchoice
><guimenu
>Configuração</guimenu
-><guimenuitem
->Mostrar a Barra de Estado</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
->Comuta a visibilidade da barra de estado no fundo da janela principal.</para
-></listitem>
-</varlistentry>
-
-<varlistentry>
-<term
-><menuchoice
-><guimenu
->Configuração</guimenu
> <guisubmenu
>Dificuldade</guisubmenu
></menuchoice
@@ -308,35 +295,23 @@
></listitem>
</varlistentry>
-<varlistentry>
-<term
-><menuchoice
-><guimenu
+</variablelist>
+
+<para
+>Para além disso, o &kollision; tem os menus de <guimenu
>Configuração</guimenu
-> <guimenuitem
->Configurar os Atalhos...</guimenuitem
-></menuchoice
-></term>
-<listitem
-><para
-><action
->Mostra uma janela normal de configuração de atalhos de teclado do &kde;</action
-> para alterar os atalhos do teclado no &kappname;.</para
-></listitem>
-</varlistentry>
+> e <guimenu
+>Ajuda</guimenu
+> 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
->Ajuda</guimenu
-></title>
-&help.menu.documentation; </sect1>
</chapter>
-
<chapter id="faq"
><title
>Perguntas mais frequentes</title>
@@ -358,7 +333,7 @@
></question>
<answer
><para
->Não. O &kappname; só poderá ser jogado com o rato.</para
+>Não. O &kollision; só poderá ser jogado com o rato.</para
></answer>
</qandaentry>
<qandaentry>
@@ -368,7 +343,7 @@
></question>
<answer
><para
->O &kappname; não tem uma funcionalidade de <quote
+>O &kollision; não tem uma funcionalidade de <quote
>Dica</quote
>.</para
></answer>
@@ -380,7 +355,7 @@
></question>
<answer
><para
->Não pode gravar jogos no &kappname;.</para
+>Não pode gravar jogos no &kollision;.</para
></answer>
</qandaentry>
</qandaset>
@@ -390,7 +365,7 @@
><title
>Créditos e Licença</title>
<para
->&kappname; </para>
+>&kollision; </para>
<para
>'Copyright' 2007-2008 de Paolo Capriotti <email
>p.capriotti@gmail.com</email
@@ -410,18 +385,7 @@
></para
>
&underFDL; &underGPL; </chapter>
-
-<appendix id="installation">
-<title
->Compilação e Instalação</title>
-
-&install.intro.documentation;
-
-&install.compile.documentation;
-
-</appendix>
-
&documentation.index;
</book>
<!--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/po/tr/kollision.po new/kollision-17.08.0/po/tr/kollision.po
--- old/kollision-17.04.3/po/tr/kollision.po 2017-07-11 02:22:20.000000000 +0200
+++ new/kollision-17.08.0/po/tr/kollision.po 2017-08-11 02:41:15.000000000 +0200
@@ -12,8 +12,8 @@
"POT-Creation-Date: 2016-11-19 20:15+0100\n"
"PO-Revision-Date: 2017-05-16 12:42+0000\n"
"Last-Translator: Mete <metebilgin48@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"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-17.04.3/po/zh_CN/kollision.po new/kollision-17.08.0/po/zh_CN/kollision.po
--- old/kollision-17.04.3/po/zh_CN/kollision.po 2017-07-11 02:22:20.000000000 +0200
+++ new/kollision-17.08.0/po/zh_CN/kollision.po 2017-08-11 02:41:15.000000000 +0200
@@ -1,23 +1,20 @@
-# translation of kollision.po to
-# Copyright (C) 2008 This_file_is_part_of_KDE
-# This file is distributed under the same license as the kollision package.
-#
-# Lie_Ex <lilith.ex@gmail.com>, 2008,2009.
-# Ni Hui <shuizhuyuanluo@126.com>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: kollision\n"
+"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-11-19 20:15+0100\n"
-"PO-Revision-Date: 2010-11-10 14:28+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/kollision.pot\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -201,12 +198,3 @@
#, kde-format
msgid "&Animation smoothness:"
msgstr "动画平滑度(&A)："
-
-#~ msgid "Difficulty of the game."
-#~ msgstr "游戏难度。"
-
-#~ msgid "Abort game"
-#~ msgstr "中止游戏"
-
-#~ msgid "4 balls"
-#~ msgstr "4 颗球"
2673
Age (days ago)
2673
Last active (days ago)
0 comments
1 participants
participants (1)
-
root＠hilbert.suse.de