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

debian/README.Debian

@@ -1,4 +1,4 @@
-gramps for Debian
+Gramps for Debian
 ----------------------
 
 This is the Debian package of the 4.0 series of GRAMPS.
@@ -7,3 +7,12 @@ It is a major update of Gramps to upgrade to GTK 3. A switch was also made to di
 
 The 4.0 series of Gramps is being packaged for the experimental distribution until all dependencies are available
 and it proves stable.
+
+Webkit - gir1.2-webkit-3.0 crashes. Gramps has been patched disable the hidden
+HTML view instead until a solution is found.
+
+Goocanvas2 - The latest Goocanvas is not available in Debian yet. If you miss
+the Graphview plugin, you could try installing the gir1.2-goocanvas-2.0-9 which
+is available in Ubuntu.
+
+ -- Ross Gammon <rossgammon@mail.dk>  Sat, 25 Jan 2014 18:00:00 +0100

debian/control

@@ -1,19 +1,45 @@
 Source: gramps
-Section: python
+Section: gnome
 Priority: optional
 Maintainer: Ross Gammon <rossgammon@mail.dk>
-Build-Depends-Indep: libxml-parser-perl, gettext, python, intltool, python-setuptools
-Build-Depends: debhelper (>= 9.0.0)
+Build-Depends-Indep:
+ dh-linktree,
+ dh-python,
+ gettext,
+ intltool,
+ libjs-jquery,
+ libjs-jquery-ui,
+ libxml-parser-perl,
+ python-all,
+ python-setuptools
+Build-Depends:
+ debhelper (>= 9.0.0)
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
-Vcs-browser: http://anonscm.debian.org/git/collab-maint/gramps.git
+Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
 Homepage: http://www.gramps-project.org/
+X-Python-Version: >= 2.7
 
 Package: python-gramps
 Architecture: all
-Depends: ${python:Depends}, librsvg2-2, xdg-utils, python-gobject (>= 3.3.2), gir1.2-gtk-3.0, python-gi-cairo, python-bsddb3, ${misc:Depends}
-Recommends: graphviz, python-pyicu
-Suggests: fonts-freefont-ttf, gir1.2-gtkspell3-3.0, rcs, python-pil, gir1.2-goocanvas, gir1.2-webkit-3.0, gir1.2-osmgpsmap-1.0, gir1.2-gexiv2-0.4
+Depends:
+ gir1.2-gtk-3.0,
+ librsvg2-2,
+ python-gi,
+ python-gi-cairo,
+ xdg-utils,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends:
+ graphviz,
+ libosmgpsmap-1.0-0-dev,
+ python-pyicu
+Suggests:
+ fonts-freefont-ttf,
+ gir1.2-gexiv2-0.4,
+ gir1.2-gtk-gtkspell3-3.0,
+ python-pil,
+ rcs
 Description: Genealogical research program
  GRAMPS is an Open Source genealogy program written in Python, using
  the GTK/GNOME interface. It is an extremely flexible program fitting

debian/gbp.conf

@@ -1,7 +0,0 @@
-[DEFAULT]
-# the default build command
-#builder=debuild -i\.git -I.git
-# the default branch for experimental upstream sources
-upstream-branch=upstream
-# the default branch for the debian patch
-debian-branch=experimental

debian/gramps-help.docs

@@ -1,2 +0,0 @@
-NEWS
-README

debian/gramps.dirs

@@ -1,2 +0,0 @@
-usr/share/pixmaps
-usr/share/mime/packages

debian/gramps.docs

@@ -1,5 +0,0 @@
-AUTHORS
-FAQ
-NEWS
-README
-TODO

debian/gramps.files

@@ -1,3 +0,0 @@
-/usr/bin/
-/usr/share/
-/etc

debian/gramps.install

@@ -1 +1,2 @@
+# Install icon to the correct place
 debian/gramps.xpm usr/share/pixmaps/

debian/gramps.manpages

@@ -1 +0,0 @@
-data/man/gramps.1.in

debian/gramps.menu

@@ -1,3 +0,0 @@
-?package(gramps):needs="X11" section="Applications/Office"\
-  title="gramps" command="/usr/bin/gramps"\
-  icon="/usr/share/pixmaps/gramps.xpm"

debian/gramps.postinst

@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# Update mime database postinst
-if [ -x /usr/sbin/update-mime-database ]; then
-	update-mime-database /usr/share/mime
-fi
-
-#DEBHELPER#

debian/gramps.postrm

@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-# Update mime database postrm
-if [ -x /usr/sbin/update-mime-database ]; then
-	update-mime-database /usr/share/mime
-fi
-
-#DEBHELPER#

debian/gramps.preinst

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# This was added by stdeb to workaround Debian #479852. In a nutshell,
-# pycentral does not remove normally remove its symlinks on an
-# upgrade. Since we're using python-support, however, those symlinks
-# will be broken. This tells python-central to clean up any symlinks.
-if [ -e /var/lib/dpkg/info/gramps.list ] && which pycentral >/dev/null 2>&1
-then
-    pycentral pkgremove gramps
-fi
-
-#DEBHELPER#

debian/gramps.prerm

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-# #DEBHELPER#

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

debian/pycompat

@@ -1 +0,0 @@
-2

debian/rules

@@ -1,25 +1,28 @@
 #!/usr/bin/make -f
 
-# Remember to remove verbose option once testing is finished
-DH_VERBOSE=1
-export PYBUILD_NAME=python-gramps
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 # Override auto test because upstream do not use the standard unittest discover
 override_dh_auto_test:
 
-# Override of auto_build to force python 3
-override_dh_auto_build:
-	python setup.py build
-
-# Override of auto_install to force python 3
+# Override of auto_install to remove information from package
 override_dh_auto_install:
-	python setup.py install --root=debian/python-gramps --install-layout=deb
-	# Need COPYING file into About dialog
-	#rm debian/python-gramps/usr/share/doc/gramps/COPYING
+	dh_auto_install
+	# Remove duplicate copyright information
+	#rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/COPYING
 	# Remove install file as it is not needed by package users
-	rm debian/python-gramps/usr/share/doc/gramps/INSTALL
+	rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/INSTALL
 	# Remove duplicate license information
-	rm debian/python-gramps/usr/share/doc/gramps/LICENSE
+	rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/LICENSE
+
+# Make css style sheets and png icons non-executable
+override_dh_fixperms:
+	dh_fixperms
+	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/css/Web_*.css
+	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/images/22x22/gramps*.png
+	chmod a-x $(CURDIR)/debian/python-gramps/usr/share/gramps/images/16x16/gramps*.png

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/local-options

@@ -0,0 +1 @@
+unapply-patches

debian/substvars

@@ -1,2 +0,0 @@
-shlibs:Depends=libbonobo2-0 (>= 2.4.3), libc6 (>= 2.3.2.ds1-4), libglib2.0-0 (>= 2.2.3), libgnomevfs2-0 (>= 2.4.1), libgnomevfs2-common (>= 2.4.1), liborbit2 (>= 1:2.8.0)
-python:Depends=python (>= 2.3), python (<< 2.4)

debian/watch

@@ -1,3 +1,4 @@
-# watch control file for uscan
 version=3
-http://sf.net/gramps/gramps-(.+)\.tar\.gz debian uupdate
+
+opts="dversionmangle=s/\+dfsg//g" \
+http://sf.net/gramps/gramps-(.+)\.tar\.gz