[SCM] lives packaging branch, master, updated. debian/1.3.3-1-2-g25bcd86

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

The following commit has been merged in the master branch:
commit 564765d61442d995d8787412a907e0ade28ecc06
Author: Harry <hrickards at l33tmyst.com>
Date:   Sun May 9 16:23:44 2010 +0100

    Removed three patches that were integrated into upstream.

diff --git a/debian/patches/are_you_sure.diff b/debian/patches/are_you_sure.diff
deleted file mode 100644
index 0b23a60..0000000
--- a/debian/patches/are_you_sure.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Origin: http://lives.svn.sourceforge.net/viewvc/lives/trunk/src/callbacks.c?r1=489&r2=492&view=patch
-Description: Shows the "Are you sure ?" prompt when closing a changed clip.
----
- src/callbacks.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- lives.orig/src/callbacks.c	2010/03/28 21:31:36	489
-+++ lives/src/callbacks.c	2010/03/30 16:15:51	492
-@@ -713,7 +713,7 @@
-       }
-     }
-   }
--  else {
-+  if (!lmap_errors) {
-     if (cfile->changed) {
-       get_menu_text(cfile->menuentry,title);
-       if (strlen(title)>128) g_snprintf(title,32,"%s",(_("This file"))); 
diff --git a/debian/patches/effect_previews_fix.diff b/debian/patches/effect_previews_fix.diff
deleted file mode 100644
index a6d6b4a..0000000
--- a/debian/patches/effect_previews_fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Origin: http://lives.svn.sourceforge.net/viewvc/lives/trunk/src/cvirtual.c?r1=394&r2=492&view=patch
-Description: Fixes a rare crash in effect previews
----
- src/cvirtual.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
---- lives.orig/src/cvirtual.c
-+++ lives/src/cvirtual.c
-@@ -207,6 +207,9 @@
- 
-       if (pixbuf!=NULL) gdk_pixbuf_unref(pixbuf);
-       pixbuf=NULL;
-+
-+      // another thread may have called check_if_non_virtual
-+      if (sfile->frame_index==NULL) break;
-       sfile->frame_index[i-1]=-1;
-     }
-     pthread_mutex_unlock(&mainw->gtk_mutex);
- 
diff --git a/debian/patches/makefile_am.diff b/debian/patches/makefile_am.diff
deleted file mode 100644
index 74dd547..0000000
--- a/debian/patches/makefile_am.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Origin: http://lives.svn.sourceforge.net/viewvc/lives?view=rev&revision=498
-Description: Prevent build failure on mipsel architecture.
----
- lives-plugins/weed-plugins/Makefile.am     |    2 +-
- lives-plugins/weed-plugins/gdk/Makefile.am |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- lives.orig/lives-plugins/weed-plugins/Makefile.am
-+++ lives/lives-plugins/weed-plugins/Makefile.am
-@@ -16,7 +16,7 @@ shared_ldflags = -shared -fPIC -DPIC -Wl
- shared_cflags = -fPIC -DPIC
- endif
- 
--AM_LDFLAGS = $(shared_ldflags) -O3 -L/usr/lib64 ../../libweed/libweed-utils.la ../../libweed/libweed-plugin-utils.la
-+AM_LDFLAGS = $(shared_ldflags) -O3 ../../libweed/libweed-utils.la ../../libweed/libweed-plugin-utils.la
- AM_CFLAGS = $(shared_cflags) -O3 -ffast-math
- AM_CPPFLAGS = $(shared_cflags) -O3 -ffast-math
- 
---- lives.orig/lives-plugins/weed-plugins/gdk/Makefile.am
-+++ lives/lives-plugins/weed-plugins/gdk/Makefile.am
-@@ -12,7 +12,7 @@ shared_ldflags = -shared -fPIC -DPIC -Wl
- shared_cflags = -fPIC -DPIC
- endif
- 
--AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -O3 -L/usr/lib64  ../../../libweed/libweed-utils.la ../../../libweed/libweed-plugin-utils.la
-+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -O3  ../../../libweed/libweed-utils.la ../../../libweed/libweed-plugin-utils.la
- AM_CFLAGS = $(shared_cflags) -I$(srcdir)/.. @GTK_CFLAGS@ -O3 -ffast-math
- 
- if ENABLE_VJACK
diff --git a/debian/patches/series b/debian/patches/series
index 7f3a3f4..ada5900 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 cdda2wav_to_icedax.diff
 removepy.diff
-makefile_am.diff
-effect_previews_fix.diff
-are_you_sure.diff

-- 
lives packaging