[SCM] lives packaging branch, master, updated. debian/1.1.8-2-16-g0312fee

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

The following commit has been merged in the master branch:
commit b95ab21e5f5c3bd689abfaa8d4024fffa64acf3a
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun Feb 21 20:42:48 2010 +0100

    Drop imageloading.diff, applied by upstream.

diff --git a/debian/patches/imageloading.diff b/debian/patches/imageloading.diff
deleted file mode 100644
index 9a16b6d..0000000
--- a/debian/patches/imageloading.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: This patch fixes a bug that stops images in lives
- loading
-Author: Gabriel Finch <salsaman at xs4all.nl>
----
-Index: lives/smogrify
-===================================================================
---- lives.orig/smogrify	2010-01-12 08:03:42.094879971 +0000
-+++ lives/smogrify	2010-01-12 08:04:59.814880901 +0000
-@@ -3932,7 +3932,6 @@
- 	system("sox -t .raw -r $arate -c $achans -$osigned -$osamps $oendian $audio_in -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps $audio_out stretch $stretch>/dev/null 2>&1");
-     }
-     else {
--	print("sox -t .raw -r $arate -c $achans -$osigned -$osamps $oendian $audio_in -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps $audio_out>/dev/null 2>&1");
- 	system("sox -t .raw -r $arate -c $achans -$osigned -$osamps $oendian $audio_in -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps $audio_out>/dev/null 2>&1");
-     }
- }
-@@ -4302,7 +4301,7 @@
-     $name=&mkname($i);
-     my $nframes=0;
- 
--    my $conv_cmd=$convert_command;
-+    my $conv_command=$convert_command;
- 
-     if (!defined($file_ext)) {
- 	$file_ext=&get_ext($file);

-- 
lives packaging