Bug#691005: unblock: kdegames/4:4.8.4-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package kdegames
This packages adds two patches taken from upstream to fix kajongg for new
SQLite/QtSql versions. It closes #683856 whith severity important.
It also improves the kajongg dependencies:
- add missing epochs in dependencies needing them
- tighten kdegames-mahjongg-data to at least the same source version
diffstat:
changelog | 15 +++++++++++++++
control | 7 ++++---
patches/series | 2 ++
patches/upstream_r1301756.diff | 20 ++++++++++++++++++++
patches/upstream_r1301764.diff | 26 ++++++++++++++++++++++++++
5 files changed, 67 insertions(+), 3 deletions(-)
unblock kdegames/4:4.8.4-2
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: mips
i386
Kernel: Linux 3.2.21+edid (SMP w/2 CPU cores)
Locale: LANG=es_AR.UTF-8, LC_CTYPE=es_AR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru kdegames-4.8.4/debian/changelog kdegames-4.8.4/debian/changelog
--- kdegames-4.8.4/debian/changelog 2012-06-16 18:27:31.000000000 -0300
+++ kdegames-4.8.4/debian/changelog 2012-10-19 20:01:04.000000000 -0300
@@ -1,3 +1,18 @@
+kdegames (4:4.8.4-2) unstable; urgency=low
+
+ [ Pino Toscano ]
+ * Backport upstream r1301756 and r1301764 to fix kajongg for newer
+ SQLite/QtSql versions; patches upstream_r1301756.diff and
+ upstream_r1301764.diff. (Closes: #683856)
+ * Improve the kajongg dependencies:
+ - add missing epochs in dependencies needing them
+ - tighten kdegames-mahjongg-data to at least the same source version
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Add myself to Uploaders.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Fri, 19 Oct 2012 20:00:48 -0300
+
kdegames (4:4.8.4-1) unstable; urgency=low
* New upstream release
diff -Nru kdegames-4.8.4/debian/control kdegames-4.8.4/debian/control
--- kdegames-4.8.4/debian/control 2012-06-16 17:31:25.000000000 -0300
+++ kdegames-4.8.4/debian/control 2012-10-19 19:58:48.000000000 -0300
@@ -4,7 +4,7 @@
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Daniel Schepler <schepler@debian.org>, Sune Vuorela <sune@debian.org>, Fathi Boudra <fabo@debian.org>,
Modestas Vainius <modax@debian.org>, George Kiagiadakis <gkiagiad@csd.uoc.gr>,
- Eshat Cakar <info@eshat.de>
+ Eshat Cakar <info@eshat.de>, Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.3.0), libqt4-opengl-dev,
@@ -563,8 +563,9 @@
Package: kajongg
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-twisted-core (>= 8.2.0),
- python-qt4-sql (>= 4.6), python-kde4 (>= 4.3.0), libsqlite3-0 (>= 3.5.0),
- libqt4-sql-sqlite (>= 4.6), kdegames-mahjongg-data, vorbis-tools
+ python-qt4-sql (>= 4:4.6), python-kde4 (>= 4:4.3.0), libsqlite3-0 (>= 3.5.0),
+ libqt4-sql-sqlite (>= 4.6), kdegames-mahjongg-data (>= ${source:Version}),
+ vorbis-tools
Description: classical Mah Jongg game
This is the classical Mah Jongg for four players.
If you are looking for the Mah Jongg solitaire please use the application
diff -Nru kdegames-4.8.4/debian/patches/series kdegames-4.8.4/debian/patches/series
--- kdegames-4.8.4/debian/patches/series 2012-06-16 17:37:17.000000000 -0300
+++ kdegames-4.8.4/debian/patches/series 2012-10-19 19:56:33.000000000 -0300
@@ -0,0 +1,2 @@
+upstream_r1301756.diff
+upstream_r1301764.diff
diff -Nru kdegames-4.8.4/debian/patches/upstream_r1301756.diff kdegames-4.8.4/debian/patches/upstream_r1301756.diff
--- kdegames-4.8.4/debian/patches/upstream_r1301756.diff 1969-12-31 21:00:00.000000000 -0300
+++ kdegames-4.8.4/debian/patches/upstream_r1301756.diff 2012-10-19 19:56:33.000000000 -0300
@@ -0,0 +1,20 @@
+Author: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Description: Query: converting QVariant to python values: accept QVariant.Invalid
+ .
+ and convert it to None. Bug reported by mail by Xavier Besnard (french
+ translator), but I cannot reproduce it.
+ .
+ Local Game: Query: variant type None not implemented for field max(id)
+Applied-Upstream: 4.10, commit:1301756
+
+--- a/kajongg/src/query.py
++++ b/kajongg/src/query.py
+@@ -152,6 +152,8 @@ class Query(object):
+ value = self.query.value(idx).toLongLong()[0]
+ elif valType == QVariant.ULongLong:
+ value = self.query.value(idx).toULongLong()[0]
++ elif valType == QVariant.Invalid:
++ value = None
+ else:
+ raise Exception('Query: variant type %s not implemented for field %s ' % \
+ (QVariant.typeToName(valType), name))
diff -Nru kdegames-4.8.4/debian/patches/upstream_r1301764.diff kdegames-4.8.4/debian/patches/upstream_r1301764.diff
--- kdegames-4.8.4/debian/patches/upstream_r1301764.diff 1969-12-31 21:00:00.000000000 -0300
+++ kdegames-4.8.4/debian/patches/upstream_r1301764.diff 2012-10-19 19:56:33.000000000 -0300
@@ -0,0 +1,26 @@
+Author: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Description: this continues the fix from r1301756
+ .
+ those two commits are needed for ubuntu quantal which is using the latest
+ sqlite / qtsql packages
+Applied-Upstream: 4.10, commit:1301764
+
+--- a/kajongg/src/scoringengine.py
++++ b/kajongg/src/scoringengine.py
+@@ -261,10 +261,12 @@ class Ruleset(object):
+ if used is not None:
+ self.__used = used
+ records = Query("select max(id)+1 from %s" % self.__rulesetTable()).records
+- try:
+- return int(records[0][0])
+- except ValueError:
+- return 1
++ if records and records[0] and records[0][0]:
++ try:
++ return int(records[0][0])
++ except ValueError:
++ return 1
++ return 1
+
+ @staticmethod
+ def nameIsDuplicate(name):
Reply to: