[SCM] blender/master: debian/patches/: #0008 modified for full system path

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

The following commit has been merged in the master branch:
commit 8b5566e8a6f619a41dce24b911292b51a2cdd6b9
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sun Jul 15 16:11:20 2012 +0200

    debian/patches/: #0008 modified for full system path
    
    Git-Dch: Ignore

diff --git a/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
index 6b8ba8e..53392f0 100644
--- a/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
+++ b/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
@@ -1,12 +1,13 @@
 From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sat, 28 Apr 2012 11:02:59 +0200
+Date: Sun, 15 Jul 2012 16:10:09 +0200
 Subject: do_not_use_version_number_in_the_system_path
 
 Global installation expects system patch to be something like
 /usr/share/blender/scripts/ without version numbers.
 ---
  source/blender/blenlib/intern/path_util.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ source/creator/CMakeLists.txt             |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
 index 4cf617f..b2a584d 100644
@@ -30,3 +31,16 @@ index 4cf617f..b2a584d 100644
  	}
  	
  	if (!system_path[0])
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index 712f608..3cc5a62 100644
+--- a/source/creator/CMakeLists.txt
++++ b/source/creator/CMakeLists.txt
+@@ -241,7 +241,7 @@ if(UNIX AND NOT APPLE)
+ 		if(WITH_PYTHON_MODULE)
+ 			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
+ 		else()
+-			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
++			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender)
+ 		endif()
+ 	endif()
+ 
diff --git a/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
index dfde6ad..dbe41fb 100644
--- a/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
@@ -250,7 +250,7 @@ index 4b5ea44..2fa648b 100644
  /* return 1 when file can be written */
  int BLI_file_is_writable(const char *filename)
 diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 712f608..0f86f85 100644
+index 3cc5a62..cbced07 100644
 --- a/source/creator/CMakeLists.txt
 +++ b/source/creator/CMakeLists.txt
 @@ -294,7 +294,6 @@ if(WITH_INTERNATIONAL)

-- 
blender packaging