Add v0.0.2 of Hermes from source tarball

diff --git a/package/Makefile b/package/Makefile
index 3a74903..ce009e3 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,4 +1,6 @@
 compile:
+       perl -ni -e 'print; exit if /^XB-Maemo-Icon-26:$$/' debian/control
+       uuencode -m share/hermes-48.png - | perl -ne 'print " $$_" unless $$. == 1 or /^====$$/' >>debian/control
        py_compilefiles src/*.py
        mkdir bin
        gcc -o bin/contact-update -std=c99 `pkg-config --cflags --libs libebook-1.2 glib-2.0` src/contact-update.c

diff --git a/package/debian/changelog b/package/debian/changelog
index 0d7ee2a..55e629c 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,5 +1,13 @@
+hermes (0.0.2) unstable; urgency=low
+
+  * Fix missing python-gconf dependency.
+  * Fix "FacebookError is not defined".
+  * Include Tim Samoff's updated icons.
+
+ -- Andrew Flegg <andrew@bleb.org>  Fri,  2 Oct 2009 08:39:26 +0100
+
 hermes (0.0.1) unstable; urgency=low
 
   * Initial Release.
 
- -- unknown <andrew@bleb.org>  Wed, 30 Sep 2009 21:21:27 +0100
+ -- Andrew Flegg <andrew@bleb.org>  Wed, 30 Sep 2009 21:21:27 +0100

diff --git a/package/debian/control b/package/debian/control
index ca4f355..178d1b3 100644 (file)
--- a/package/debian/control
+++ b/package/debian/control
@@ -2,14 +2,14 @@ Source: hermes
 Section: user/utilities
 Priority: extra
 Maintainer: Andrew Flegg <andrew@bleb.org>
-Build-Depends: debhelper (>= 5), python-runtime | python2.5-runtime, libebook-dev
+Build-Depends: debhelper (>= 5), python-runtime | python2.5-runtime, libebook-dev, sharutils
 Standards-Version: 3.7.2
 
 Package: hermes
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python-imaging |
  python2.5-imaging, python-osso | python2.5-osso, python-hildon |
- python2.5-hildon, python-twitter, python-facebook, python-evolution
+ python2.5-hildon, python-twitter, python-facebook, python-evolution, python-gconf
 Description: Enrich contacts' information from social networks.
  Hermes, the Greek god of communication, will fill in the gaps in your
  contacts' address book. Photos and birthdays for your friends on

diff --git a/package/share/hermes-256.png b/package/share/hermes-256.png
index 0f7f74b..524cd5d 100644 (file)
Binary files a/package/share/hermes-256.png and b/package/share/hermes-256.png differ

diff --git a/package/share/hermes-48.png b/package/share/hermes-48.png
index b33674e..d6240ca 100644 (file)
Binary files a/package/share/hermes-48.png and b/package/share/hermes-48.png differ

diff --git a/package/share/hermes-64.png b/package/share/hermes-64.png
index 083d453..9f4d645 100644 (file)
Binary files a/package/share/hermes-64.png and b/package/share/hermes-64.png differ

diff --git a/package/src/gui.py b/package/src/gui.py
index ae572da..db6d071 100755 (executable)
--- a/package/src/gui.py
+++ b/package/src/gui.py
@@ -3,6 +3,7 @@
 import gtk, gobject
 import gnome.gconf
 import hildon, osso
+import traceback
 import time
 import thread
 from hermes import Hermes
@@ -43,7 +44,7 @@ class HermesGUI:
         gobject.idle_add(hildon.hildon_banner_show_information, self.window, '', "Updated %d contacts" % (len(fb2c.updated)))
         gobject.idle_add(self.window.set_property, 'sensitive', True)
       except Exception, e:
-        print e
+        traceback.print_exc()
         gobject.idle_add(self.report_error, 'Something went wrong: ' + e.message)
 
 
@@ -166,7 +167,7 @@ class HermesGUI:
     self.app = hildon.Program()
     self.window = hildon.Window()
     gtk.set_application_name('Hermes')
-    osso_context = osso.Context('org.maemo.hermes', '0.0.1', False)
+    osso_context = osso.Context('org.maemo.hermes', '0.0.2', False)
     self.app.add_window(self.window)
 
     self.window.connect("delete-event", gtk.main_quit)

diff --git a/package/src/hermes.py b/package/src/hermes.py
index f2178ee..6f94c86 100644 (file)
--- a/package/src/hermes.py
+++ b/package/src/hermes.py
@@ -1,6 +1,6 @@
 import os.path
 import evolution
-from facebook import Facebook
+from facebook import Facebook, FacebookError
 import twitter
 import gnome.gconf
 from contacts import ContactStore