Merge with Ross' work on Debian upstream (http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git)

debian/patches/0001-Correct-resource-path-in-setup.py.patch

@@ -0,0 +1,21 @@
+From: Ross Gammon <rossgammon@mail.dk>
+Date: Fri, 24 Jan 2014 23:20:58 +0100
+Subject: Correct resource path in setup.py
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 3f702ae..9622d75 100644
+--- a/setup.py
++++ b/setup.py
+@@ -248,7 +248,7 @@ class install(_install):
+                                      'utils', 'resource-path')
+         with io.open(resource_file, 'w', encoding='utf-8',
+                      errors='strict') as fp:
+-            path = os.path.abspath(os.path.join(self.install_data, 'share'))
++            path = os.path.join('/usr', 'share')
+             if sys.version_info[0] < 3:
+                 path = unicode(path)
+             fp.write(path)

debian/patches/0002-Disable-HTML-View.patch

@@ -0,0 +1,33 @@
+From: Ross Gammon <rossgammon@mail.dk>
+Date: Sat, 25 Jan 2014 16:48:20 +0100
+Subject: Disable HTML View
+
+* gramps/plugins/view/htmlrenderer.py: Comment out import of webkit module
+
+Origin: upstream, suggestion in INSTALL file if webkit unstable
+---
+ gramps/plugins/view/htmlrenderer.py | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gramps/plugins/view/htmlrenderer.py b/gramps/plugins/view/htmlrenderer.py
+index c41942a..8f35b16 100644
+--- a/gramps/plugins/view/htmlrenderer.py
++++ b/gramps/plugins/view/htmlrenderer.py
+@@ -122,11 +122,12 @@ user_pref("general.useragent.locale, %(lang)s);
+ 
+ TOOLKIT = NOWEB
+ 
+-try:
+-    from gi.repository import WebKit as webkit
+-    TOOLKIT = WEBKIT
+-except:
+-    pass
++#Disable webkit as it is causing a crash in Gramps 4.0.2
++#try:
++#    from gi.repository import WebKit as webkit
++#    TOOLKIT = WEBKIT
++#except:
++#    pass
+ 
+ #no interfaces present, raise Error so that options for GeoView do not show
+ if TOOLKIT == NOWEB :

debian/patches/series

@@ -0,0 +1,2 @@
+0001-Correct-resource-path-in-setup.py.patch
+0002-Disable-HTML-View.patch