← Back to branch summary

~ubuntu-branches/ubuntu/hardy/blender/hardy

« back to all changes in this revision

Viewing changes to debian/patches/50_debian_build_config

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Hahler
  • Date: 2008-02-16 20:52:35 UTC
  • Revision ID: james.westby@ubuntu.com-20080216205235-wxqkl74kqy0dw8oc
Tags: 2.45-3ubuntu1
https://launchpad.net/bugs/191130
* Merge from Debian unstable (LP: #191130), remaining changes:
  - Add 30_gameengine-libgl-location-fix.dpatch: use correct libGL SONAME,
    otherwise blender will not start if e.g. libgl1-mesa-dev is missing
  - debian/control
    + Build-depends: python2.5-dev instead of 2.4
    + DebianMaintainerField
* Changed debian/patches/50_debian_build_config to use BF_PYTHON_VERSION=2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/50_debian_build_config
9
9
 BF_VERSE_INCLUDE = "#extern/verse/dist"
10
10
 
11
11
 BF_PYTHON = '/usr'
12
 
-BF_PYTHON_VERSION = '2.5'
13
 
+BF_PYTHON_VERSION = '2.4'
 
12
 BF_PYTHON_VERSION = '2.5'
14
13
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
15
14
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
16
15
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'