[SCM] blender/master: debian/patches/: few patches re-worked by git

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

The following commit has been merged in the master branch:
commit efe3d737e3b70f768cfa8aa0dbde03f7f70e2157
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Apr 4 11:02:29 2012 +0200

    debian/patches/: few patches re-worked by git
    
    Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
    
    Git-Dch: Ignore

diff --git a/debian/patches/0002-disable_tests.patch b/debian/patches/0002-disable_tests.patch
index 25dcb6a..b698789 100644
--- a/debian/patches/0002-disable_tests.patch
+++ b/debian/patches/0002-disable_tests.patch
@@ -5,7 +5,7 @@ Subject: disable_tests
 added WITH_TESTS condition to implicitly disable
 ---
  source/CMakeLists.txt |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
 index 529aaac..eb1f32a 100644
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
index 5e4b650..0c6329c 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-filter_docs_to_install.patch
@@ -5,7 +5,7 @@ Subject: filter_docs_to_install
 Install relevant documentation
 ---
  source/creator/CMakeLists.txt |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
 
 diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
 index 7a6a581..7480ab8 100644
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index 2afc5ae..c544c75 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0006-update_manpages.patch
@@ -9,7 +9,7 @@ Signed-off-by: Kevin Roy <kiniou at gmail.com>
 ---
  doc/manpage/blenderplayer.1   |  131 +++++++++++++++++++++++++++++++++++++++++
  source/creator/CMakeLists.txt |    5 +-
- 2 files changed, 135 insertions(+), 1 deletions(-)
+ 2 files changed, 135 insertions(+), 1 deletion(-)
  create mode 100644 doc/manpage/blenderplayer.1
 
 diff --git a/doc/manpage/blenderplayer.1 b/doc/manpage/blenderplayer.1
diff --git a/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
index 39c2f36..95ae784 100644
--- a/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
+++ b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
@@ -10,10 +10,10 @@ Signed-off-by: Antonio Ospite <ospite at studenti.unina.it>
 ---
  intern/ffmpeg/ffmpeg_compat.h                  |   62 ++++++++++++++++++++++++
  source/blender/blenkernel/intern/writeffmpeg.c |    1 +
- 2 files changed, 63 insertions(+), 0 deletions(-)
+ 2 files changed, 63 insertions(+)
 
 diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
-index 582086d..156073f 100644
+index 582086d..9852fd7 100644
 --- a/intern/ffmpeg/ffmpeg_compat.h
 +++ b/intern/ffmpeg/ffmpeg_compat.h
 @@ -35,6 +35,7 @@
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 2697d4a..8ac0ce8 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
@@ -6,7 +6,7 @@ Global installation expects system patch to be something like
 /usr/lib/blender/scripts/ without version numbers.
 ---
  source/blender/blenlib/intern/path_util.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
 index 06043a5..c5e1146 100644
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 540f84a..19267a2 100644
--- a/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
@@ -8,10 +8,10 @@ Subject: look_for_droid_ttf_with_fontconfig
 
 Signed-off-by: Kevin Roy <kiniou at gmail.com>
 ---
- CMakeLists.txt                                   |   10 ++++
+ CMakeLists.txt                                   |   10 +++++
  build_files/cmake/Modules/FindFontconfig.cmake   |   49 ++++++++++++++++++++++
  build_files/cmake/macros.cmake                   |    6 ++-
- source/blender/blenfont/CMakeLists.txt           |    7 +++
+ source/blender/blenfont/CMakeLists.txt           |    7 ++++
  source/blender/blenfont/intern/blf_translation.c |   23 ++++++++++
  source/blender/blenlib/BLI_fileops.h             |    1 +
  source/blender/blenlib/intern/fileops.c          |   43 +++++++++++++++++++
diff --git a/debian/patches/series b/debian/patches/series
index 85eef24..f02a148 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-fix_FTBFS_with_ffmpeg_from_debian.patch
 0008-do_not_use_version_number_in_the_system_path.patch
 0009-look_for_droid_ttf_with_fontconfig.patch
+0010-Fix_german_translation_of_desktop_file.patch

-- 
blender packaging