Update DEBIAN stuff

For more recent environments; python3, pybuild
This commit is contained in:
Jérôme Rapinat 2015-06-19 16:19:27 +02:00
parent c9d7b00c0c
commit 63a0f4b27a
8 changed files with 12 additions and 54 deletions

9
debian/control vendored
View File

@ -7,23 +7,24 @@ Build-Depends-Indep:
gettext, gettext,
intltool, intltool,
libxml-parser-perl, libxml-parser-perl,
python-all, python3-all,
python-setuptools python3-setuptools
Build-Depends: Build-Depends:
debhelper (>= 9.0.0) debhelper (>= 9.0.0)
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
Homepage: http://www.gramps-project.org/ Homepage: http://www.gramps-project.org/
X-Python-Version: >= 3.0 X-Python-Version: >= 3.2
Package: python-gramps Package: python3-gramps
Architecture: all Architecture: all
Depends: Depends:
gir1.2-gtk-3.0, gir1.2-gtk-3.0,
librsvg2-2, librsvg2-2,
python3-gi, python3-gi,
python3-gi-cairo, python3-gi-cairo,
python3-bsddb3,
xdg-utils, xdg-utils,
${misc:Depends}, ${misc:Depends},
${python:Depends} ${python:Depends}

View File

@ -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)

View File

@ -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 :

View File

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

13
debian/rules vendored
View File

@ -5,7 +5,7 @@ export DH_VERBOSE=1
export DH_OPTIONS=-v 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 auto test because upstream do not use the standard unittest discover
override_dh_auto_test: override_dh_auto_test:
@ -17,20 +17,19 @@ override_dh_auto_build:
# Override of auto_install to remove information from package # Override of auto_install to remove information from package
override_dh_auto_install: override_dh_auto_install:
#dh_auto_install #dh_auto_install
python3 setup.py install --resourcepath=/usr/share --root=debian/python3-gramps --install-layout=deb
# Remove duplicate copyright information # 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 # 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 # Remove duplicate license information
#rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE
python3 setup.py install --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 # Make css style sheets and png icons non-executable
override_dh_fixperms: override_dh_fixperms:
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/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 # Avoid compressing COPYING file so that it can appear in the "About" dialog
override_dh_compress: override_dh_compress:

View File

@ -1 +1 @@
1.0 1.8

View File

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

4
debian/watch vendored
View File

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