patch [#26606] Debian spec: Bump to Python 3.2
authorCampbell Barton <ideasman42@gmail.com>
Sat, 2 Apr 2011 21:51:05 +0000 (21:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 2 Apr 2011 21:51:05 +0000 (21:51 +0000)
also update pacman spec.

build_files/package_spec/debian/control
build_files/package_spec/debian/rules
build_files/package_spec/pacman/PKGBUILD

index 7329a552dbc771612ae276a006890c20424afc9f..be703e0507131464ed836b1f00bd182ead949f75 100644 (file)
@@ -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
index 14cc9e02ae40164cb926c9c792b9fb85e0330697..7a3d2d52adcf78a3673733d6e027d0bce4a3a5b7 100755 (executable)
@@ -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)
index 988e246f0cc36ef614666f42cb198193ecd9b74f..0c4164b1242e1c64eb690d755aa8e57e00d6c812 100644 (file)
@@ -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=()