Revision: 35966
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35966
Author: campbellbarton
Date: 2011-04-02 21:51:05 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
patch [#26606] Debian spec: Bump to Python 3.2
also update pacman spec.
Modified Paths:
--------------
trunk/blender/build_files/package_spec/debian/control
trunk/blender/build_files/package_spec/debian/rules
trunk/blender/build_files/package_spec/pacman/PKGBUILD
Modified: trunk/blender/build_files/package_spec/debian/control
===================================================================
--- trunk/blender/build_files/package_spec/debian/control 2011-04-02
21:11:22 UTC (rev 35965)
+++ trunk/blender/build_files/package_spec/debian/control 2011-04-02
21:51:05 UTC (rev 35966)
@@ -2,10 +2,10 @@
Section: graphics
Priority: extra
Maintainer: Dan Eicher <[email protected]>
-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
Modified: trunk/blender/build_files/package_spec/debian/rules
===================================================================
--- trunk/blender/build_files/package_spec/debian/rules 2011-04-02 21:11:22 UTC
(rev 35965)
+++ trunk/blender/build_files/package_spec/debian/rules 2011-04-02 21:51:05 UTC
(rev 35966)
@@ -19,6 +19,9 @@
-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 @@
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)
Modified: trunk/blender/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD 2011-04-02
21:11:22 UTC (rev 35965)
+++ trunk/blender/build_files/package_spec/pacman/PKGBUILD 2011-04-02
21:51:05 UTC (rev 35966)
@@ -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 @@
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=()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
