From cab29ca2b63be468c7306722b077629d711f38cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Thu, 6 Feb 2014 15:13:39 +0100 Subject: [PATCH] update Debian files --- debian/changelog | 11 ++++++++--- debian/control | 4 ++-- .../0001-Correct-resource-path-in-setup.py.patch | 8 -------- debian/patches/0002-Disable-HTML-View.patch | 11 ----------- debian/rules | 11 ++++++++--- 5 files changed, 18 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd6cd4038..c6535a982 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ +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 - * - 4.0.4-gitf08e40 Experimental stream gramps.git - - -- Jérôme Rapinat Tue, 04 Feb 2014 19:49:32 +0100 + +-- Jérôme Rapinat Wed, 04 Dec 2013 10:23:36 +0100 gramps (4.0.1-2) precise; urgency=low diff --git a/debian/control b/debian/control index 7f674b1ba..4582507b8 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,11 @@ Source: gramps -Section: gnome +Section: python Priority: optional Maintainer: Ross Gammon Build-Depends-Indep: + dh-linktree, gettext, intltool, - libjs-jquery, libxml-parser-perl, python-all, python-setuptools diff --git a/debian/patches/0001-Correct-resource-path-in-setup.py.patch b/debian/patches/0001-Correct-resource-path-in-setup.py.patch index 133bde286..d5067b339 100644 --- a/debian/patches/0001-Correct-resource-path-in-setup.py.patch +++ b/debian/patches/0001-Correct-resource-path-in-setup.py.patch @@ -1,11 +1,3 @@ -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 diff --git a/debian/patches/0002-Disable-HTML-View.patch b/debian/patches/0002-Disable-HTML-View.patch index 0f6fe8176..1a9072244 100644 --- a/debian/patches/0002-Disable-HTML-View.patch +++ b/debian/patches/0002-Disable-HTML-View.patch @@ -1,14 +1,3 @@ -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 diff --git a/debian/rules b/debian/rules index 91b79e6b4..03be06977 100755 --- a/debian/rules +++ b/debian/rules @@ -16,13 +16,14 @@ override_dh_auto_build: # Override of auto_install to remove information from package override_dh_auto_install: - dh_auto_install + #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 $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/INSTALL + #rm $(CURDIR)/debian/python-gramps/usr/share/doc/gramps/INSTALL # Remove duplicate license information - rm $(CURDIR)/debian/python-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: @@ -30,3 +31,7 @@ override_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