[SCM] blender/master: Fix upgrade path from wheezy

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d1451a2d3de0edc908691293baba6f752093acaf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 6 06:12:28 2013 +0200

    Fix upgrade path from wheezy
    
    This replaces unbreaks a file conflict:
    Unpacking blender-data (from .../blender-data_2.67b-1_all.deb) ...
    dpkg: error processing /var/cache/apt/archives/blender-data_2.67b-1_all.deb (--unpack):
     trying to overwrite '/usr/share/doc-base/blender', which is also in package blender 2.63a-1
    dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

diff --git a/debian/control b/debian/control
index 8d3f470..a516087 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,7 @@ Architecture: all
 Depends: python3.3,
          ${misc:Depends},
          ${python3:Depends}
+Replaces: blender (<< 2.67b-1~)
 Description: Very fast and versatile 3D modeller/renderer - data package
  Blender is an integrated 3d suite for modelling, animation, rendering,
  post-production, interactive creation and playback (games). Blender has its

-- 
blender packaging