[Pkg-sugar-commit] [sugar-browse-activity] 09/32: Replace patch 1002 with improved workaround from upstream jhconvert tool.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/108-10
in repository sugar-browse-activity.

commit 86c8ae437f9a6b327b29b1bf2d825c6ede1797e6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 12 17:16:06 2009 +0200

    Replace patch 1002 with improved workaround from upstream jhconvert tool.
---
 debian/patches/1002_revert_gnome_hack.patch | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/patches/1002_revert_gnome_hack.patch b/debian/patches/1002_revert_gnome_hack.patch
index def04d1..4535ce3 100644
--- a/debian/patches/1002_revert_gnome_hack.patch
+++ b/debian/patches/1002_revert_gnome_hack.patch
@@ -1,13 +1,19 @@
+diff --git a/webactivity.py b/webactivity.py
 --- a/webactivity.py
 +++ b/webactivity.py
-@@ -31,10 +31,6 @@
+@@ -31,9 +31,12 @@ import sqlite3
  import cjson
  import gconf
  
 -# HACK: Needed by http://dev.sugarlabs.org/ticket/456
 -import gnome
 -gnome.init('Hulahop', '1.0')
--
++try:
++    # HACK: Needed by http://dev.sugarlabs.org/ticket/456
++    import gnome
++    gnome.init('Hulahop', '1.0')
++except:
++    pass
+ 
  from sugar.activity import activity
  from sugar.graphics import style
- import telepathy

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-browse-activity.git