diff --git a/debian/README.Debian b/debian/README.Debian index 8a760b412..d68203b57 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,10 +1,18 @@ -gramps for Debian +Gramps for Debian ---------------------- This is the Debian package of the 4.0 series of GRAMPS. -It is a major update of Gramps to enable a switch to Python 3 as the default interpreter, -and to upgrade to GTK 3. A switch was also made to distutils from autotools. +It is a major update of Gramps to upgrade to GTK 3. A switch was also made to distutils from autotools. 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/changelog b/debian/changelog index c73679a8d..c6535a982 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gramps (4.0.3) precise; urgency=low + + * - 4.0.4-git.f08e40 Experimental stream gramps.git + + -- Jérôme Rapinat Tue, 04 Feb 2014 19:49:32 +0100 + +gramps (4.0.2) precise; urgency=low + + * experimental .deb for gramps 4.0.2 + +-- Jérôme Rapinat Wed, 04 Dec 2013 10:23:36 +0100 + gramps (4.0.1-2) precise; urgency=low * bug 6918: make package more compliant according to Debian policy diff --git a/debian/control b/debian/control index faefff557..4582507b8 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,42 @@ Source: gramps -Section: gnome +Section: python Priority: optional Maintainer: Ross Gammon -Build-Depends-Indep: libxml-parser-perl, gettext, python3-all, intltool, dh-python, python3-setuptools -Build-Depends: debhelper (>= 9.0.0) +Build-Depends-Indep: + dh-linktree, + gettext, + intltool, + 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-Python3-Version: >= 3.2 +X-Python-Version: >= 2.7 -Package: gramps +Package: python-gramps Architecture: all -Depends: ${python3:Depends}, librsvg2-2, xdg-utils, python-gobject (>= 3.3.2), gir1.2-gtk-3.0, python3-gi-cairo, python3-bsddb3, ${misc:Depends} -Recommends: graphviz, python-pyicu -Suggests: ttf-freefont, python-gtkspell, rcs, python3-pil.imagetk, python-pygoocanvas, python-webkit, 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 07fe0c204..000000000 --- a/debian/gramps.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -#DEBHELPER# diff --git a/debian/gramps.postrm b/debian/gramps.postrm deleted file mode 100644 index 07fe0c204..000000000 --- a/debian/gramps.postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -#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..d5067b339 --- /dev/null +++ b/debian/patches/0001-Correct-resource-path-in-setup.py.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..1a9072244 --- /dev/null +++ b/debian/patches/0002-Disable-HTML-View.patch @@ -0,0 +1,22 @@ +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 7c0114204..03be06977 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,37 @@ #!/usr/bin/make -f -# Remember to remove verbose option once testing is finished -DH_VERBOSE=1 -export PYBUILD_NAME=gramps +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 +export DH_OPTIONS=-v %: - dh $@ --with python3 --buildsystem=pybuild + dh $@ --with python2 # 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 of auto_build override_dh_auto_build: - python3 setup.py 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: - python3 setup.py install --root=debian/gramps --install-layout=deb - # Need COPYING file into About dialog - #rm debian/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/gramps/usr/share/doc/gramps/INSTALL + #rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/INSTALL # Remove duplicate license information - rm debian/gramps/usr/share/doc/gramps/LICENSE + #rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/LICENSE + python setup.py install --root=debian/python-gramps --install-layout=deb + +# 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 + +# Avoid compressing COPYING file so that it can appear in the "About" dialog +override_dh_compress: + dh_compress -X COPYING diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..d3827e75a --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 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