diff -Nru xine-lib-1.1.17/debian/changelog xine-lib-1.1.17/debian/changelog --- xine-lib-1.1.17/debian/changelog 2010-01-26 12:32:31.000000000 -0800 +++ xine-lib-1.1.17/debian/changelog 2010-02-18 01:05:30.000000000 -0800 @@ -1,3 +1,9 @@ +xine-lib (1.1.17-1ubuntu2) lucid; urgency=low + + * added Jack output support (LP: # 152487) + + -- Eric Hedekar Thu, 18 Feb 2010 01:04:48 -0800 + xine-lib (1.1.17-1ubuntu1) lucid; urgency=low * merge from debian, remaining changes: diff -Nru xine-lib-1.1.17/debian/control xine-lib-1.1.17/debian/control --- xine-lib-1.1.17/debian/control 2010-01-26 12:32:31.000000000 -0800 +++ xine-lib-1.1.17/debian/control 2010-02-18 01:04:01.000000000 -0800 @@ -23,7 +23,7 @@ libsmbclient-dev, libspeex-dev, libmng-dev, libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76), libvcdinfo-dev, zlib1g-dev, w3m, transfig, sgmltools-lite, - ghostscript + ghostscript, libjack-dev XS-DM-Upload-Allowed: yes Homepage: http://www.xine-project.org/ Standards-Version: 3.8.3 diff -Nru xine-lib-1.1.17/debian/libxine1-misc-plugins.install xine-lib-1.1.17/debian/libxine1-misc-plugins.install --- xine-lib-1.1.17/debian/libxine1-misc-plugins.install 2010-01-26 12:32:31.000000000 -0800 +++ xine-lib-1.1.17/debian/libxine1-misc-plugins.install 2010-02-18 02:12:25.000000000 -0800 @@ -18,7 +18,7 @@ # audio output plugins debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_alsa.so -#debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_jack.so +debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_jack.so debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_file.so debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_none.so debian/tmp/usr/lib/xine/plugins/*/xineplug_ao_out_oss.so diff -Nru xine-lib-1.1.17/debian/rules xine-lib-1.1.17/debian/rules --- xine-lib-1.1.17/debian/rules 2010-01-26 12:32:31.000000000 -0800 +++ xine-lib-1.1.17/debian/rules 2010-02-18 01:22:41.000000000 -0800 @@ -56,7 +56,7 @@ --with-external-ffmpeg \ --with-external-libmpcdec \ --enable-ipv6 \ - --without-jack \ + --with-jack \ --with-pulseaudio \ --with-libflac \ --with-wavpack \