diff -u avidemux-2.5.1+repack/debian/changelog avidemux-2.5.1+repack/debian/changelog
--- avidemux-2.5.1+repack/debian/changelog
+++ avidemux-2.5.1+repack/debian/changelog
@@ -1,3 +1,10 @@
+avidemux (1:2.5.1+repack-0ubuntu2.1) karmic-proposed; urgency=low
+
+  * Add 02-alsa_output.diff to set the correect ALSA device (LP: #321028).
+  * Add PulseAudio support (LP: #215560).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 14 Dec 2009 14:32:23 +0100
+
 avidemux (1:2.5.1+repack-0ubuntu2) karmic; urgency=low
 
   * debian/{control,rules,README.source}: Add quilt support.
diff -u avidemux-2.5.1+repack/debian/control avidemux-2.5.1+repack/debian/control
--- avidemux-2.5.1+repack/debian/control
+++ avidemux-2.5.1+repack/debian/control
@@ -8,7 +8,7 @@
  libmad0-dev, liba52-dev, libvorbis-dev, libmjpegtools-dev, libxvidcore4-dev,
  libfreetype6-dev, libxml2-dev, libasound2-dev, libsdl-dev, libxv-dev, libxmu-dev,
  libfaac-dev (>= 1.24), libfaad-dev, libx264-dev (>= 1:0.svn20090222), libqt4-dev,
- imagemagick, libsamplerate0-dev, libdca-dev, libjack-dev, quilt
+ imagemagick, libsamplerate0-dev, libdca-dev, libjack-dev, quilt, libpulse-dev
 
 Package: avidemux
 Architecture: any
diff -u avidemux-2.5.1+repack/debian/patches/series avidemux-2.5.1+repack/debian/patches/series
--- avidemux-2.5.1+repack/debian/patches/series
+++ avidemux-2.5.1+repack/debian/patches/series
@@ -1,0 +2 @@
+02-alsa_output.diff
only in patch2:
unchanged:
--- avidemux-2.5.1+repack.orig/debian/patches/02-alsa_output.diff
+++ avidemux-2.5.1+repack/debian/patches/02-alsa_output.diff
@@ -0,0 +1,42 @@
+Description: ALSA should use the "default" device instead of "dmix".
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/321028
+Author: http://avidemux.org/admForum/viewtopic.php?id=6739
+---
+ avidemux/ADM_libraries/ADM_utilities/prefs.cpp   |    2 +-
+ avidemux/prefs.in                                |    2 +-
+ plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- avidemux-2.5.1+repack.orig/avidemux/ADM_libraries/ADM_utilities/prefs.cpp
++++ avidemux-2.5.1+repack/avidemux/ADM_libraries/ADM_utilities/prefs.cpp
+@@ -99,7 +99,7 @@ static opt_def opt_defs [] = {
+ #else
+ 	{"device.audiodevice",		STRING,"ALSA",	NULL, NULL, NULL },
+ #endif
+-	{"device.audio.alsa_device",		STRING,"dmix",	NULL, NULL, NULL },
++	{"device.audio.alsa_device",		STRING,"default",	NULL, NULL, NULL },
+ 	{"device.videodevice",		UINT,	"0",	NULL,	"0",	"10"	},
+ 	{"default.postproc_type",		UINT,	"3",	NULL,	"0",	"7"	},
+ 	{"default.postproc_value",		UINT,	"3",	NULL,	"0",	"5"	},
+--- avidemux-2.5.1+repack.orig/avidemux/prefs.in
++++ avidemux-2.5.1+repack/avidemux/prefs.in
+@@ -55,7 +55,7 @@ device.audiodevice,			STRING,	WIN32
+ #else
+ device.audiodevice,			STRING,	ALSA
+ #endif
+-device.audio.alsa_device,               STRING, "dmix"
++device.audio.alsa_device,               STRING, "default"
+ device.videodevice,			UINT,	0,	0,	10
+ # Posproc
+ default.postproc_type,			UINT,	3,	0,	7
+--- avidemux-2.5.1+repack.orig/plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp
++++ avidemux-2.5.1+repack/plugins/ADM_audioDevices/Alsa/ADM_deviceALSA.cpp
+@@ -61,7 +61,7 @@ uint8_t alsaAudioDevice::init( uint32_t 
+ 
+   static char *pcm_name;
+ //  if( prefs->get(DEVICE_AUDIO_ALSA_DEVICE, &pcm_name) != RC_OK )
+-               pcm_name = ADM_strdup("dmix");
++               pcm_name = ADM_strdup("default");
+     printf("[Alsa] Using device :%s\n",pcm_name);
+  /* Allocate the snd_pcm_hw_params_t structure on the stack. */
+     snd_pcm_hw_params_alloca(&hwparams);