Hello community, here is the log from the commit of package picmi for openSUSE:Factory checked in at 2013-04-18 10:41:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picmi (Old) and /work/SRC/openSUSE:Factory/.picmi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "picmi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/picmi/picmi.changes 2013-03-14 15:36:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.picmi.new/picmi.changes 2013-04-18 10:41:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 1 19:45:25 UTC 2013 - [email protected] + +- Update to 4.10.2 \n * Bugfixes + +------------------------------------------------------------------- Old: ---- picmi-4.10.1.tar.xz New: ---- picmi-4.10.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picmi.spec ++++++ --- /var/tmp/diff_new_pack.p4eiHE/_old 2013-04-18 10:41:26.000000000 +0200 +++ /var/tmp/diff_new_pack.p4eiHE/_new 2013-04-18 10:41:26.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Logic Url: http://www.kde.org -Version: 4.10.1 +Version: 4.10.2 Release: 0 Source0: picmi-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ picmi-4.10.1.tar.xz -> picmi-4.10.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/GNUmakefile new/picmi-4.10.2/GNUmakefile --- old/picmi-4.10.1/GNUmakefile 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/GNUmakefile 2013-03-29 08:09:30.000000000 +0100 @@ -1,6 +1,6 @@ bake: mkdir -p build - cd build; cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="/usr" ..; make -j3 + cd build; cmake -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="/usr" -DQT_QMAKE_EXECUTABLE=qmake-qt4 ..; make -j3 clean: rm -r build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/Messages.sh new/picmi-4.10.2/Messages.sh --- old/picmi-4.10.1/Messages.sh 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/Messages.sh 2013-03-29 08:09:30.000000000 +0100 @@ -1,5 +1,7 @@ #!bin/sh +# extract level names for translation +$EXTRACTATTR --attr=board,name --attr=board,author levels/default.xml >> rc.cpp # invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources # the results are stored in a pseudo .cpp file to be picked up by xgettext. $EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp Files old/picmi-4.10.1/doc/index.cache.bz2 and new/picmi-4.10.2/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/levels/default.xml new/picmi-4.10.2/levels/default.xml --- old/picmi-4.10.1/levels/default.xml 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/levels/default.xml 2013-03-29 08:09:30.000000000 +0100 @@ -1,3 +1,5 @@ +<?xml version="1.0"?> + <picmi name="Default"> <board name="Baby Chick" author="Moni Linke" difficulty="5"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/picmi.desktop new/picmi-4.10.2/picmi.desktop --- old/picmi-4.10.1/picmi.desktop 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/picmi.desktop 2013-03-29 08:09:30.000000000 +0100 @@ -14,12 +14,15 @@ Name[hu]=picmi Name[it]=picmi Name[kk]=picmi +Name[mr]=पिक्मि Name[nb]=picmi Name[nds]=Picmi Name[nl]=picmi +Name[nn]=picmi Name[pl]=picmi Name[pt]=picmi Name[pt_BR]=picmi +Name[ru]=picmi Name[sk]=picmi Name[sl]=picmi Name[sr]=Пикми @@ -46,12 +49,15 @@ GenericName[hu]=Logikai játék GenericName[it]=Gioco di logica GenericName[kk]=Логикалық ойын +GenericName[mr]=तर्क खेळ GenericName[nb]=Logikkspill GenericName[nds]=Logikspeel GenericName[nl]=Logisch spel +GenericName[nn]=Hjernetrim GenericName[pl]=Gra logiczna GenericName[pt]=Jogo de Lógica GenericName[pt_BR]=Jogo de lógica +GenericName[ru]=Логическая игра GenericName[sk]=Logická hra GenericName[sl]=Logična igra GenericName[sr]=Логичка игра @@ -77,11 +83,14 @@ Comment[hu]=Egy számos logikai játék Comment[it]=Un gioco di logica con i numeri Comment[kk]=Сандық логика ойны +Comment[mr]=संख्या तर्क खेळ Comment[nb]=Et spill med tall-logikk Comment[nl]=Een logisch spel met nummers +Comment[nn]=Talbasert hjernetrim Comment[pl]=Liczbowa gra logiczna Comment[pt]=Um jogo lógico com números Comment[pt_BR]=Jogo de lógica com números +Comment[ru]=Логическая игра с числами Comment[sk]=Číselná logická hra Comment[sl]=Logična igra s številkami Comment[sr]=Логичка игра с бројевима diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/src/logic/levelloader.cpp new/picmi-4.10.2/src/logic/levelloader.cpp --- old/picmi-4.10.1/src/logic/levelloader.cpp 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/src/logic/levelloader.cpp 2013-03-29 08:09:30.000000000 +0100 @@ -25,6 +25,7 @@ #include <QFile> #include <QSettings> #include <kglobal.h> +#include <klocale.h> #include <kstandarddirs.h> #include "src/systemexception.h" @@ -49,7 +50,7 @@ bool LevelList::containsLevel(QSharedPointer<Level> level) const { for (int i = 0; i < size(); i++) { - if (at(i)->name() == level->name() && at(i)->author() == level->author()) { + if (*at(i) == *level) { return true; } } @@ -67,6 +68,16 @@ return QString(name().length(), QChar(0x26AB)); } +QString Level::name() const { + QByteArray bytes = m_name.toUtf8(); + return i18n(bytes.constData()); +} + +QString Level::author() const { + QByteArray bytes = m_author.toUtf8(); + return i18n(bytes.constData()); +} + QString Level::key() const { return QString("preset_scores/%1_%2").arg(m_levelset, m_name); } @@ -118,6 +129,10 @@ writeSettings(seconds); } +bool Level::operator==(const Level &that) const { + return (that.m_name == m_name && that.m_author == m_author); +} + QList<QSharedPointer<Level> > LevelLoader::load() { const QString prefix = "levels/"; QList<QString> paths; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/src/logic/levelloader.h new/picmi-4.10.2/src/logic/levelloader.h --- old/picmi-4.10.1/src/logic/levelloader.h 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/src/logic/levelloader.h 2013-03-29 08:09:30.000000000 +0100 @@ -37,8 +37,8 @@ public: Level(); - QString name() const { return m_name; } - QString author() const { return m_author; } + QString name() const; + QString author() const; QString levelset() const { return m_levelset; } int difficulty() const { return m_difficulty; } int width() const { return m_width; } @@ -51,6 +51,8 @@ int solvedTime() const { return m_solved_time; } void setSolved(int seconds); + bool operator==(const Level &that) const; + private: void finalize(); /* needs to be called by loader when done constructing */ void constructPreview(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.1/themes/picmi.desktop new/picmi-4.10.2/themes/picmi.desktop --- old/picmi-4.10.1/themes/picmi.desktop 2013-03-01 08:23:49.000000000 +0100 +++ new/picmi-4.10.2/themes/picmi.desktop 2013-03-29 08:09:30.000000000 +0100 @@ -15,12 +15,15 @@ Name[hu]=Picmi Name[it]=Picmi Name[kk]=Picmi +Name[mr]=पिक्मि Name[nb]=Picmi Name[nds]=Picmi Name[nl]=Picmi +Name[nn]=Picmi Name[pl]=Picmi Name[pt]=Picmi Name[pt_BR]=Picmi +Name[ru]=Picmi Name[sk]=Picmi Name[sl]=Picmi Name[sr]=Пикми -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
