[SCM] blender/master: debian/patches/: re-worked since source code changed

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Sat May 12 18:57:05 UTC 2012


The following commit has been merged in the master branch:
commit b1f5f4adb5dffaed36c86e9de9a494b90eb913cf
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Sat May 12 20:00:58 2012 +0200

    debian/patches/: re-worked since source code changed

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 2166957..8a372a7 100644
--- a/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
@@ -184,10 +184,10 @@ index 12fa15a..8100fad 100644
  
  	*unifont_size_r = unifont_size;
 diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index 73220cb..30981d9 100644
+index 1bf4efc..5e4db1a 100644
 --- a/source/blender/blenlib/BLI_fileops.h
 +++ b/source/blender/blenlib/BLI_fileops.h
-@@ -79,6 +79,7 @@ int    BLI_file_touch(const char *file);
+@@ -80,6 +80,7 @@ int    BLI_file_touch(const char *file);
  
  int    BLI_file_gzip(const char *from, const char *to);
  char  *BLI_file_ungzip_to_mem(const char *from_file, int *size_r);

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list