diff -Nru landscape-client-14.12/debian/changelog landscape-client-14.12/debian/changelog --- landscape-client-14.12/debian/changelog 2014-12-12 18:24:17.000000000 +0100 +++ landscape-client-14.12/debian/changelog 2015-04-04 17:58:07.000000000 +0200 @@ -1,3 +1,9 @@ +landscape-client (14.12-0ubuntu2) vivid; urgency=medium + + * landscape-client-ui-install: Use Python3. + + -- Matthias Klose Sat, 04 Apr 2015 17:57:38 +0200 + landscape-client (14.12-0ubuntu1) vivid; urgency=medium * New upstream version: diff -Nru landscape-client-14.12/debian/control landscape-client-14.12/debian/control --- landscape-client-14.12/debian/control 2014-12-12 16:11:48.000000000 +0100 +++ landscape-client-14.12/debian/control 2015-04-04 18:07:56.000000000 +0200 @@ -77,12 +77,9 @@ Package: landscape-client-ui-install Architecture: any -Depends: ${python:Depends}, ${misc:Depends}, - python-gi, - python-dbus, +Depends: ${installer:Depends}, ${misc:Depends}, policykit-1, - gir1.2-gtk-3.0, - python-aptdaemon.gtk3widgets + gir1.2-gtk-3.0 Description: The Landscape administration system client - UI installer Landscape is a web-based tool for managing Ubuntu systems. . diff -Nru landscape-client-14.12/debian/rules landscape-client-14.12/debian/rules --- landscape-client-14.12/debian/rules 2014-12-12 16:11:48.000000000 +0100 +++ landscape-client-14.12/debian/rules 2015-04-04 18:10:48.000000000 +0200 @@ -8,6 +8,10 @@ use_dhpython2 = yes endif +ifeq (,$(filter $(dist_release), hardy lucid precise trusty utopic)) + use_python3 = yes +endif + dh_extra_flags = -plandscape-common -plandscape-client ifeq (,$(filter $(dist_release),hardy lucid natty oneiric)) # We want landscape-client-ui only from precise onward @@ -94,6 +98,16 @@ ifeq ($(use_dhpython2),yes) dh_python2 --no-guessing-versions + + ifeq ($(use_python3),yes) + sed -i 's,/usr/bin/python,/usr/bin/python3,' \ + debian/landscape-client-ui-install/usr/bin/landscape-client-ui-install + echo "installer:Depends=python3:any, python3-gi, python3-dbus, python3-aptdaemon.gtk3widgets" \ + >> debian/landscape-client-ui-install.substvars + else + echo "installer:Depends=python:any, python-gi, python-dbus, python-aptdaemon.gtk3widgets" \ + >> debian/landscape-client-ui-install.substvars + endif else ifeq ($(use_pycentral),yes) ifneq (,$(py_setup_install_args))