[SCM] blender/master: debian/patches: drop inactive use_systemwide_libraries.patch

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

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

    debian/patches: drop inactive use_systemwide_libraries.patch

diff --git a/debian/patches/0002-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
similarity index 100%
rename from debian/patches/0002-blender_thumbnailer.patch
rename to debian/patches/0001-blender_thumbnailer.patch
diff --git a/debian/patches/0001-use_systemwide_libraries.patch b/debian/patches/0001-use_systemwide_libraries.patch
deleted file mode 100644
index 4ea5b99..0000000
--- a/debian/patches/0001-use_systemwide_libraries.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 14 Apr 2011 14:51:22 +0200
-Subject: use_systemwide_libraries
-
-Don't try and use extern/libopenjpeg nor extern/glew
----
- CMakeLists.txt |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eaa75dd..4874085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -627,6 +627,12 @@ if(UNIX AND NOT APPLE)
- 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel")
- 	endif()
- 
-+	# Use system-wide GLEW & OpenJPEG:
-+	#SET(LLIBS "${LLIBS} -lGLEW")
-+	#SET(LLIBS "${LLIBS} -lopenjpeg")
-+
-+	#ADD_DEFINITIONS(-DWITH_OPENJPEG)
-+
- elseif(WIN32)
- 
- 	# this file is included anyway when building under Windows with cl.exe
--- 
diff --git a/debian/patches/0003-fix_FTBFS_on_KFreeBSD.patch b/debian/patches/0002-fix_FTBFS_on_KFreeBSD.patch
similarity index 100%
rename from debian/patches/0003-fix_FTBFS_on_KFreeBSD.patch
rename to debian/patches/0002-fix_FTBFS_on_KFreeBSD.patch
diff --git a/debian/patches/0004-disable_tests.patch b/debian/patches/0003-disable_tests.patch
similarity index 100%
rename from debian/patches/0004-disable_tests.patch
rename to debian/patches/0003-disable_tests.patch
diff --git a/debian/patches/0005-install_in_usr_lib.patch b/debian/patches/0004-install_in_usr_lib.patch
similarity index 100%
rename from debian/patches/0005-install_in_usr_lib.patch
rename to debian/patches/0004-install_in_usr_lib.patch
diff --git a/debian/patches/0006-filter_docs_to_install.patch b/debian/patches/0005-filter_docs_to_install.patch
similarity index 100%
rename from debian/patches/0006-filter_docs_to_install.patch
rename to debian/patches/0005-filter_docs_to_install.patch
diff --git a/debian/patches/0007-locales_directory_install.patch b/debian/patches/0006-locales_directory_install.patch
similarity index 100%
rename from debian/patches/0007-locales_directory_install.patch
rename to debian/patches/0006-locales_directory_install.patch
diff --git a/debian/patches/0008-update_manpages.patch b/debian/patches/0007-update_manpages.patch
similarity index 100%
rename from debian/patches/0008-update_manpages.patch
rename to debian/patches/0007-update_manpages.patch
diff --git a/debian/patches/0009-fix_FTBFS_with_ffmpeg_from_debian.patch b/debian/patches/0008-fix_FTBFS_with_ffmpeg_from_debian.patch
similarity index 100%
rename from debian/patches/0009-fix_FTBFS_with_ffmpeg_from_debian.patch
rename to debian/patches/0008-fix_FTBFS_with_ffmpeg_from_debian.patch
diff --git a/debian/patches/0010-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0009-do_not_use_version_number_in_the_system_path.patch
similarity index 100%
rename from debian/patches/0010-do_not_use_version_number_in_the_system_path.patch
rename to debian/patches/0009-do_not_use_version_number_in_the_system_path.patch
diff --git a/debian/patches/0011-fix_FTBFS_with_libmv.patch b/debian/patches/0010-fix_FTBFS_with_libmv.patch
similarity index 100%
rename from debian/patches/0011-fix_FTBFS_with_libmv.patch
rename to debian/patches/0010-fix_FTBFS_with_libmv.patch
diff --git a/debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0011-look_for_droid_ttf_with_fontconfig.patch
similarity index 99%
rename from debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch
rename to debian/patches/0011-look_for_droid_ttf_with_fontconfig.patch
index 26acd85..6589ece 100644
--- a/debian/patches/0012-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0011-look_for_droid_ttf_with_fontconfig.patch
@@ -18,7 +18,7 @@ use fontconfig to get it
  create mode 100644 build_files/cmake/Modules/FindFontconfig.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4874085..925f283 100644
+index eaa75dd..2ede279 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -117,6 +117,9 @@ option(WITH_BLENDER "Build blender (disable to build only the blender player)" O
diff --git a/debian/patches/series b/debian/patches/series
index 14ffebd..d62d333 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,11 @@
-0001-use_systemwide_libraries.patch
-0002-blender_thumbnailer.patch
-0003-fix_FTBFS_on_KFreeBSD.patch
-0004-disable_tests.patch
-0005-install_in_usr_lib.patch
-0006-filter_docs_to_install.patch
-0007-locales_directory_install.patch
-0008-update_manpages.patch
-0009-fix_FTBFS_with_ffmpeg_from_debian.patch
-0010-do_not_use_version_number_in_the_system_path.patch
-0011-fix_FTBFS_with_libmv.patch
-0012-look_for_droid_ttf_with_fontconfig.patch
+0001-blender_thumbnailer.patch
+0002-fix_FTBFS_on_KFreeBSD.patch
+0003-disable_tests.patch
+0004-install_in_usr_lib.patch
+0005-filter_docs_to_install.patch
+0006-locales_directory_install.patch
+0007-update_manpages.patch
+0008-fix_FTBFS_with_ffmpeg_from_debian.patch
+0009-do_not_use_version_number_in_the_system_path.patch
+0010-fix_FTBFS_with_libmv.patch
+0011-look_for_droid_ttf_with_fontconfig.patch

-- 
blender packaging