[Pkg-virtualbox-commits] [virtualbox] 06/06: Revert "Commit Python3 switch"

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 07f55815c3905b5a595c1ad2ee50bbc5fc2ccc42
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Oct 19 09:08:55 2016 +0200

    Revert "Commit Python3 switch"
    
    This reverts commit 1cc075e121d80d1baa28291952cc6b3639765b3d.
---
 debian/changelog |  1 -
 debian/control   |  4 ++--
 debian/rules     | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07bd593..adf8a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ virtualbox (5.1.8-dfsg-1) unstable; urgency=medium
   * New upstream release.
     - builds with new openssl 1.1 (Closes: #828593)
     - fix double snapshot deletion crash (Closes: #838766)
-  * Switch to Python3 (LP: #1528016, Closes: #830878)
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 19 Oct 2016 00:12:38 +0200
 
diff --git a/debian/control b/debian/control
index 786b87c..217c605 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends: bzip2,
                lynx-cur,
                makeself,
                module-assistant,
-               python3-dev,
+               python-dev (>= 2.6.6-3~),
                texlive-fonts-extra,
                texlive-fonts-recommended,
                texlive-latex-extra,
@@ -92,7 +92,7 @@ Depends: adduser,
          procps,
          virtualbox-dkms (>= ${source:Version}) | virtualbox-source (>= ${source:Version}) | virtualbox-modules,
          ${misc:Depends},
-         ${python3:Depends},
+         ${python:Depends},
          ${shlibs:Depends}
 Recommends: virtualbox-qt (= ${binary:Version}), ${shlibs:Recommends}
 Suggests: vde2, virtualbox-guest-additions-iso
diff --git a/debian/rules b/debian/rules
index 5fd1732..935c881 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ export DEB_BUILD_HARDENING_BINDNOW=0
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie,-format,-bindnow
 
 %:
-	dh $@ --with python3,dkms,systemd
+	dh $@ --with python2,dkms,systemd
 
 override_dh_auto_configure:
 	@echo Building for $(DIST_RELEASE)
@@ -82,7 +82,7 @@ override_dh_auto_install:
 
 	export VBOX_INSTALL_PATH=$(INSTALL_PATH) && \
 	    cd out/bin/sdk/installer && \
-	    python3 ./vboxapisetup.py install --root $(CURDIR)/debian/$(sname)
+	    python ./vboxapisetup.py install --root $(CURDIR)/debian/$(sname)
 
 	sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).links.in > debian/$(gdkms).links
 	sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(pdkms).links.in > debian/$(pdkms).links
@@ -135,9 +135,9 @@ ifneq (,$(filter $(sname), $(shell dh_listpackages)))
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.rc;
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.r0;
 
-	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python3/xpcom/*.py;
-	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python3/xpcom/server/*.py;
-	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python3/xpcom/client/*.py;
+	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py;
+	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/server/*.py;
+	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/client/*.py;
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/java/vboxjxpcom.jar;
 
 	chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git