[SCM] lives packaging branch, master, updated. debian/1.1.8-1-26-gaf63e04

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

The following commit has been merged in the master branch:
commit d9b536def2c086ae87dc1afadee2c67b8c0d7f70
Author: Harry Rickards <harry at linux.com>
Date:   Tue Jan 12 08:19:46 2010 +0000

    Added new patch from upstream that fixes image loading. Patch will be released in upstream version 1.1.9

diff --git a/debian/changelog b/debian/changelog
index d20a3a6..9559561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ lives (1.1.8-2) UNRELEASED; urgency=low
   * Added myself to Uploaders:
   * Moved from dpatch to quilt
   * Added VCS-Git and VCS-Browser tags
+  * Added upstream patch that fixes image loading. Will be released
+    upstream in 1.1.9
   
   [ Alessio Treglia ]
   * debian/rules: Don't include quilt.make rules file, it's unnecessary.
diff --git a/debian/patches/imageloading.diff b/debian/patches/imageloading.diff
new file mode 100644
index 0000000..9a16b6d
--- /dev/null
+++ b/debian/patches/imageloading.diff
@@ -0,0 +1,25 @@
+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);
diff --git a/debian/patches/series b/debian/patches/series
index b6df7a9..d86abb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 removepy.diff
+imageloading.diff

-- 
lives packaging