← Back to branch summary

~ubuntu-branches/ubuntu/utopic/cdbs/utopic

« back to all changes in this revision

Viewing changes to 1/class/python-vars.mk.in

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2014-06-26 12:00:42 UTC
  • mfrom: (1.3.29 sid)
  • Revision ID: package-import@ubuntu.com-20140626120042-aqwvy6olr3kvoelc
Tags: 0.4.125ubuntu1
* Merge from Debian unstable. Remaining changes:
  - 1/rules/utils.mk.in: add some text before listing missing file to make
    it easier to see from the build log. (Debian #565771)
  - 1/class/gnome.mk.in: Call dh_translations.
  - test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
    with pkgstriptranslations installed. (Ubuntu-specific)
  - 1/rules/debhelper.mk.in: Call dh_scour.
  - debian/control.in: Add scour build and binary dependency (build dep for
    test suite).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1/class/python-vars.mk.in
59
59
 
60
60
cdbs_python_destdir = $(or $(DEB_PYTHON_DESTDIR),$(DEB_DESTDIR))
61
61
 
62
 
# check python system
63
 
cdbs_python_use_xs_field := $(if $(DEB_PYTHON_SYSTEM),$(shell grep -q "^XS-Python-Version:" debian/control && echo yes))
64
 
cdbs_python_selected_pyversions := $(if $(DEB_PYTHON_SYSTEM),$(shell if [ -e debian/pyversions ]; then cat debian/pyversions; fi))
65
 
 
66
62
cdbs_python2 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python2_packages),python2))
67
63
cdbs_python3 = $(if $(DEB_PYTHON_SYSTEM),,$(if $(cdbs_python3_packages),python3))
68
64
cdbs_python_pysupport = $(filter pysupport,$(DEB_PYTHON_SYSTEM))
110
106
cdbs_python_builddeps = $(cdbs_python_builddeps_legacy), $(cdbs_python2_builddeps), $(cdbs_python3_builddeps)
111
107
cdbs_python_builddeps_cdbs = $(if $(cdbs_python3_indep_packages),$(comma) cdbs (>= 0.4.93~),$(if $(cdbs_python2)$(cdbs_python3),$(comma) cdbs (>= 0.4.90~)))
112
108
 
113
 
# warning pysupport compatibility mode
114
 
$(if $(cdbs_python_pysupport),$(if $(cdbs_python_use_xs_field),$(warning WARNING:  Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)))
115
 
 
116
109
# check if build is possible
117
110
$(if $(cdbs_python_pysupport),$(if $(cdbs_python_build_versions),,$(error invalid setting in debian/pyversions)))
118
111
$(if $(cdbs_python_pycentral),$(if $(cdbs_python_build_versions),,$(error invalid setting for XS-Python-Version)))
119
112
$(if $(cdbs_python2),$(if $(cdbs_python_build_versions),,$(error invalid setting for X-Python-Version)))
120
113
$(if $(cdbs_python3),$(if $(cdbs_python3_build_versions),,$(error invalid setting for X-Python3-Version)))
121
114
 
 
115
# deprecated variables
 
116
cdbs_python_selected_pyversions = $(strip $(call cdbs_warn_deprecated,\
 
117
        cdbs_python_selected_pyversions,0.4.90)\
 
118
        $(if $(DEB_PYTHON_SYSTEM),\
 
119
                $(shell if [ -e debian/pyversions ]; then \
 
120
                        cat debian/pyversions; \
 
121
                fi)))
 
122
 
122
123
endif