r31822 - in /desktop/unstable/gnome-games/debian: changelog control control.in patches/90_fix-sudoku-borders.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Thu Nov 24 18:58:33 2011
New Revision: 31822

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31822
Log:
* New upstream release.
* Merge from Ubuntu:
  - debian/patches/90_fix-sudoku-borders.patch: Bugzilla patch to
    fix missing borders in Sudoku (LP: #844385).
* Tighten aisleriot dependency to >= ${gnome:Version}.

Added:
    desktop/unstable/gnome-games/debian/patches/90_fix-sudoku-borders.patch
Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/control
    desktop/unstable/gnome-games/debian/control.in
    desktop/unstable/gnome-games/debian/patches/series

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=31822&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/changelog [utf-8] Thu Nov 24 18:58:33 2011
@@ -1,4 +1,4 @@
-gnome-games (1:3.2.0-1) UNRELEASED; urgency=low
+gnome-games (1:3.2.1-1) UNRELEASED; urgency=low
 
   [ Jeremy Bicha ]
   * New upstream stable release.
@@ -13,7 +13,14 @@
   * debian/pycompat: Dropped, obsolete.
   * debian/patches/01_theme_install.patch: Dropped, applied upstream
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Sun, 09 Oct 2011 17:21:54 -0400
+  [ Jordi Mallach ]
+  * New upstream release.
+  * Merge from Ubuntu:
+    - debian/patches/90_fix-sudoku-borders.patch: Bugzilla patch to
+      fix missing borders in Sudoku (LP: #844385).
+  * Tighten aisleriot dependency to >= ${gnome:Version}.
+
+ -- Jordi Mallach <jordi at debian.org>  Thu, 24 Nov 2011 19:47:53 +0100
 
 gnome-games (1:3.0.2-2) unstable; urgency=low
 

Modified: desktop/unstable/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control?rev=31822&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/control [utf-8] Thu Nov 24 18:58:33 2011
@@ -42,7 +42,7 @@
 Package: gnome-games
 Architecture: all
 Depends: ${misc:Depends},
-         aisleriot,
+         aisleriot (>= ${gnome:Version}),
          glchess (>= ${source:Version}),
          glines (>= ${source:Version}),
          gnect (>= ${source:Version}),

Modified: desktop/unstable/gnome-games/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control.in?rev=31822&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/control.in [utf-8] Thu Nov 24 18:58:33 2011
@@ -37,7 +37,7 @@
 Package: gnome-games
 Architecture: all
 Depends: ${misc:Depends},
-         aisleriot,
+         aisleriot (>= ${gnome:Version}),
          glchess (>= ${source:Version}),
          glines (>= ${source:Version}),
          gnect (>= ${source:Version}),

Added: desktop/unstable/gnome-games/debian/patches/90_fix-sudoku-borders.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/90_fix-sudoku-borders.patch?rev=31822&op=file
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/90_fix-sudoku-borders.patch (added)
+++ desktop/unstable/gnome-games/debian/patches/90_fix-sudoku-borders.patch [utf-8] Thu Nov 24 18:58:33 2011
@@ -1,0 +1,28 @@
+From 915ceeb7f9fc02413c93e247902b1fb2f953d9d7 Mon Sep 17 00:00:00 2001
+From: Edward Sheldrake <ejsheldrake at gmail.com>
+Date: Sat, 8 Oct 2011 14:42:32 +0100
+Subject: [PATCH] sudoku: fix borders
+
+Fixes python traceback printed to terminal that ends with:
+TypeError: 'Color' object does not support indexing
+
+Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=658519
+---
+ gnome-sudoku/src/lib/gsudoku.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gnome-sudoku/src/lib/gsudoku.py b/gnome-sudoku/src/lib/gsudoku.py
+index 79a0e21..b222f95 100644
+--- a/gnome-sudoku/src/lib/gsudoku.py
++++ b/gnome-sudoku/src/lib/gsudoku.py
+@@ -56,7 +56,7 @@ class SudokuNumberGrid (Gtk.AspectFrame):
+     def set_bg_color (self, color):
+         try:
+             if type(color) == str:
+-                color = Gdk.color_parse(color)[1]
++                color = Gdk.color_parse(color)
+                 color = Gdk.RGBA(color.red/65535.0, color.green/65535.0, color.blue/65535.0)
+             else:
+                 color = Gdk.RGBA(*color)
+-- 
+1.7.6.4

Modified: desktop/unstable/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/series?rev=31822&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/patches/series [utf-8] Thu Nov 24 18:58:33 2011
@@ -1,0 +1,1 @@
+90_fix-sudoku-borders.patch