From 1e7498663ba4ef54bc44c129117e8b29a7b33e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Tue, 4 Feb 2014 19:38:10 +0100 Subject: [PATCH] Merge with Ross' work on Debian upstream (http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git) --- debian/README.Debian | 11 ++++- debian/control | 40 +++++++++++++++---- debian/gbp.conf | 7 ---- debian/gramps-help.docs | 2 - debian/gramps.dirs | 2 - debian/gramps.docs | 5 --- debian/gramps.files | 3 -- debian/gramps.install | 1 + debian/gramps.manpages | 1 - debian/gramps.menu | 3 -- debian/gramps.postinst | 9 ----- debian/gramps.postrm | 9 ----- debian/gramps.preinst | 14 ------- debian/gramps.prerm | 3 -- ...01-Correct-resource-path-in-setup.py.patch | 21 ++++++++++ debian/patches/0002-Disable-HTML-View.patch | 33 +++++++++++++++ debian/patches/series | 2 + debian/pycompat | 1 - debian/rules | 31 +++++++------- debian/source/format | 1 + debian/source/local-options | 1 + debian/substvars | 2 - debian/watch | 5 ++- 23 files changed, 122 insertions(+), 85 deletions(-) delete mode 100644 debian/gbp.conf delete mode 100644 debian/gramps-help.docs delete mode 100644 debian/gramps.dirs delete mode 100644 debian/gramps.docs delete mode 100644 debian/gramps.files delete mode 100644 debian/gramps.manpages delete mode 100644 debian/gramps.menu delete mode 100644 debian/gramps.postinst delete mode 100644 debian/gramps.postrm delete mode 100644 debian/gramps.preinst delete mode 100644 debian/gramps.prerm create mode 100644 debian/patches/0001-Correct-resource-path-in-setup.py.patch create mode 100644 debian/patches/0002-Disable-HTML-View.patch create mode 100644 debian/patches/series delete mode 100644 debian/pycompat create mode 100644 debian/source/format create mode 100644 debian/source/local-options delete mode 100644 debian/substvars diff --git a/debian/README.Debian b/debian/README.Debian index f0535c4c9..d68203b57 100644 --- a/debian/README.Debian +++ b/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 Sat, 25 Jan 2014 18:00:00 +0100 diff --git a/debian/control b/debian/control index e6d58ea6c..5b803c13b 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,45 @@ Source: gramps -Section: python +Section: gnome Priority: optional Maintainer: Ross Gammon -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 diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 4c9067ecb..000000000 --- a/debian/gbp.conf +++ /dev/null @@ -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 diff --git a/debian/gramps-help.docs b/debian/gramps-help.docs deleted file mode 100644 index 50bd824bb..000000000 --- a/debian/gramps-help.docs +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -README diff --git a/debian/gramps.dirs b/debian/gramps.dirs deleted file mode 100644 index 0ab4c274a..000000000 --- a/debian/gramps.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/pixmaps -usr/share/mime/packages diff --git a/debian/gramps.docs b/debian/gramps.docs deleted file mode 100644 index f8e4e3daf..000000000 --- a/debian/gramps.docs +++ /dev/null @@ -1,5 +0,0 @@ -AUTHORS -FAQ -NEWS -README -TODO diff --git a/debian/gramps.files b/debian/gramps.files deleted file mode 100644 index df89289f4..000000000 --- a/debian/gramps.files +++ /dev/null @@ -1,3 +0,0 @@ -/usr/bin/ -/usr/share/ -/etc diff --git a/debian/gramps.install b/debian/gramps.install index a1e68dd5e..b2fd979d3 100644 --- a/debian/gramps.install +++ b/debian/gramps.install @@ -1 +1,2 @@ +# Install icon to the correct place debian/gramps.xpm usr/share/pixmaps/ diff --git a/debian/gramps.manpages b/debian/gramps.manpages deleted file mode 100644 index 7c619bdac..000000000 --- a/debian/gramps.manpages +++ /dev/null @@ -1 +0,0 @@ -data/man/gramps.1.in diff --git a/debian/gramps.menu b/debian/gramps.menu deleted file mode 100644 index eadca1f6f..000000000 --- a/debian/gramps.menu +++ /dev/null @@ -1,3 +0,0 @@ -?package(gramps):needs="X11" section="Applications/Office"\ - title="gramps" command="/usr/bin/gramps"\ - icon="/usr/share/pixmaps/gramps.xpm" diff --git a/debian/gramps.postinst b/debian/gramps.postinst deleted file mode 100644 index cc80d761b..000000000 --- a/debian/gramps.postinst +++ /dev/null @@ -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# diff --git a/debian/gramps.postrm b/debian/gramps.postrm deleted file mode 100644 index 5101b7fb2..000000000 --- a/debian/gramps.postrm +++ /dev/null @@ -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# diff --git a/debian/gramps.preinst b/debian/gramps.preinst deleted file mode 100644 index 25b47656e..000000000 --- a/debian/gramps.preinst +++ /dev/null @@ -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# diff --git a/debian/gramps.prerm b/debian/gramps.prerm deleted file mode 100644 index a9fb0584e..000000000 --- a/debian/gramps.prerm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -# #DEBHELPER# diff --git a/debian/patches/0001-Correct-resource-path-in-setup.py.patch b/debian/patches/0001-Correct-resource-path-in-setup.py.patch new file mode 100644 index 000000000..8aec23752 --- /dev/null +++ b/debian/patches/0001-Correct-resource-path-in-setup.py.patch @@ -0,0 +1,21 @@ +From: Ross Gammon +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) diff --git a/debian/patches/0002-Disable-HTML-View.patch b/debian/patches/0002-Disable-HTML-View.patch new file mode 100644 index 000000000..0f6fe8176 --- /dev/null +++ b/debian/patches/0002-Disable-HTML-View.patch @@ -0,0 +1,33 @@ +From: Ross Gammon +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 : diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..def1e530b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Correct-resource-path-in-setup.py.patch +0002-Disable-HTML-View.patch diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf0888..000000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules index 2b5f91374..a0c3edc73 100755 --- a/debian/rules +++ b/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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000000000..4aceb10e3 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +unapply-patches diff --git a/debian/substvars b/debian/substvars deleted file mode 100644 index 20ad126df..000000000 --- a/debian/substvars +++ /dev/null @@ -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) diff --git a/debian/watch b/debian/watch index 611853c2f..fa80b71c1 100644 --- a/debian/watch +++ b/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