[SCM] KDE Games module packaging branch, master, updated. debian/4.8.4-1-2-g44b56da
Pino Toscano
pino at alioth.debian.org
Tue Jul 17 11:43:09 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdegames.git;a=commitdiff;h=44b56da
The following commit has been merged in the master branch:
commit 44b56dab1a357b563a761c93fb28a01fb9d97c54
Author: Pino Toscano <pino at debian.org>
Date: Tue Jul 17 13:42:30 2012 +0200
fix kajongg for newer SQLite/QtSql versions
backport upstream r1301756 and r1301764
---
debian/changelog | 4 ++++
debian/patches/series | 2 ++
debian/patches/upstream_r1301756.diff | 20 ++++++++++++++++++++
debian/patches/upstream_r1301764.diff | 26 ++++++++++++++++++++++++++
4 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a253fa2..67ad21b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
kdegames (4:4.8.4-2) UNRELEASED; 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.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 17 Jul 2012 13:23:36 +0200
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a144f89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_r1301756.diff
+upstream_r1301764.diff
diff --git a/debian/patches/upstream_r1301756.diff b/debian/patches/upstream_r1301756.diff
new file mode 100644
index 0000000..e4be48f
--- /dev/null
+++ b/debian/patches/upstream_r1301756.diff
@@ -0,0 +1,20 @@
+Author: Wolfgang Rohdewald <wolfgang at 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 --git a/debian/patches/upstream_r1301764.diff b/debian/patches/upstream_r1301764.diff
new file mode 100644
index 0000000..5e2214a
--- /dev/null
+++ b/debian/patches/upstream_r1301764.diff
@@ -0,0 +1,26 @@
+Author: Wolfgang Rohdewald <wolfgang at 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):
--
KDE Games module packaging
More information about the pkg-kde-commits
mailing list