[SCM] lives/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f1a6f7ab9a1da37e857dac9e50bfa06386596b57
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Oct 22 11:39:23 2011 +0200

    Refresh

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 9fe5f8f..509bda1 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
-@@ -2607,9 +2607,9 @@ if (defined($ARGV[0])) {
+@@ -2641,9 +2641,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");
-@@ -2624,7 +2624,7 @@ if (defined($ARGV[0])) {
+@@ -2658,7 +2658,7 @@ if (defined($ARGV[0])) {
  	    unlink $audiofile;
  	}
  
@@ -48,7 +48,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	$arate=44100;
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
-@@ -1077,7 +1077,7 @@ create_LiVES (void)
+@@ -1125,7 +1125,7 @@ create_LiVES (void)
    gtk_container_add (GTK_CONTAINER (audio_menu), mainw->eject_cd);
  
    if (capable->smog_version_correct) {
@@ -57,7 +57,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
        gtk_widget_set_sensitive (mainw->load_cdtrack, FALSE);
        gtk_widget_set_sensitive (mainw->eject_cd, FALSE);
      }
-@@ -2547,7 +2547,7 @@ create_LiVES (void)
+@@ -2579,7 +2579,7 @@ create_LiVES (void)
    g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
                        G_CALLBACK (on_load_audio_activate),
                        NULL);
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1368,8 +1368,8 @@ void do_start_messages(void) {
+@@ -1377,8 +1377,8 @@ void do_start_messages(void) {
    else d_print(_ ("composite...NOT DETECTED..."));
    if (capable->has_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..."));
-@@ -1567,7 +1567,7 @@ capability *get_capabilities (void) {
+@@ -1578,7 +1578,7 @@ capability *get_capabilities (void) {
    capable->has_sox=FALSE;
    capable->has_xmms=FALSE;
    capable->has_dvgrab=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
    capable->has_pulse_audio=FALSE;
-@@ -1679,8 +1679,8 @@ capability *get_capabilities (void) {
+@@ -1690,8 +1690,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;
-@@ -2347,7 +2347,7 @@ void sensitize(void) {
+@@ -2368,7 +2368,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);
@@ -110,7 +110,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gtk_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
-@@ -530,7 +530,7 @@ typedef struct {
+@@ -532,7 +532,7 @@ typedef struct {
    gboolean has_mplayer;
    gboolean has_convert;
    gboolean has_composite;
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4397,7 +4397,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -4568,7 +4568,7 @@ _prefsw *create_prefs_dialog (void) {
  
     g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
  
diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
index 4611bb9..e77c3d9 100644
--- a/debian/patches/02-drop_py3_multiencoder.patch
+++ b/debian/patches/02-drop_py3_multiencoder.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
  transcode_encoder \
 --- lives.orig/lives-plugins/plugins/encoders/Makefile.in
 +++ lives/lives-plugins/plugins/encoders/Makefile.in
-@@ -315,7 +315,6 @@ ffmpeg_encoder \
+@@ -319,7 +319,6 @@ ffmpeg_encoder \
  mencoder_encoder \
  mjpegtools_encoder \
  multi_encoder \

-- 
lives packaging