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

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

Target to unstable.
debian/changelog: update due to new upstream release
debian/patches/: #0010 and #0011 dropped (applied upstream)
Merge tag 'upstream/2.63'
Imported Upstream version 2.63
Update
Set DM-Upload-Allowed: yes.
debian/patches/: #0011 fixed
debian/changelog: entry + UNRELEASED => unstable
debian/patches/: #0011 added to fix openjpeg transition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.cycles
X-Git-Reftype: branch
X-Git-Oldrev: 44d540735edc63216cf4864288e016485bef6650
X-Git-Newrev: f74413186ad53abeecf94c559e7c771f8a5132f7

The following commit has been merged in the master.cycles branch:
commit 98329d33a73a6169d0c669b06382f5417c36734d
Merge: 44d540735edc63216cf4864288e016485bef6650 f2873f28239ef0662db2cdc4f381dd97d2558f0a
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sat May 5 17:59:05 2012 +0200

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

diff --combined debian/changelog
index b6a0e5b,2cb3dd1..ed179a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,27 +1,33 @@@
- blender (2.62-2~cycles) UNRELEASED; urgency=low
++blender (2.63-1~cycles) UNRELEASED; urgency=low
 +
 +  * debian/: Cycles support added (Closes: #658075)
 +
 + -- Matteo F. Vescovi <mfv.debian at gmail.com>  Mon, 16 Apr 2012 18:27:49 +0200
 +
- blender (2.62-2) UNRELEASED; urgency=low
+ blender (2.63-1) unstable; urgency=low
  
+   * New upstream release
+   * debian/patches/:
+     + patchset re-worked since source code changed
+     + #0010 and #0011 dropped (applied upstream)
+ 
+  -- Matteo F. Vescovi <mfv.debian at gmail.com>  Sat, 28 Apr 2012 12:11:12 +0200
+ 
+ blender (2.62-2) unstable; urgency=low
+ 
+   [ Matteo F. Vescovi ]
    * 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
+   * debian/patches/: #0011 added to fix openjpeg transition.
+     Thanks to Mathieu Malaterre (malat) for the patch (Closes: #670219)
+ 
+   [ Alessio Treglia ]
+   * Set DM-Upload-Allowed: yes.
  
-  -- Matteo F. Vescovi <mfv.debian at gmail.com>  Wed, 04 Apr 2012 11:05:29 +0200
+  -- Matteo F. Vescovi <mfv.debian at gmail.com>  Tue, 24 Apr 2012 11:02:59 +0200
  
  blender (2.62-1) unstable; urgency=low
  
diff --combined debian/control
index e9d8aa4,5bc2cc1..58d6ff9
--- a/debian/control
+++ b/debian/control
@@@ -5,6 -5,7 +5,7 @@@ Maintainer: Debian Multimedia Maintaine
  Uploaders: Alessio Treglia <alessio at debian.org>,
             Kevin Roy <kiniou at gmail.com>,
             Matteo F. Vescovi <mfv.debian at gmail.com>
+ DM-Upload-Allowed: yes
  Build-Depends: autotools-dev,
                 cmake,
                 debhelper (>= 7.0.50~),
@@@ -13,7 -14,6 +14,7 @@@
                 libavdevice-dev,
                 libavformat-dev,
                 libboost-dev,
 +               libboost-filesystem-dev,
                 libfftw3-dev,
                 libgettextpo-dev,
                 libglew-dev,
@@@ -24,7 -24,6 +25,7 @@@
                 liblzo2-dev,
                 libopenal-dev,
                 libopenexr-dev,
 +               libopenimageio-dev,
                 libopenjpeg-dev,
                 libpng-dev,
                 libsdl-dev,

-- 
blender packaging