[SCM] lives/master: Remove debian/patches/03-fix_startup_with_jack.patch, applied upstream. Refresh the others.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 049c3fbaf4d19a7d7125fb4edf7348abd6f831e4
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 22 14:57:04 2012 +0200

    Remove debian/patches/03-fix_startup_with_jack.patch, applied upstream. Refresh the others.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index bfd57ab..66f4906 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1578,8 +1578,8 @@ void do_start_messages(void) {
+@@ -1632,8 +1632,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..."));
-@@ -1816,7 +1816,7 @@ capability *get_capabilities (void) {
+@@ -1870,7 +1870,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;
-@@ -1979,8 +1979,8 @@ capability *get_capabilities (void) {
+@@ -2033,8 +2033,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;
-@@ -2870,7 +2870,7 @@ void sensitize(void) {
+@@ -2924,7 +2924,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
-@@ -623,7 +623,7 @@ typedef struct {
+@@ -624,7 +624,7 @@ typedef struct {
    gboolean has_convert;
    gboolean has_composite;
    gboolean has_identify;
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4885,7 +4885,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -4831,7 +4831,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 af49547..c8cead5 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
-@@ -355,7 +355,6 @@ ffmpeg_encoder \
+@@ -357,7 +357,6 @@ ffmpeg_encoder \
  mencoder_encoder \
  mjpegtools_encoder \
  multi_encoder \
diff --git a/debian/patches/03-fix_startup_with_jack.patch b/debian/patches/03-fix_startup_with_jack.patch
deleted file mode 100644
index 963296a..0000000
--- a/debian/patches/03-fix_startup_with_jack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Set JACK as audio backend when Pulse is not available.
-From: http://lives.svn.sf.net/viewvc/lives/trunk/src/startup.c?r1=1446&r2=1509
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664523
----
- src/startup.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- lives.orig/src/startup.c
-+++ lives/src/startup.c
-@@ -356,6 +356,7 @@ gboolean do_audio_choice_dialog(short st
-   radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
- 
-   if (prefs->audio_player==AUD_PLAYER_JACK||!capable->has_pulse_audio) {
-+    prefs->audio_player=AUD_PLAYER_JACK;
-     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton1),TRUE);
-     set_pref("audio_player","jack");
-   }
diff --git a/debian/patches/series b/debian/patches/series
index 2081869..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
-03-fix_startup_with_jack.patch

-- 
lives packaging