[Reproducible-commits] [cdbs] 12/41: Rename cdbs_python2 → cdbs_pythonsystem_python2. 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 d81b577c7dd5b4069a543ec32a991efd6ac6365f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Apr 22 14:07:03 2014 +0200

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

diff --git a/1/class/python-module.mk.in b/1/class/python-module.mk.in
index d628ac5..6dd6473 100644
--- a/1/class/python-module.mk.in
+++ b/1/class/python-module.mk.in
@@ -41,7 +41,7 @@ CDBS_BUILD_DEPENDS += $(strip \
 	$(if $(cdbs_pythonsystem_pycentral),\
 		$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_pycentral)))
 CDBS_BUILD_DEPENDS += $(strip \
-	$(if $(cdbs_python2),\
+	$(if $(cdbs_pythonsystem_python2),\
 		$(comma) $(CDBS_BUILD_DEPENDS_class_python-module_python2)))
 CDBS_BUILD_DEPENDS += $(strip \
 	$(if $(cdbs_python3),\
diff --git a/1/class/python-vars.mk.in b/1/class/python-vars.mk.in
index 8c69f28..100f44c 100644
--- a/1/class/python-vars.mk.in
+++ b/1/class/python-vars.mk.in
@@ -91,7 +91,7 @@ cdbs_python_legacy_system = $(or $(strip \
 	$(error unsupported Python system: $(DEB_PYTHON_SYSTEM) \
 		(select either pysupport or pycentral, or leave empty \
 		for default python2/python3))))
-cdbs_python2 = $(strip \
+cdbs_pythonsystem_python2 = $(strip \
 	$(if $(DEB_PYTHON_SYSTEM),\
 		,\
 		$(if $(cdbs_python2_packages),\
@@ -118,9 +118,9 @@ cdbs_python_stem += $(strip \
 	DEB_PYTHON3_PACKAGES or another DEB_*_PACKAGES variable)))
 
 # Calculate cdbs_python_build_versions
-cdbs_python_current_version := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -vd))
+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_python_supported_versions := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -vr))
+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_python_first_supported_version = $(firstword $(strip $(sort $(cdbs_python_supported_versions))))
 cdbs_python3_first_supported_version = $(firstword $(strip $(sort $(cdbs_python3_supported_versions))))
@@ -159,7 +159,7 @@ cdbs_python3_build_versions = $(or $(strip \
 	$(cdbs_python3_primary_version)))
 
 # runtime to use
-cdbs_python_current_binary := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_python2),$(shell pyversions -d))
+cdbs_python_current_binary := $(if $(DEB_PYTHON_SYSTEM)$(cdbs_pythonsystem_python2),$(shell pyversions -d))
 cdbs_python3_current_binary := $(if $(cdbs_python3),$(shell py3versions -d))
 # resolve from binary package and optional flavor
 cdbs_python_binary = $(strip \
@@ -194,7 +194,7 @@ cdbs_python_builddeps_legacy = $(if $(DEB_PYTHON_SYSTEM),\
 		python-all-dev,\
 		python-dev (>= 2.3.5-7)\
 			$(cdbs_python_nondefault_version:%=, python%-dev)))
-cdbs_python2_builddeps = $(if $(cdbs_python2),\
+cdbs_python2_builddeps = $(if $(cdbs_pythonsystem_python2),\
 	$(if $(cdbs_python2_arch_packages),\
 		python-all-dev,\
 		python-dev (>= 2.3.5-7)\
@@ -211,7 +211,7 @@ cdbs_python_builddeps = \
 cdbs_python_builddeps_cdbs = $(strip \
 	$(if $(cdbs_python3_indep_packages),\
 		$(comma) cdbs (>= 0.4.93~),\
-		$(if $(cdbs_python2)$(cdbs_python3),\
+		$(if $(cdbs_pythonsystem_python2)$(cdbs_python3),\
 			$(comma) cdbs (>= 0.4.90~))))
 
 # check if build is possible
@@ -223,7 +223,7 @@ $(if $(cdbs_pythonsystem_pycentral),\
 	$(if $(cdbs_python_build_versions),\
 		,\
 		$(error invalid setting for XS-Python-Version)))
-$(if $(cdbs_python2),\
+$(if $(cdbs_pythonsystem_python2),\
 	$(if $(cdbs_python_build_versions),\
 		,\
 		$(error invalid setting for X-Python-Version)))

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