[SCM] blender/master: debian/: fix FTBFS on Python 3.3

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Sat Jan 12 15:32:27 UTC 2013


The following commit has been merged in the master branch:
commit 436147b78ae4e2cd0933160475e055f41c2bc1dd
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sat Jan 12 16:19:51 2013 +0100

    debian/: fix FTBFS on Python 3.3
    
    The patch provided by Dmitrijs Ledkovs
    wasn't directly appliable on the new source code
    since it was prepared against 2.63a version.
    The patch itself was dropped and few changes
    were made eventually.
    
    Closes: #692376
    Thanks: Dmitrijs Ledkovs for the hint.
    Git-Dch: Short

diff --git a/debian/control b/debian/control
index db2fd90..2ec9af3 100644
--- a/debian/control
+++ b/debian/control
@@ -42,9 +42,10 @@ Build-Depends: autotools-dev,
                libz-dev,
                libfontconfig-dev,
                pkg-config,
-               python-support,
-               python3.2-dev,
+               python3-dev,
+               python3.3-dev,
                subversion
+X-Python3-Version: >= 3.3
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.9.3
 Homepage: http://blender.org
@@ -53,9 +54,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/blender.git
 
 Package: blender
 Architecture: any
-Depends: python3.2,
-         fonts-droid,
+Depends: fonts-droid,
          ${misc:Depends},
+         ${python3:Depends},
          ${shlibs:Depends}
 Suggests: libtiff4,
           yafaray-exporter
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index a3ec5a4..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-3.2
diff --git a/debian/rules b/debian/rules
index 4a80d31..337b185 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_configure:
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DPYTHON_VERSION=3.2 \
+		-DPYTHON_VERSION=3.3 \
 		-DWITH_IMAGE_OPENJPEG=ON \
 		-DWITH_FFTW3=ON \
 		-DWITH_JACK=ON \
@@ -60,9 +60,5 @@ override_dh_install:
 override_dh_strip:
 	dh_strip --dbg-package=blender-dbg
 
-override_dh_pysupport:
-	# Not supported yet: dh_pysupport -V 3.1
-	#dh_pysupport -V 3.1
-
 %:
-	dh $@ --buildsystem=cmake --parallel=$(PROCESSORS)
+	dh $@ --buildsystem=cmake --parallel=$(PROCESSORS) --with python3

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list