diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-03 01:51:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-03 01:51:05 +0400 |
| commit | 21bd7fd8d5fb908674efcb8528f2d4a7064ea948 (patch) | |
| tree | f3d49b1674e7770904361b60880283d363b8bd51 /build_files/package_spec | |
| parent | 90326c4c6e6c312ac4bf97dc443c32c8c0206ec6 (diff) | |
patch [#26606] Debian spec: Bump to Python 3.2
also update pacman spec.
Diffstat (limited to 'build_files/package_spec')
| -rw-r--r-- | build_files/package_spec/debian/control | 4 | ||||
| -rwxr-xr-x | build_files/package_spec/debian/rules | 5 | ||||
| -rw-r--r-- | build_files/package_spec/pacman/PKGBUILD | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/build_files/package_spec/debian/control b/build_files/package_spec/debian/control index 7329a552dbc..be703e05071 100644 --- a/build_files/package_spec/debian/control +++ b/build_files/package_spec/debian/control @@ -2,10 +2,10 @@ Source: blender Section: graphics Priority: extra Maintainer: Dan Eicher <dan@trollwerks.org> -Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev, libopenjpeg-dev +Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.2-dev, libopenjpeg-dev Standards-Version: 3.9.1 Homepage: http://blender.org/ -X-Python3-Version: >= 3.1, << 3.2 +X-Python3-Version: >= 3.2, << 3.3 Package: blender-snapshot Architecture: any diff --git a/build_files/package_spec/debian/rules b/build_files/package_spec/debian/rules index 14cc9e02ae4..7a3d2d52adc 100755 --- a/build_files/package_spec/debian/rules +++ b/build_files/package_spec/debian/rules @@ -19,6 +19,9 @@ override_dh_auto_configure: -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_OPENCOLLADA:BOOL=OFF +override_dh_auto_test: + # don't run CTest + override_dh_install: dh_install @@ -26,7 +29,7 @@ override_dh_install: rm -rf debian/blender-snapshot/usr/share/doc/blender override_dh_python3: - dh_python3 -V 3.1-3.2 /usr/share/blender/$(REL)/scripts + dh_python3 -V 3.2-3.3 /usr/share/blender/$(REL)/scripts get-orig-source: rm -rf get-orig-source $(TARBALL) diff --git a/build_files/package_spec/pacman/PKGBUILD b/build_files/package_spec/pacman/PKGBUILD index 988e246f0cc..0c4164b1242 100644 --- a/build_files/package_spec/pacman/PKGBUILD +++ b/build_files/package_spec/pacman/PKGBUILD @@ -3,11 +3,11 @@ # custom blender vars blender_srcdir=$(dirname $startdir)"/../.." # value may be formatted: 35042:35051M -blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | tr -dc 0-9) -blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9) +blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | awk '{print $3}') +blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}') blender_version=$(expr $blender_version / 100).$(expr $blender_version % 100) # 256 -> 2.56 blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blender_srcdir/source/blender/blenkernel/BKE_blender.h) -# blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9) +# blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}') # map the version a -> 1 # not to be confused with blender's internal subversions @@ -25,7 +25,7 @@ arch=('i686' 'x86_64') url="www.blender.org" license=('GPL') groups=() -depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'python>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg') +depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'python>=3.2' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg') makedepends=('cmake' 'svn') optdepends=() provides=() |