[SCM] lives/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3de4f14a10c7890ab1593f104535db26e0430b5f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 23 13:07:31 2012 +0100

    Refresh patches.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 66f4906..9da28fe 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -24,7 +24,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -3493,9 +3493,9 @@ if (defined($ARGV[0])) {
+@@ -3540,9 +3540,9 @@ if (defined($ARGV[0])) {
  
      if ($command eq "cdopen") {
  
@@ -37,7 +37,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	}
  
  	$cdplay_device=&rc_get("cdplay_device");
-@@ -3510,7 +3510,7 @@ if (defined($ARGV[0])) {
+@@ -3557,7 +3557,7 @@ if (defined($ARGV[0])) {
  	    unlink "$audiofile";
  	}
  
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1632,8 +1632,8 @@ void do_start_messages(void) {
+@@ -1639,8 +1639,8 @@ void do_start_messages(void) {
    else d_print(_ ("composite...NOT DETECTED..."));
    if (capable->has_sox_sox) d_print(_ ("sox...detected\n"));
    else d_print(_ ("sox...NOT DETECTED\n"));
@@ -79,7 +79,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    if (capable->has_jackd) d_print(_ ("jackd...detected..."));
    else d_print(_ ("jackd...NOT DETECTED..."));
    if (capable->has_pulse_audio) d_print(_ ("pulse audio...detected..."));
-@@ -1870,7 +1870,7 @@ capability *get_capabilities (void) {
+@@ -1877,7 +1877,7 @@ capability *get_capabilities (void) {
    capable->has_sox_sox=FALSE;
    capable->has_xmms=FALSE;
    capable->has_dvgrab=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    capable->has_autolives=FALSE;
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
-@@ -2033,8 +2033,8 @@ capability *get_capabilities (void) {
+@@ -2040,8 +2040,8 @@ capability *get_capabilities (void) {
    get_location("dvgrab",string,256);
    if (strlen(string)) capable->has_dvgrab=TRUE;
  
@@ -99,7 +99,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
    get_location("jackd",string,256);
    if (strlen(string)) capable->has_jackd=TRUE;
-@@ -2924,7 +2924,7 @@ void sensitize(void) {
+@@ -2939,7 +2939,7 @@ void sensitize(void) {
    gtk_widget_set_sensitive (mainw->load_audio, TRUE);
    gtk_widget_set_sensitive (mainw->load_subs, mainw->current_file>0);
    gtk_widget_set_sensitive (mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4831,7 +4831,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -4680,7 +4680,7 @@ _prefsw *create_prefs_dialog (void) {
    g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",
  		    G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
  

-- 
lives packaging