Dear Hatta-san, I'd really really like to see blender 2.35 (and possibly later 2.36) get into Sarge, but the build failures on mips and mipsel so far prevent this, as addressed in Bug#288882.
I've prepared the attached interdiff, partially following Frank's proposal, which according to my local tests solves that problem. Please give your blessing to a NMU. Also find attached the debdiff output between 2.35-1 from the archive and the version I prepared, 2.35-1.1. Additionally both debs give the same result on a lintian run, so IMHO there won't be any regressions. Furthermore the new diff.gz seems to apply cleanly to upstream's 2.36, so perhaps I could upload a 2.36-0.1 once 2.35 reaches Sarge, please see Bug#288883 for my rationale... What do you think about those two NMU proposals? Cheers, Flo
File lists identical (after any substitutions)
The following lines in the control files differ (wdiff output format):
----------------------------------------------------------------------
Version: [-2.35-1-] {+2.35-1.1+}
Depends: libc6 (>= 2.3.2.ds1-4), libfreetype6 (>= 2.1.5-1), libgcc1 (>=
1:3.4.1-3), libgettextpo0, {+libgl1,+} libglu1-mesa | libglu1, libjpeg62,
libopenal0, libpng12-0 (>= 1.2.8rel), libsdl1.2debian (>> [-1.2.7-0),-]
{+1.2.7+1.2.8),+} libstdc++5 (>= 1:3.3.4-1), libx11-6 | xlibs (>> 4.1.0),
python2.3 (>= 2.3), [-xlibmesa-gl | libgl1,-] zlib1g (>= 1:1.2.1), gettext (>=
0.14.1)
diff -u blender-2.35/debian/patches/01_SConstruct_debian.dpatch blender-2.35/debian/patches/01_SConstruct_debian.dpatch --- blender-2.35/debian/patches/01_SConstruct_debian.dpatch +++ blender-2.35/debian/patches/01_SConstruct_debian.dpatch @@ -22,15 +22,6 @@ diff -urN blender-2.35.orig/SConstruct blender-2.35/SConstruct --- blender-2.35.orig/SConstruct 2004-11-15 05:37:32.000000000 +0900 +++ blender-2.35/SConstruct 2004-12-09 07:15:42.000000000 +0900 -@@ -31,7 +31,7 @@ - playername = 'blenderplayer$PROGSUFFIX' - - # Build directory. --# root_build_dir = '..' + os.sep + 'build' + os.sep + sys.platform + os.sep -+root_build_dir = '.' + os.sep + 'build' + os.sep + sys.platform + os.sep - - bs_config.parseOpts() - @@ -52,9 +52,9 @@ env = Environment () diff -u blender-2.35/debian/changelog blender-2.35/debian/changelog --- blender-2.35/debian/changelog +++ blender-2.35/debian/changelog @@ -1,3 +1,11 @@ +blender (2.35-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Split out parts of 01_SConstruct_debian.dpatch: root_build_dir + needs to get adjusted before the clean target runs - closes: #288882 + + -- Florian Ernst <[EMAIL PROTECTED]> Thu, 10 Feb 2005 02:45:38 +0100 + blender (2.35-1) unstable; urgency=low * "The Brief Return From The Hell, Pt. 2" release. only in patch2: unchanged: --- blender-2.35.orig/SConstruct +++ blender-2.35/SConstruct @@ -35,6 +35,10 @@ bs_config.parseOpts() +# Setting build directory here so blender won't touch anything outside +# its build environment, see Bug#288882. Thanks Frank! +bs_globals.root_build_dir = '.' + os.sep + 'build' + os.sep + sys.platform + os.sep + # Create the build directory. SCons does this automatically, but since we # don't want to put scons-generated .sconsign files in the source tree, but in # the root_build_dir, we have to create that dir ourselves before SCons tries
signature.asc
Description: Digital signature
