diff -Nru morse-2.4/debian/changelog morse-2.4/debian/changelog --- morse-2.4/debian/changelog 2011-11-13 07:22:08.000000000 -0800 +++ morse-2.4/debian/changelog 2015-06-06 02:40:50.000000000 -0700 @@ -1,10 +1,12 @@ -morse (2.4-2ubuntu1) precise; urgency=low +morse (2.4-3) unstable; urgency=high - * Merge from debian testing. Remaining changes: - - 02asneeded: new patch, fixes FTBFS Thanks to John Nogatch. - (Forwarded as debian bug no 632436) + * Open a mono (not stereo) PulseAudio output stream and hence avoid + improperly passing non-multiples of the frame size to pa_simple_write + (Closes: #784285, LP: #1461755). Thanks to Kamal Mostafa for providing + the patch. + * New patch fixing FTBFS (LP: #770766). Thanks to John Nogatch. - -- Bhavani Shankar Sun, 13 Nov 2011 20:49:00 +0530 + -- Nanakos Chrysostomos Sat, 06 Jun 2015 12:26:41 +0300 morse (2.4-2) unstable; urgency=low @@ -13,12 +15,6 @@ -- Nanakos Chrysostomos Sun, 25 Sep 2011 13:04:07 +0300 -morse (2.4-1ubuntu1) oneiric; urgency=low - - * 02asneeded: new patch, fixes FTBFS (LP: #770766). Thanks to John Nogatch. - - -- Ilya Barygin Sat, 02 Jul 2011 11:56:46 +0400 - morse (2.4-1) unstable; urgency=low * New upstream release diff -Nru morse-2.4/debian/control morse-2.4/debian/control --- morse-2.4/debian/control 2011-09-25 09:41:14.000000000 -0700 +++ morse-2.4/debian/control 2015-05-23 01:22:42.000000000 -0700 @@ -1,8 +1,7 @@ Source: morse Section: hamradio Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Nanakos Chrysostomos +Maintainer: Nanakos Chrysostomos Homepage: http://www.catb.org/~esr/morse/ Build-Depends: debhelper (>= 7.0.0), libx11-dev, libpulse-dev, xmlto (>= 0.0.23-2), libasound2-dev Standards-Version: 3.9.2 diff -Nru morse-2.4/debian/copyright morse-2.4/debian/copyright --- morse-2.4/debian/copyright 2011-09-25 09:41:14.000000000 -0700 +++ morse-2.4/debian/copyright 2015-05-23 01:22:42.000000000 -0700 @@ -1,9 +1,7 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 Upstream-Name: morse Upstream-Contact: Eric S. Raymond -Source: Eric S. Raymond - - +Source: http://www.catb.org/~esr/morse Files: * Copyright: diff -Nru morse-2.4/debian/patches/02asneeded morse-2.4/debian/patches/02asneeded --- morse-2.4/debian/patches/02asneeded 2011-07-02 00:56:13.000000000 -0700 +++ morse-2.4/debian/patches/02asneeded 1969-12-31 16:00:00.000000000 -0800 @@ -1,14 +0,0 @@ -Description: move X11LIBS later in cc command -Author: John T. Nogatch - ---- morse-2.3.origdeb/morse.d/Makefile 2011-01-15 10:25:33.000000000 -0800 -+++ morse-2.3/morse.d/Makefile 2011-06-13 16:54:56.000000000 -0700 -@@ -18,7 +18,7 @@ - ln morse${DEVICE} $@ - - morseX11: morse.o beepX11.o alarm.o -- $(CC) $(X11LIBS) -o $@ morse.o beepX11.o alarm.o -+ $(CC) -o $@ morse.o beepX11.o alarm.o $(X11LIBS) - - morseLinux: morse.o beepLinux.o alarm.o - $(CC) -o $@ morse.o beepLinux.o alarm.o -lm diff -Nru morse-2.4/debian/patches/04fix-pa_simple_write-with-mono-output.patch morse-2.4/debian/patches/04fix-pa_simple_write-with-mono-output.patch --- morse-2.4/debian/patches/04fix-pa_simple_write-with-mono-output.patch 1969-12-31 16:00:00.000000000 -0800 +++ morse-2.4/debian/patches/04fix-pa_simple_write-with-mono-output.patch 2015-06-06 02:38:12.000000000 -0700 @@ -0,0 +1,39 @@ +Author: Kamal Mostafa +Bug-Debian: https://bugs.debian.org/784285 +Description: fix pa_simple_write error with mono output +Bug-Debian: https://bugs.debian.org/784285 +Bug-Ubuntu: https://launchpad.net/bugs/1461755 + + * Open a mono (not stereo) PulseAudio output stream and hence avoid + improperly passing non-multiples of the frame size to pa_simple_write + (Closes: #784285, LP: #1461755). + +--- morse-2.4.orig/morse.d/beepPA.c ++++ morse-2.4/morse.d/beepPA.c +@@ -33,7 +33,7 @@ static pthread_cond_t beep_cv = PTHREAD_ + static const pa_sample_spec sample_format = { + .format = PA_SAMPLE_S16LE, + .rate = 44100, +- .channels = 2 ++ .channels = 1 + }; + + static pa_simple *snddev; +@@ -47,7 +47,7 @@ static struct { + static void play_tone() + { + int c; +- int len = (int)(sample_format.rate*beep_info.time/1000.0*2); ++ int len = (int)(sample_format.rate*beep_info.time/1000.0); + double t, tt; + double v; + int16_t *sample; +@@ -61,7 +61,7 @@ static void play_tone() + } else { + tt = beep_info.time/1000.0; + for (c=0; c +Bug-Ubuntu: https://bugs.launchpad.net/bugs/770766 + +--- morse-2.4.orig/morse.d/Makefile ++++ morse-2.4/morse.d/Makefile +@@ -22,7 +22,7 @@ morse: morse${DEVICE} + ln morse${DEVICE} $@ + + morseX11: morse.o beepX11.o alarm.o +- $(CC) $(X11LIBS) -o $@ morse.o beepX11.o alarm.o ++ $(CC) -o $@ morse.o beepX11.o alarm.o $(X11LIBS) + + morseLinux: morse.o beepLinux.o alarm.o + $(CC) -o $@ morse.o beepLinux.o alarm.o -lm diff -Nru morse-2.4/debian/patches/series morse-2.4/debian/patches/series --- morse-2.4/debian/patches/series 2011-11-13 07:18:52.000000000 -0800 +++ morse-2.4/debian/patches/series 2015-06-06 03:05:41.000000000 -0700 @@ -1,6 +1,6 @@ 00morsexml 01makefile -02asneeded 02morseALSA 03makefileALSA - +04fix-pa_simple_write-with-mono-output.patch +05fix_ftbfs.patch