[SCM] blender/master: debian/patches: 0010 updated because of 0007 retab-ed

kiniou-guest at users.alioth.debian.org kiniou-guest at users.alioth.debian.org
Thu Jan 26 18:24:16 UTC 2012


The following commit has been merged in the master branch:
commit 102499c6aff06e6a955f6dd99130030b0f29769b
Author: Kevin Roy <kiniou at gmail.com>
Date:   Thu Jan 26 19:20:14 2012 +0100

    debian/patches: 0010 updated because of 0007 retab-ed
    
    The patch 0010 modify the same file as 0007 and 0007 has been retabed
    so this is a minor update.
    
    Git-Dch: Ignore

diff --git a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
index 1194d2b..69de990 100644
--- a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
+++ b/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
@@ -9,12 +9,12 @@ Global installation expects system patch to be something like
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
-index e79d850..bc6f6e6 100644
+index 980e26b..bc42cec 100644
 --- a/source/blender/blenlib/intern/path_util.c
 +++ b/source/blender/blenlib/intern/path_util.c
 @@ -89,7 +89,7 @@
  #  else /* new XDG ~/blender/.config/ */
- #    define BLENDER_USER_FORMAT			"%s/blender/%s"
+ #	 define BLENDER_USER_FORMAT			"%s/blender/%s"
  #  endif // WITH_XDG_USER_DIRS
 -#  define BLENDER_SYSTEM_FORMAT			"%s/blender/%s"
 +#  define BLENDER_SYSTEM_FORMAT			"%s/blender"

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list