Hello community,
here is the log from the commit of package pairs for openSUSE:Factory checked in at 2013-12-02 12:34:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pairs (Old)
and /work/SRC/openSUSE:Factory/.pairs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pairs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pairs/pairs.changes 2013-10-03 16:06:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pairs.new/pairs.changes 2013-12-02 12:34:25.000000000 +0100
@@ -1,0 +2,21 @@
+Sat Nov 16 18:18:37 UTC 2013 - tittiatcoke@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:20:49 UTC 2013 - tittiatcoke@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:36:19 UTC 2013 - tittiatcoke@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:
----
pairs-4.11.2.tar.xz
New:
----
pairs-4.11.90.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pairs.spec ++++++
--- /var/tmp/diff_new_pack.4F2cbM/_old 2013-12-02 12:34:26.000000000 +0100
+++ /var/tmp/diff_new_pack.4F2cbM/_new 2013-12-02 12:34:26.000000000 +0100
@@ -17,7 +17,7 @@
Name: pairs
-Version: 4.11.2
+Version: 4.11.90
Release: 0
Summary: Memory and Pairs Game
License: GPL-2.0+
++++++ pairs-4.11.2.tar.xz -> pairs-4.11.90.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/main.cpp new/pairs-4.11.90/game/main.cpp
--- old/pairs-4.11.2/game/main.cpp 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/game/main.cpp 2013-08-25 06:16:46.000000000 +0200
@@ -43,7 +43,7 @@
KAboutData about("pairs", 0, ki18n("pairs"), version, ki18n(description),
KAboutData::License_GPL, ki18n("(C) 2011 Aleix Pol Gonzalez"), KLocalizedString(), 0);
about.addAuthor( ki18n("Aleix Pol Gonzalez"), ki18n("Initial implementation and maintainer"), "aleixpol@kde.org" );
- about.addAuthor( ki18n("Marco Calignano"), ki18n("Theme support enhancement and general feature development"), "marco.calignano@googlemail.com");
+ about.addAuthor( ki18n("Marco Calignano"), ki18n("Theme support enhancement and general feature development"), "marco.calignano@gmail.com");
about.addAuthor( ki18n("Albert Astals Cid"), ki18n("Initial project setup and ideas"), "aacid@kde.org" );
KCmdLineArgs::init(argc, argv, &about);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/pairs.desktop new/pairs-4.11.90/game/pairs.desktop
--- old/pairs-4.11.2/game/pairs.desktop 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/game/pairs.desktop 2013-08-25 06:16:46.000000000 +0200
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=Pairs
+Name[bg]=Двойки
Name[bs]=Parovi
Name[ca]=Pairs
Name[ca@valencia]=Pairs
@@ -30,6 +31,7 @@
Name[sl]=Pari
Name[sv]=Par
Name[tr]=Pairs
+Name[ug]=جۈپلەر
Name[uk]=Pairs
Name[x-test]=xxPairsxx
Name[zh_CN]=Pairs
@@ -38,6 +40,7 @@
Icon=pairs
Type=Application
GenericName=A game to enhance your memory
+GenericName[bg]=Игра за подобряване на паметта ви
GenericName[bs]=Igra za poboljšanje memorije
GenericName[ca]=Un joc per millorar la teva memòria
GenericName[ca@valencia]=Un joc per millorar la teva memòria
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/qml/InfoPage.qml new/pairs-4.11.90/game/qml/InfoPage.qml
--- old/pairs-4.11.2/game/qml/InfoPage.qml 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/game/qml/InfoPage.qml 2013-08-25 06:16:46.000000000 +0200
@@ -68,7 +68,7 @@
},
Author {
name: "Marco Calignano"
- email: "marco.calignano@googlemail.com"
+ email: "marco.calignano@gmail.com"
description: i18n("Theme support enhancement and general feature development")
},
Author {
@@ -82,12 +82,5 @@
description: i18n("Graphic design and icons")
}
]
- footer: Button {
- width: parent.width
- text: i18n("Go back")
- font.pixelSize: 30
- font.bold: true
- height: 40
- }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/qml/Main.qml new/pairs-4.11.90/game/qml/Main.qml
--- old/pairs-4.11.2/game/qml/Main.qml 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/game/qml/Main.qml 2013-08-25 06:16:46.000000000 +0200
@@ -119,6 +119,15 @@
fgame.stopGame()
}
}
+ Button {
+ width: tools.buttonWidth
+ source: "image://icon/go-previous"
+ text: i18n("Go Back")
+ visible: game.state=="info"
+ onClicked: {
+ game.state="newgame"
+ }
+ }
}
}
@@ -132,7 +141,7 @@
margins: 20
bottomMargin: playersControl.visible ? 20 : 0
}
-
+ visible: game.state!="info"
GridView {
anchors {
fill: parent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindow.cpp new/pairs-4.11.90/pairseditor/mainwindow.cpp
--- old/pairs-4.11.2/pairseditor/mainwindow.cpp 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/pairseditor/mainwindow.cpp 2013-08-25 06:16:46.000000000 +0200
@@ -40,15 +40,15 @@
#include <KTar>
#include <KActionCollection>
-MainWindow::MainWindow(QWidget *parent) : KXmlGuiWindow(parent)
+MainWindow::MainWindow(QWidget *parent)
+ : KXmlGuiWindow(parent)
+ , m_pt(0)
+ , m_selectedItem(0)
+ , m_model(0)
+ , m_tmpDir(0)
+ , m_process(0)
+ , m_fileSaved(true)
{
-
- m_selectedItem = 0;
- m_pt = 0;
- m_model = 0;
- m_tmpDir = 0;
- m_process = 0;
- m_fileSaved = true;
setMinimumSize (900, 400);
m_mainWidget = new MainWindowView(this);
connect(m_mainWidget, SIGNAL(changed()), this, SLOT(doChange()));
@@ -196,7 +196,6 @@
m_mainWidget->widgetsHide();
m_fileSaved = true;
setCaption(m_mainWidget->title(), !m_fileSaved);
-
}
void MainWindow::doOpen()
@@ -224,7 +223,7 @@
return newFile;
}
-void MainWindow::extract(QString path)
+void MainWindow::extract(const QString& path)
{
KTar archive(path);
newTmpDir(QDir::tempPath() + '/' + QFileInfo(path).fileName());
@@ -240,7 +239,7 @@
archive.close();
}
-void MainWindow::compress(QString path)
+void MainWindow::compress(const QString& path)
{
KTar archive(path);
const bool opened = archive.open(QIODevice::WriteOnly);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindow.h new/pairs-4.11.90/pairseditor/mainwindow.h
--- old/pairs-4.11.2/pairseditor/mainwindow.h 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/pairseditor/mainwindow.h 2013-08-25 06:16:46.000000000 +0200
@@ -72,8 +72,8 @@
bool m_fileSaved;
void newTmpDir(const QString &path);
- void extract(QString path);
- void compress(QString path);
+ void extract(const QString& path);
+ void compress(const QString& path);
bool askToSave();
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindowview.cpp new/pairs-4.11.90/pairseditor/mainwindowview.cpp
--- old/pairs-4.11.2/pairseditor/mainwindowview.cpp 2013-08-28 19:04:06.000000000 +0200
+++ new/pairs-4.11.90/pairseditor/mainwindowview.cpp 2013-08-25 06:16:46.000000000 +0200
@@ -28,6 +28,7 @@
#include "thememodel.h"
#include "elementitem.h"
#include "featureitem.h"
+#include <QMenu>
#include