[SCM] lives/master: Remove 91-lives_160_ftbfs.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 38c7a1d980f9c1e467d0a6b8485e8573d37f7930
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 4 17:45:40 2012 +0100

    Remove 91-lives_160_ftbfs.patch, applied upstream.

diff --git a/debian/patches/91-lives_160_ftbfs.patch b/debian/patches/91-lives_160_ftbfs.patch
deleted file mode 100644
index 6e61236..0000000
--- a/debian/patches/91-lives_160_ftbfs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Attempt to fix FTBFS on kfreebsd.
-From: http://lives.svn.sf.net/viewvc/lives/trunk/src/callbacks.c?r1=1324&r2=1327
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657775
-Applied-Upstream:
- http://lives.svn.sf.net/viewvc/lives/trunk/src/callbacks.c?r1=1327&r2=1341
----
- src/callbacks.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- lives.orig/src/callbacks.c
-+++ lives/src/callbacks.c
-@@ -5857,7 +5857,9 @@ void on_fs_preview_clicked (GtkButton *b
-   if (!(height*width)) {
-     // media preview
-     if (!capable->has_mplayer) {
--      do_blocking_error_dialog(_ ("\n\nYou need to install mplayer to be able to preview this file.\n"));
-+      gchar *msg=g_strdup(_ ("\n\nYou need to install mplayer to be able to preview this file.\n"));
-+      do_blocking_error_dialog(msg);
-+      g_free(msg);
-       return;
-     }
- 
-@@ -5872,7 +5874,9 @@ void on_fs_preview_clicked (GtkButton *b
-       xwin=(unsigned int)GDK_WINDOW_XID (mainw->fs_playarea->window);
- #else
-       // need equivalent to get XID of win on other platforms
--      do_blocking_error_dialog(_("Preview will not work without X11. We need the window id of the preview window.\nPlease send a patch if you know how to do this.\n"
-+      gchar *msg=g_strdup(_("Preview will not work without X11. We need the window id of the preview window.\nPlease send a patch if you know how to do this.\n"));
-+      do_blocking_error_dialog(msg);
-+      g_free(msg);
- #endif
- 
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 6926891..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
-91-lives_160_ftbfs.patch

-- 
lives packaging