From 2f190df9d56af749b99751bb72bdb3e87e4e8881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Tue, 3 Dec 2013 17:14:10 +0100 Subject: [PATCH] python2 for python-gramps-4.0.x; python3 for python-gramps-4.1.x --- debian/README.Debian | 3 +-- debian/control | 7 +++---- debian/rules | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 8a760b412..f0535c4c9 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -3,8 +3,7 @@ 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. diff --git a/debian/control b/debian/control index faefff557..889c29a49 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,17 @@ 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-Indep: libxml-parser-perl, gettext, python, intltool, dh-python, 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 Homepage: http://www.gramps-project.org/ -X-Python3-Version: >= 3.2 Package: 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} +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: ttf-freefont, python-gtkspell, rcs, python3-pil.imagetk, python-pygoocanvas, python-webkit, gir1.2-gexiv2-0.4 Description: Genealogical research program diff --git a/debian/rules b/debian/rules index 71b8141d4..096603c6e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,18 +5,18 @@ DH_VERBOSE=1 export PYBUILD_NAME=gramps %: - dh $@ --with python3 --buildsystem=pybuild + dh $@ --with python --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: - python3 setup.py build + python setup.py build # Override of auto_install to force python 3 override_dh_auto_install: - python3 setup.py install --root=debian/gramps --install-layout=deb + python setup.py install --root=debian/gramps --install-layout=deb # Remove duplicate copyright information rm debian/gramps/usr/share/doc/gramps/COPYING # Remove install file as it is not needed by package users