[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 666dc49873889df470ea4bcab63a4b8c479b1218
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun Feb 21 20:27:17 2010 +0100

    Refresh cdda2wav_to_icedax.diff.

diff --git a/debian/patches/cdda2wav_to_icedax.diff b/debian/patches/cdda2wav_to_icedax.diff
index 6425b33..7d00b69 100644
--- a/debian/patches/cdda2wav_to_icedax.diff
+++ b/debian/patches/cdda2wav_to_icedax.diff
@@ -24,7 +24,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -2510,9 +2510,9 @@ if (defined($ARGV[0])) {
+@@ -2514,9 +2514,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");
-@@ -2527,7 +2527,7 @@ if (defined($ARGV[0])) {
+@@ -2531,7 +2531,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
-@@ -1008,7 +1008,7 @@ create_LiVES (void)
+@@ -988,7 +988,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);
      }
-@@ -2437,7 +2437,7 @@ create_LiVES (void)
+@@ -2433,7 +2433,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
-@@ -1191,8 +1191,8 @@ void do_start_messages(void) {
+@@ -1268,8 +1268,8 @@ void do_start_messages(void) {
    else d_print(_ ("sox...NOT DETECTED\n"));
    if (capable->has_xmms) d_print(_ ("xmms...detected..."));
    else d_print(_ ("xmms...NOT DETECTED..."));
@@ -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..."));
-@@ -1377,7 +1377,7 @@ capability *get_capabilities (void) {
+@@ -1454,7 +1454,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;
-@@ -1489,8 +1489,8 @@ capability *get_capabilities (void) {
+@@ -1566,8 +1566,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;
-@@ -2078,7 +2078,7 @@ void sensitize(void) {
+@@ -2172,7 +2172,7 @@ void sensitize(void) {
    gtk_widget_set_sensitive (mainw->loop_video, mainw->current_file>0&&(cfile->achans>0&&cfile->frames>0));
    gtk_widget_set_sensitive (mainw->loop_continue, TRUE);
    gtk_widget_set_sensitive (mainw->load_audio, TRUE);
@@ -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
-@@ -434,7 +434,7 @@ typedef struct {
+@@ -449,7 +449,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
-@@ -2851,7 +2851,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -3016,7 +3016,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