[SCM] blender/master.cycles: debian/patches/: patchset re-worked for path changing
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Sun Jul 15 14:34:41 UTC 2012
The following commit has been merged in the master.cycles branch:
commit 4655bf803daa1e4eaffb92be7993f70e46a5bf27
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Sat Jul 14 17:14:58 2012 +0200
debian/patches/: patchset re-worked for path changing
For consistency with the Cycles addon (placed under
/usr/share path), patchset modifying the path stuff
from /usr/share to /usr/lib has been "reverted".
Git-Dch: Short
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index c97b900..58de292 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -10,7 +10,7 @@ Subject: blender_thumbnailer
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/release/bin/blender-thumbnailer.py b/release/bin/blender-thumbnailer.py
-index 8b93eeb..a056852 100755
+index 8b93eeb..44ffd48 100755
--- a/release/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
@@ -1,4 +1,4 @@
@@ -24,12 +24,12 @@ index 8b93eeb..a056852 100755
To run automatically with nautilus:
gconftool --type boolean --set /desktop/gnome/thumbnailers/application at x-blender/enable true
- gconftool --type string --set /desktop/gnome/thumbnailers/application at x-blender/command "blender-thumbnailer.py %u %o"
-+ gconftool --type string --set /desktop/gnome/thumbnailers/application at x-blender/command "/usr/lib/blender/scripts/blender-thumbnailer.py %i %o"
++ gconftool --type string --set /desktop/gnome/thumbnailers/application at x-blender/command "/usr/share/blender/scripts/blender-thumbnailer.py %i %o"
"""
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 0168c06..caf990f 100644
+index 0168c06..65682fb 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -384,7 +384,7 @@ if(UNIX AND NOT APPLE)
@@ -37,7 +37,7 @@ index 0168c06..caf990f 100644
install(
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
- DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
)
install(
FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
diff --git a/debian/patches/0003-install_in_usr_lib.patch b/debian/patches/0003-install_in_usr_lib.patch
deleted file mode 100644
index fd4ea4d..0000000
--- a/debian/patches/0003-install_in_usr_lib.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sat, 28 Apr 2012 10:50:34 +0200
-Subject: install_in_usr_lib
-
- * Arch-specific files go to /usr/lib rather than /usr/share
- * Make blender look for systemdir into /usr/lib instead of /usr/share
----
- intern/ghost/intern/GHOST_SystemPathsX11.cpp | 2 +-
- source/creator/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-index 6dad366..f91b645 100644
---- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-+++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
-@@ -47,7 +47,7 @@
- #endif
-
- #ifdef PREFIX
--static const char *static_path= PREFIX "/share";
-+static const char *static_path= PREFIX "/lib";
- #else
- static const char *static_path= NULL;
- #endif
-diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index caf990f..7b61535 100644
---- a/source/creator/CMakeLists.txt
-+++ b/source/creator/CMakeLists.txt
-@@ -281,8 +281,8 @@ if(WITH_PYTHON)
- endif()
-
- install(
-- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
-- DESTINATION ${TARGETDIR_VER}
-+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts/
- PATTERN ".svn" EXCLUDE
- PATTERN "__pycache__" EXCLUDE
- PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0003-install_in_usr_share.patch
new file mode 100644
index 0000000..e2ce1b5
--- /dev/null
+++ b/debian/patches/0003-install_in_usr_share.patch
@@ -0,0 +1,25 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sat, 28 Apr 2012 10:50:34 +0200
+Subject: install_in_usr_share
+
+ * Arch-specific files go to /usr/share
+ * Make blender look for systemdir into /usr/share
+---
+ source/creator/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index 65682fb..8371524 100644
+--- a/source/creator/CMakeLists.txt
++++ b/source/creator/CMakeLists.txt
+@@ -281,8 +281,8 @@ if(WITH_PYTHON)
+ endif()
+
+ install(
+- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
+- DESTINATION ${TARGETDIR_VER}
++ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts/
+ PATTERN ".svn" EXCLUDE
+ PATTERN "__pycache__" EXCLUDE
+ PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
index 85a3adc..6bb69c8 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-filter_docs_to_install.patch
@@ -2,13 +2,13 @@ From: "Matteo F. Vescovi" <m.vescovi at revese.it>
Date: Thu, 22 Dec 2011 18:13:03 +0100
Subject: filter_docs_to_install
-Install relevant documentation
+Install only relevant documentation
---
source/creator/CMakeLists.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 7b61535..dadf1fc 100644
+index 8371524..3632b84 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -226,8 +226,6 @@ else()
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index 2926e4f..60596e0 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -11,7 +11,7 @@ Change where locales are installed
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
-index 435ca87..8f48bae 100644
+index 435ca87..20cd74a 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
@@ -110,7 +110,7 @@ static const char *locales[] = {
@@ -19,7 +19,7 @@ index 435ca87..8f48bae 100644
void BLF_lang_init(void)
{
- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
-+ char *messagepath= BLI_get_folder(BLENDER_SYSTEM_LOCALE, NULL);
++ char *messagepath = BLI_get_folder(BLENDER_SYSTEM_LOCALE, NULL);
BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name));
@@ -50,7 +50,7 @@ index 3c59ca8..4cf617f 100644
return path;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index dadf1fc..857e3d4 100644
+index 3632b84..47b4853 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -293,9 +293,9 @@ endif()
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index d2c6461..c4dd497 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0006-update_manpages.patch
@@ -150,7 +150,7 @@ index 0000000..d15b0c9
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou at gmail.com>.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 857e3d4..2e7c1cd 100644
+index 47b4853..712f608 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -322,6 +322,7 @@ if(UNIX AND NOT APPLE)
@@ -162,7 +162,7 @@ index 857e3d4..2e7c1cd 100644
)
@@ -385,7 +386,9 @@ if(UNIX AND NOT APPLE)
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/blender/scripts
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts
)
install(
- FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
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 79d07a2..6b8ba8e 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
@@ -3,7 +3,7 @@ Date: Sat, 28 Apr 2012 11:02:59 +0200
Subject: do_not_use_version_number_in_the_system_path
Global installation expects system patch to be something like
-/usr/lib/blender/scripts/ without version numbers.
+/usr/share/blender/scripts/ without version numbers.
---
source/blender/blenlib/intern/path_util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 8a372a7..dfde6ad 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 2e7c1cd..3e34146 100644
+index 712f608..0f86f85 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -294,7 +294,6 @@ if(WITH_INTERNATIONAL)
diff --git a/debian/patches/series b/debian/patches/series
index 85eef24..6444683 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
0001-blender_thumbnailer.patch
0002-disable_tests.patch
-0003-install_in_usr_lib.patch
+0003-install_in_usr_share.patch
0004-filter_docs_to_install.patch
0005-locales_directory_install.patch
0006-update_manpages.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list