[SCM] blender/master: Merge branch 'master' into master.cycles

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit efd6dd0a2a85156038c950a7a67e566fe01a8602
Merge: 4fddcbeadb574e8bc1f49774578723831dfb27ca 61c3e31d98da6dff4f8d5810cec4dd984aa93935
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Apr 16 18:27:08 2012 +0200

    Merge branch 'master' into master.cycles
    
    Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>

diff --combined debian/changelog
index 9b95d8b,b7fe079..7c1435b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
- blender (2.62-1~cycles) unstable; urgency=low
++blender (2.62-2~cycles) UNRELEASED; urgency=low
 +
 +  * debian/: Cycles support added (Closes: #658075)
 +
 + -- Matteo F. Vescovi <mfv.debian at gmail.com>  Mon, 02 Apr 2012 17:04:49 +0200
 +
+ blender (2.62-2) UNRELEASED; urgency=low
+ 
+   * debian/patches/: #0010 added to fix typo.
+     Thanks to Ronny Standtke for the patch (Closes: #667458)
+   * debian/: README.source and TODO files updated.
+   * debian/control: freeglut3-dev b-dep removed.
+     Thanks to Campbell Barton for both these entries
+ 
+  -- Matteo F. Vescovi <mfv.debian at gmail.com>  Wed, 04 Apr 2012 11:05:29 +0200
+ 
  blender (2.62-1) unstable; urgency=low
  
    * New upstream release (Closes: #661063)
diff --combined debian/control
index d6dced6,dbc4391..e9d8aa4
--- a/debian/control
+++ b/debian/control
@@@ -8,13 -8,11 +8,12 @@@ Uploaders: Alessio Treglia <alessio at deb
  Build-Depends: autotools-dev,
                 cmake,
                 debhelper (>= 7.0.50~),
-                freeglut3-dev,
                 gettext,
                 libalut-dev,
                 libavdevice-dev,
                 libavformat-dev,
                 libboost-dev,
 +               libboost-filesystem-dev,
                 libfftw3-dev,
                 libgettextpo-dev,
                 libglew-dev,
@@@ -25,7 -23,6 +24,7 @@@
                 liblzo2-dev,
                 libopenal-dev,
                 libopenexr-dev,
 +               libopenimageio-dev,
                 libopenjpeg-dev,
                 libpng-dev,
                 libsdl-dev,

-- 
blender packaging