From 63a0f4b27a6c2974ad298d3167222f9512aab92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Fri, 19 Jun 2015 16:19:27 +0200 Subject: [PATCH] Update DEBIAN stuff For more recent environments; python3, pybuild --- debian/control | 9 ++++---- ...01-Correct-resource-path-in-setup.py.patch | 13 ----------- debian/patches/0002-Disable-HTML-View.patch | 22 ------------------- debian/patches/series | 2 -- debian/rules | 13 +++++------ debian/source/format | 2 +- debian/source/local-options | 1 - debian/watch | 4 ---- 8 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 debian/patches/0001-Correct-resource-path-in-setup.py.patch delete mode 100644 debian/patches/0002-Disable-HTML-View.patch delete mode 100644 debian/patches/series delete mode 100644 debian/source/local-options delete mode 100644 debian/watch diff --git a/debian/control b/debian/control index dbd253b0b..309977d3e 100644 --- a/debian/control +++ b/debian/control @@ -7,23 +7,24 @@ 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: python-gramps +Package: python3-gramps Architecture: all Depends: gir1.2-gtk-3.0, librsvg2-2, python3-gi, python3-gi-cairo, + python3-bsddb3, xdg-utils, ${misc:Depends}, ${python:Depends} diff --git a/debian/patches/0001-Correct-resource-path-in-setup.py.patch b/debian/patches/0001-Correct-resource-path-in-setup.py.patch deleted file mode 100644 index d5067b339..000000000 --- a/debian/patches/0001-Correct-resource-path-in-setup.py.patch +++ /dev/null @@ -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) diff --git a/debian/patches/0002-Disable-HTML-View.patch b/debian/patches/0002-Disable-HTML-View.patch deleted file mode 100644 index 1a9072244..000000000 --- a/debian/patches/0002-Disable-HTML-View.patch +++ /dev/null @@ -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 : diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index def1e530b..000000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-Correct-resource-path-in-setup.py.patch -0002-Disable-HTML-View.patch diff --git a/debian/rules b/debian/rules index e1f325b77..4f38c19ac 100755 --- a/debian/rules +++ b/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,20 +17,19 @@ 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 + 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 + rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/INSTALL # Remove duplicate license information - #rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE - python3 setup.py install --root=debian/python3-gramps --install-layout=deb + rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE + 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: dh_fixperms chmod a-x $(CURDIR)/debian/python3-gramps/usr/share/gramps/css/Web_*.css - chmod a-x $(CURDIR)/debian/python3-gramps/usr/share/gramps/images/22x22/gramps*.png - chmod a-x $(CURDIR)/debian/python3-gramps/usr/share/gramps/images/16x16/gramps*.png # Avoid compressing COPYING file so that it can appear in the "About" dialog override_dh_compress: diff --git a/debian/source/format b/debian/source/format index d3827e75a..625934097 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +1.8 diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 4aceb10e3..000000000 --- a/debian/source/local-options +++ /dev/null @@ -1 +0,0 @@ -unapply-patches diff --git a/debian/watch b/debian/watch deleted file mode 100644 index fa80b71c1..000000000 --- a/debian/watch +++ /dev/null @@ -1,4 +0,0 @@ -version=3 - -opts="dversionmangle=s/\+dfsg//g" \ -http://sf.net/gramps/gramps-(.+)\.tar\.gz