[Reproducible-commits] [cdbs] 21/41: Refactor python snippets: Check actual need for build-dependencies in cdbs_python_builddeps (not before). Drop unused variable cdbs_python_builddeps_legacy.

[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 35c6b86efabae9ff3cd447904e21aab9bd2187fa
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Apr 23 00:01:25 2014 +0200

    Refactor python snippets: Check actual need for build-dependencies in cdbs_python_builddeps (not before). Drop unused variable cdbs_python_builddeps_legacy.
    
    Dropped variable verified against <http://codesearch.debian.net>.
---
 1/class/python-vars.mk.in | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/1/class/python-vars.mk.in b/1/class/python-vars.mk.in
index 6c6bb29..e8f9a79 100644
--- a/1/class/python-vars.mk.in
+++ b/1/class/python-vars.mk.in
@@ -189,25 +189,18 @@ cdbs_curpythonflavors = $(_cdbs_$(cdbs_curpython)_flavors)
 # package relations
 # Python-related dependencies according to Python policy, appendix A
 #  * Arch-independent Python 3 was broken until 0.4.93~
-cdbs_python_builddeps_legacy = $(if $(DEB_PYTHON_SYSTEM),\
-	$(if $(cdbs_python_arch_packages),\
-		python-all-dev,\
-		python-dev (>= 2.3.5-7)\
-			$(cdbs_python_nondefault_version:%=, python%-dev)))
-cdbs_python_builddeps_python2 = $(if $(cdbs_pythonsystem_python2),\
-	$(if $(_cdbs_python2_arch_packages),\
-		python-all-dev,\
-		python-dev (>= 2.3.5-7)\
-			$(_cdbs_python2_altflavor:%=, %-dev)))
-cdbs_python_builddeps_python3 = $(if $(cdbs_pythonsystem_python3),\
-	$(if $(_cdbs_python3_arch_packages),\
-		python3-all-dev (>= 3.1),\
-		python3-dev\
-			$(_cdbs_python3_altflavor:%=, %-dev)))
+cdbs_python_builddeps_python2 = $(if $(_cdbs_python2_arch_packages),\
+	python-all-dev,\
+	python-dev (>= 2.3.5-7)\
+		$(_cdbs_python2_altflavor:%=, %-dev))
+cdbs_python_builddeps_python3 = $(if $(_cdbs_python3_arch_packages),\
+	python3-all-dev (>= 3.1),\
+	python3-dev\
+		$(_cdbs_python3_altflavor:%=, %-dev))
 cdbs_python_builddeps = \
-	$(cdbs_python_builddeps_legacy), \
-	$(cdbs_python_builddeps_python2), \
-	$(cdbs_python_builddeps_python3)
+	$(if $(DEB_PYTHON_SYSTEM),$(cdbs_python_builddeps_python2)), \
+	$(if $(cdbs_pythonsystem_python2),$(cdbs_python_builddeps_python2)), \
+	$(if $(cdbs_pythonsystem_python3),$(cdbs_python_builddeps_python3))
 cdbs_python_builddeps_cdbs = $(strip \
 	$(if $(_cdbs_python3_indep_packages),\
 		$(comma) cdbs (>= 0.4.93~),\

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