[Reproducible-commits] [cdbs] 13/41: Rename cdbs_python3 → cdbs_pythonsystem_python3. Drop the former without deprecation (unused outside cdbs).

[Mattia Rizzolo]

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

mattia pushed a commit to branch reproducible
in repository cdbs.

commit d0406c45019e10bf08d1b503ad9d4fa03e6e18b1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Apr 22 14:09:01 2014 +0200

    Rename cdbs_python3 → cdbs_pythonsystem_python3. Drop the former without deprecation (unused outside cdbs).
    
    Dropped variable verified against <http://codesearch.debian.net>.
---
 1/class/python-module.mk.in |  1 +
 1/class/python-vars.mk.in   | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/1/class/python-module.mk.in b/1/class/python-module.mk.in
index 6dd6473..f7e096f 100644
--- a/1/class/python-module.mk.in
+++ b/1/class/python-module.mk.in
@@ -45,6 +45,7 @@ CDBS_BUILD_DEPENDS += $(strip \
 		$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2)))
 CDBS_BUILD_DEPENDS += $(strip \
 	$(if $(cdbs_python3),\
+	$(if $(cdbs_pythonsystem_python3),\
 		$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python3)))
 
 CDBS_BUILD_DEPENDS_class_python-module_args ?= cdbs (>= 0.4.97~)
diff --git a/1/class/python-vars.mk.in b/1/class/python-vars.mk.in
index 100f44c..0c94d5e 100644
--- a/1/class/python-vars.mk.in
+++ b/1/class/python-vars.mk.in
@@ -96,7 +96,7 @@ cdbs_pythonsystem_python2 = $(strip \
 		,\
 		$(if $(cdbs_python2_packages),\
 			python2)))
-cdbs_python3 = $(strip \
+cdbs_pythonsystem_python3 = $(strip \
 	$(if $(DEB_PYTHON_SYSTEM),\
 		,\
 		$(if $(cdbs_python3_packages),\
@@ -119,9 +119,9 @@ cdbs_python_stem += $(strip \
 
 # Calculate cdbs_python_build_versions
 cdbs_python_current_version := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_pythonsystem_python2),$(shell pyversions -vd))
-cdbs_python3_current_version := $(if $(cdbs_python3),$(shell py3versions -vd))
+cdbs_python3_current_version := $(if $(cdbs_pythonsystem_python3),$(shell py3versions -vd))
 cdbs_python_supported_versions := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_pythonsystem_python2),$(shell pyversions -vr))
-cdbs_python3_supported_versions := $(if $(cdbs_python3),$(shell py3versions -vr))
+cdbs_python3_supported_versions := $(if $(cdbs_pythonsystem_python3),$(shell py3versions -vr))
 cdbs_python_first_supported_version = $(firstword $(strip $(sort $(cdbs_python_supported_versions))))
 cdbs_python3_first_supported_version = $(firstword $(strip $(sort $(cdbs_python3_supported_versions))))
 
@@ -160,7 +160,7 @@ cdbs_python3_build_versions = $(or $(strip \
 
 # runtime to use
 cdbs_python_current_binary := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_pythonsystem_python2),$(shell pyversions -d))
-cdbs_python3_current_binary := $(if $(cdbs_python3),$(shell py3versions -d))
+cdbs_python3_current_binary := $(if $(cdbs_pythonsystem_python3),$(shell py3versions -d))
 # resolve from binary package and optional flavor
 cdbs_python_binary = $(strip \
 	$(if $(call cdbs_streq,$(cdbs_python$(cdbs_curpythonstem)_current_binary),$(1)),\
@@ -199,7 +199,7 @@ cdbs_python2_builddeps = $(if $(cdbs_pythonsystem_python2),\
 		python-all-dev,\
 		python-dev (>= 2.3.5-7)\
 			$(cdbs_python_nondefault_version:%=, python%-dev)))
-cdbs_python3_builddeps = $(if $(cdbs_python3),\
+cdbs_python3_builddeps = $(if $(cdbs_pythonsystem_python3),\
 	$(if $(cdbs_python3_arch_packages),\
 		python3-all-dev (>= 3.1),\
 		python3-dev\
@@ -211,7 +211,7 @@ cdbs_python_builddeps = \
 cdbs_python_builddeps_cdbs = $(strip \
 	$(if $(cdbs_python3_indep_packages),\
 		$(comma) cdbs (>= 0.4.93~),\
-		$(if $(cdbs_pythonsystem_python2)$(cdbs_python3),\
+		$(if $(cdbs_pythonsystem_python2)$(cdbs_pythonsystem_python3),\
 			$(comma) cdbs (>= 0.4.90~))))
 
 # check if build is possible
@@ -227,7 +227,7 @@ $(if $(cdbs_pythonsystem_python2),\
 	$(if $(cdbs_python_build_versions),\
 		,\
 		$(error invalid setting for X-Python-Version)))
-$(if $(cdbs_python3),\
+$(if $(cdbs_pythonsystem_python3),\
 	$(if $(cdbs_python3_build_versions),\
 		,\
 		$(error invalid setting for X-Python3-Version)))

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