[SCM] blender/master.jessie-bpo: Merge branch 'master' into master.jessie-bpo

[mfv at users.alioth.debian.org]

Remove myself from the Uploaders field
debian/changelog: UNRELEASED => unstable
debian/changelog: new revision entry added
debian/control: libjemalloc-dev b-dep added
debian/rules: couple of useless license text files dropped
debian/patches/: patchset updated
debian/copyright: license names fixed
debian/TODO: obsolete file dropped
debian/rules: useless license text file dropped
debian/rules: Cmake configure parameters sorted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.jessie-bpo
X-Git-Reftype: branch
X-Git-Oldrev: 897e2e19e4dd9e9879e943c1751612d199381447
X-Git-Newrev: 5bf24cd1b7666f73eced4c27d61136e6c7f593ca

The following commit has been merged in the master.jessie-bpo branch:
commit f9a69c60fef3bba0449946c948d4faf2c659fb4f
Merge: 897e2e19e4dd9e9879e943c1751612d199381447 eb4686f816f35c61adccde18fc4d2483cb8c95cd
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Mon Jul 27 14:25:54 2015 +0200

    Merge branch 'master' into master.jessie-bpo

diff --combined debian/changelog
index 70d1b74,c13c82b..f1e2263
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ blender (2.74+dfsg0-4) unstable; urgency=medium
+ 
+   * debian/patches/: patchset updated (Closes: #790970)
+     - 0003-filter_docs_to_install.patch dropped
+     - #0004 renamed to #0003
+     - #0005 renamed to #0004
+     - #0006 renamed to #0005
+     - #0008 renamed to #0006
+     - 0007-look_for_droid_ttf_with_fontconfig.patch improved
+   * debian/control: libjemalloc-dev b-dep added
+   * debian/copyright: license names fixed
+   * debian/rules: useless license text files dropped
+   * debian/TODO: obsolete file dropped
+ 
+  -- Matteo F. Vescovi <mfv at debian.org>  Mon, 20 Jul 2015 08:39:33 +0200
+ 
 +blender (2.74+dfsg0-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Matteo F. Vescovi <mfv at debian.org>  Thu, 09 Jul 2015 14:21:34 +0200
 +
  blender (2.74+dfsg0-3) unstable; urgency=medium
  
    * debian/rules: NDOF parameter added (Closes: #784796)
@@@ -12,12 -22,6 +28,12 @@@
  
   -- Matteo F. Vescovi <mfv at debian.org>  Thu, 02 Jul 2015 22:33:51 +0200
  
 +blender (2.74+dfsg0-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Alessio Treglia <alessio at debian.org>  Tue, 23 Jun 2015 09:03:07 +0100
 +
  blender (2.74+dfsg0-2) unstable; urgency=medium
  
    * Upload to unstable (Closes: #783838)

-- 
blender packaging