Update DEBIAN stuff

For more recent environments; python3, pybuild

debian/control

@@ -7,15 +7,15 @@ Build-Depends-Indep:
  gettext,
  intltool,
  libxml-parser-perl,
- python-all,
- python-setuptools
+ python3-all,
+ python3-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/gitweb/?p=collab-maint/gramps.git
 Homepage: http://www.gramps-project.org/
-X-Python-Version: >= 3.0
+X-Python-Version: >= 3.2
 
 Package: python3-gramps
 Architecture: all

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

@@ -1,13 +0,0 @@
-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 = '/usr/share'
-             if sys.version_info[0] < 3:
-                 path = unicode(path)
-             fp.write(path)

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

@@ -1,22 +0,0 @@
-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

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

debian/rules

@@ -5,7 +5,7 @@ export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
 %:
-	dh $@ --with python3
+	dh $@ --with python3 --buildsystem=pybuild
 
 # Override auto test because upstream do not use the standard unittest discover
 override_dh_auto_test:
@@ -17,14 +17,14 @@ override_dh_auto_build:
 # Override of auto_install to remove information from package
 override_dh_auto_install:
 	#dh_auto_install
+	python3 setup.py install --resourcepath=/usr/share --root=debian/python3-gramps --install-layout=deb
 	# Remove duplicate copyright information
 	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING
 	# Remove install file as it is not needed by package users
 	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/INSTALL
 	# Remove duplicate license information
 	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE
-	ln -s /usr/share/common-licenses/GPL-2 $(CURDIR)/debian/gramps/usr/share/doc/gramps/COPYING
-	python3 setup.py install --resourcepath=/usr/share --root=debian/python3-gramps --install-layout=deb
+	ln -s /usr/share/common-licenses/GPL-2 $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING
 
 # Make css style sheets and png icons non-executable
 override_dh_fixperms:

debian/source/format

@@ -1 +1 @@
-1.0
+1.8

debian/source/local-options

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

debian/watch

@@ -1,4 +0,0 @@
-version=3
-
-opts="dversionmangle=s/\+dfsg//g" \
-http://sf.net/gramps/gramps-(.+)\.tar\.gz