Hello community,

here is the log from the commit of package ksirk for openSUSE:Factory checked 
in at 2013-08-16 13:45:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ksirk (Old)
 and      /work/SRC/openSUSE:Factory/.ksirk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ksirk"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes      2013-07-30 
16:04:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2013-08-16 
13:45:32.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug  8 15:34:07 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.11.0
+   * KDE 4.11 Final release
+   * See http://www.kde.org/announcements/4.11/
+
+-------------------------------------------------------------------

Old:
----
  ksirk-4.10.97.tar.xz

New:
----
  ksirk-4.11.0.tar.xz

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

Other differences:
------------------
++++++ ksirk.spec ++++++
--- /var/tmp/diff_new_pack.EhtlqW/_old  2013-08-16 13:45:33.000000000 +0200
+++ /var/tmp/diff_new_pack.EhtlqW/_new  2013-08-16 13:45:33.000000000 +0200
@@ -21,7 +21,7 @@
 License:        GPL-2.0+ and LGPL-2.0+
 Group:          Amusements/Games/Strategy/Turn Based
 Url:            http://www.kde.org
-Version:        4.10.97
+Version:        4.11.0
 Release:        0
 Source0:        ksirk-%{version}.tar.xz
 BuildRequires:  libkdegames-devel

++++++ ksirk-4.10.97.tar.xz -> ksirk-4.11.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ksirk-4.10.97/ksirk/kgamewin.cpp 
new/ksirk-4.11.0/ksirk/kgamewin.cpp
--- old/ksirk-4.10.97/ksirk/kgamewin.cpp        2013-07-10 01:32:49.000000000 
+0200
+++ new/ksirk-4.11.0/ksirk/kgamewin.cpp 2013-08-06 14:49:07.000000000 +0200
@@ -800,6 +800,8 @@
   m_secondCountry->releaseHighlightingLock();
   m_secondCountry->clearHighlighting();
 
+  // Bug 315491.
+  bool playerDeleted = false;
   bool res = false;
   QString mes = "";
   kDebug() << "There is now " << m_secondCountry-> nbArmies() << " armies in " 
<< m_secondCountry->name() << ".";
@@ -838,6 +840,8 @@
                                i18n("KsirK - Game Over!"));*/
       if (m_automaton->isAdmin())
       {
+        // Bug 315491.
+        playerDeleted = true;
         kDebug() << "Removing player " << oldOwner-> name();
         int i = m_automaton->playerList()->indexOf(oldOwner);
         if (i != -1)
@@ -872,15 +876,19 @@
       m_automaton->checkGoal();
     }
   }
-  if (backGnd()->bgIsArena())
+  // Bug 315491.
+  if (!playerDeleted)
   {
-    m_arena->countryAttack()->createArmiesSprites();
-    m_arena->countryDefense()->createArmiesSprites();
-  }
-  else
-  {
-    m_firstCountry->createArmiesSprites();
-    m_secondCountry->createArmiesSprites();
+    if (backGnd()->bgIsArena())
+    {
+      m_arena->countryAttack()->createArmiesSprites();
+      m_arena->countryDefense()->createArmiesSprites();
+    }
+    else
+    {
+      m_firstCountry->createArmiesSprites();
+      m_secondCountry->createArmiesSprites();
+    }
   }
   if (m_automaton->isAdmin())
   {

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to