Hello community, here is the log from the commit of package kajongg for openSUSE:Factory checked in at 2013-12-11 14:35:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kajongg (Old) and /work/SRC/openSUSE:Factory/.kajongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kajongg" Changes: -------- --- /work/SRC/openSUSE:Factory/kajongg/kajongg.changes 2013-12-02 12:34:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kajongg.new/kajongg.changes 2013-12-11 14:35:42.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 29 07:39:21 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.97 + * KDE 4.12 RC 1 release + * See http://www.kde.org/announcements/announce-4.12-rc.php + +------------------------------------------------------------------- +Sat Nov 23 22:53:27 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.95 + * KDE 4.12 Beta 3 release + * See http://www.kde.org/announcements/announce-4.12-beta3.php + +------------------------------------------------------------------- Old: ---- kajongg-4.11.90.tar.xz New: ---- kajongg-4.11.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kajongg.spec ++++++ --- /var/tmp/diff_new_pack.6NKbbB/_old 2013-12-11 14:35:43.000000000 +0100 +++ /var/tmp/diff_new_pack.6NKbbB/_new 2013-12-11 14:35:43.000000000 +0100 @@ -25,7 +25,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.11.90 +Version: 4.11.97 Release: 0 Source0: kajongg-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kajongg-4.11.90.tar.xz -> kajongg-4.11.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kajongg-4.11.90/src/predefined.py new/kajongg-4.11.97/src/predefined.py --- old/kajongg-4.11.90/src/predefined.py 2013-11-07 12:57:51.000000000 +0100 +++ new/kajongg-4.11.97/src/predefined.py 2013-11-17 23:01:35.000000000 +0100 @@ -173,35 +173,35 @@ 'with one of them'))) # doubling melds: - self.meldRules.add(Rule('{meldName}', 'FDragonPungKong', doubles=1)) - self.meldRules.add(Rule('{meldType} of Own Wind ({value})', 'FOwnWindPungKong', doubles=1)) - self.meldRules.add(Rule('{meldType} of Round Wind ({value})', 'FRoundWindPungKong', doubles=1)) + self.meldRules.add(Rule('Pung/Kong of Dragons', 'FDragonPungKong', explainTemplate='{meldName}', doubles=1)) + self.meldRules.add(Rule('Pung/Kong of Own Wind', 'FOwnWindPungKong', explainTemplate='{meldType} of Own Wind ({value})', doubles=1)) + self.meldRules.add(Rule('Pung/Kong of Round Wind', 'FRoundWindPungKong', explainTemplate='{meldType} of Round Wind ({value})', doubles=1)) # exposed melds: - self.meldRules.add(Rule('{meldName}', 'FExposedMinorKong', points=8)) - self.meldRules.add(Rule('{meldName}', 'FExposedTerminalsKong', points=16)) - self.meldRules.add(Rule('{meldName}', 'FExposedHonorsKong', points=16)) - - self.meldRules.add(Rule('{meldName}', 'FExposedMinorPung', points=2)) - self.meldRules.add(Rule('{meldName}', 'FExposedTerminalsPung', points=4)) - self.meldRules.add(Rule('{meldName}', 'FExposedHonorsPung', points=4)) + self.meldRules.add(Rule('Exposed Kong', 'FExposedMinorKong', explainTemplate='{meldName}', points=8)) + self.meldRules.add(Rule('Exposed Kong of Terminals', 'FExposedTerminalsKong', explainTemplate='{meldName}', points=16)) + self.meldRules.add(Rule('Exposed Kong of Honors', 'FExposedHonorsKong', explainTemplate='{meldName}', points=16)) + + self.meldRules.add(Rule('Exposed Pung', 'FExposedMinorPung', explainTemplate='{meldName}', points=2)) + self.meldRules.add(Rule('Exposed Pung of Terminals', 'FExposedTerminalsPung', explainTemplate='{meldName}', points=4)) + self.meldRules.add(Rule('Exposed Pung of Honors', 'FExposedHonorsPung', explainTemplate='{meldName}', points=4)) # concealed melds: - self.meldRules.add(Rule('{meldName}', 'FConcealedMinorKong', points=16)) - self.meldRules.add(Rule('{meldName}', 'FConcealedTerminalsKong', points=32)) - self.meldRules.add(Rule('{meldName}', 'FConcealedHonorsKong', points=32)) - - self.meldRules.add(Rule('{meldName}', 'FConcealedMinorPung', points=4)) - self.meldRules.add(Rule('{meldName}', 'FConcealedTerminalsPung', points=8)) - self.meldRules.add(Rule('{meldName}', 'FConcealedHonorsPung', points=8)) - - self.meldRules.add(Rule('Pair of Own Wind ({value})', 'FOwnWindPair', points=2)) - self.meldRules.add(Rule('Pair of Round Wind ({value})', 'FRoundWindPair', points=2)) - self.meldRules.add(Rule('{meldName}', 'FDragonPair', points=2)) + self.meldRules.add(Rule('Concealed Kong', 'FConcealedMinorKong', explainTemplate='{meldName}', points=16)) + self.meldRules.add(Rule('Concealed Kong of Terminals', 'FConcealedTerminalsKong', explainTemplate='{meldName}', points=32)) + self.meldRules.add(Rule('Concealed Kong of Honors', 'FConcealedHonorsKong', explainTemplate='{meldName}', points=32)) + + self.meldRules.add(Rule('Concealed Pung', 'FConcealedMinorPung', explainTemplate='{meldName}', points=4)) + self.meldRules.add(Rule('Concealed Pung of Terminals', 'FConcealedTerminalsPung', explainTemplate='{meldName}', points=8)) + self.meldRules.add(Rule('Concealed Pung of Honors', 'FConcealedHonorsPung', explainTemplate='{meldName}', points=8)) + + self.meldRules.add(Rule('Pair of Own Wind', 'FOwnWindPair', explainTemplate='Pair of Own Wind ({value})', points=2)) + self.meldRules.add(Rule('Pair of Round Wind', 'FRoundWindPair', explainTemplate='Pair of Round Wind ({value})', points=2)) + self.meldRules.add(Rule('Pair of Dragons', 'FDragonPair', explainTemplate='{meldName}', points=2)) # bonus tiles: - self.meldRules.add(Rule('{meldName}', 'FFlower', points=4)) - self.meldRules.add(Rule('{meldName}', 'FSeason', points=4)) + self.meldRules.add(Rule('Flower', 'FFlower', explainTemplate='{meldName}', points=4)) + self.meldRules.add(Rule('Season', 'FSeason', explainTemplate='{meldName}', points=4)) class ClassicalChineseDMJL(ClassicalChinese): """classical chinese rules, German rules""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kajongg-4.11.90/src/rule.py new/kajongg-4.11.97/src/rule.py --- old/kajongg-4.11.90/src/rule.py 2013-11-07 12:57:51.000000000 +0100 +++ new/kajongg-4.11.97/src/rule.py 2013-11-17 23:01:35.000000000 +0100 @@ -659,11 +659,12 @@ # pylint: disable=too-many-arguments,too-many-instance-attributes def __init__(self, name, definition='', points = 0, doubles = 0, limits = 0, parameter = None, - description=None, debug=False): + description=None, explainTemplate=None, debug=False): self.options = {} self.function = None self.hasSelectable = False self.name = name + self.explainTemplate = explainTemplate self.description = description self.score = Score(points, doubles, limits) self._definition = None @@ -787,12 +788,13 @@ def explain(self, meld): """use this rule for scoring""" - return '%s: %s' % ( m18n(self.name).format( - group=meld[0].groupName() if meld else '', - value=meld[0].valueName() if meld else '', - meldType=meld.typeName() if meld else '', - meldName=meld.name() if meld else '', - tileName=meld[0].name() if meld else '' + return '%s: %s' % ( m18n( + self.explainTemplate if self.explainTemplate else self.name).format( + group=meld[0].groupName() if meld else '', + value=meld[0].valueName() if meld else '', + meldType=meld.typeName() if meld else '', + meldName=meld.name() if meld else '', + tileName=meld[0].name() if meld else '' ).replace('&', '').replace(' ', ' ').strip(), self.score.contentStr()) def hashStr(self): -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
