diff -Nru roaraudio-1.0~beta11/debian/changelog roaraudio-1.0~beta11/debian/changelog --- roaraudio-1.0~beta11/debian/changelog 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/changelog 2017-07-03 11:17:48.000000000 +0000 @@ -1,3 +1,15 @@ +roaraudio (1.0~beta11-10) unstable; urgency=low + + * Remove esound support. + Closes: #856088 + * Do not provide libsndio anymore. + Closes: #863889 + * Bump Standards-Version to 4.0.0 (no changes required). + * Drop dbg package. + * Add patch 10-spelling-errors. + + -- Patrick Matthäi Mon, 03 Jul 2017 13:17:48 +0200 + roaraudio (1.0~beta11-9) unstable; urgency=medium * Remove dependency on libslp-dev at the libroar-dev package. diff -Nru roaraudio-1.0~beta11/debian/control roaraudio-1.0~beta11/debian/control --- roaraudio-1.0~beta11/debian/control 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/control 2017-07-03 11:17:48.000000000 +0000 @@ -10,7 +10,6 @@ libshout3-dev, libsndfile1-dev, liboggz2-dev, - libesd0-dev, libspeexdsp-dev, libao-dev, libx11-dev, @@ -18,7 +17,7 @@ libpulse-dev, libasound2-dev [linux-any], portaudio19-dev -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Section: libs Homepage: http://roaraudio.keep-cool.org/ @@ -67,7 +66,6 @@ Package: libroar-dev Section: libdevel Architecture: any -Provides: libsndio-dev Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -104,45 +102,6 @@ . This package contains the development headers for the libroar library. -Package: roaraudio-dbg -Section: debug -Architecture: any -Multi-Arch: same -Priority: extra -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, - libroar2 (= ${binary:Version}), - libroar-compat2 (= ${binary:Version}), - libroar-plugins-universal (= ${binary:Version}) -Recommends: roaraudio (= ${binary:Version}), - roarclients (= ${binary:Version}) -Description: RoarAudio sound server for audio mixing (debugging symbols) - RoarAudio is a server for audio mixing. Its main purpose is to mix audio from - different clients before sending it to its outputs (for example a soundcard). - It is completely network transparent (UNIX sockets, TCP/IP, DECnet) and - supports many common codecs like Ogg Vorbis, Speex or FLAC. - . - This packet consists of the following libraries: - libroar: The RoarAudio main library. It contains code for talking to roard, - virtual IO functions useful not only for audio applications, memory - management functions like buffers, lists, stacks. - . - libroardsp: Digital Signal Processing library. It contains code to work with - PCM signals including simple filters, converters and code to work with some - (realtime) codecs. - . - libroareio: This is the RoarAudio Extended IO library. It contains code for - talking to extended IO. Currently it contains code to talk to soundcards - without roard. This is not meant to be used by other applications directly. - . - libroarlight: Light Control support library. It contains code to support - the usage of the light control subsystem. - . - libroarmidi: MIDI subsystem support library. It contains code to support - the usage of the MIDI subsystem. - . - This package contains the debugging symbols for RoarAudio. - Package: roaraudio Section: sound Architecture: any @@ -192,7 +151,6 @@ Package: libroar-compat2 Architecture: any Multi-Arch: same -Provides: libsndio2 Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -202,9 +160,13 @@ Replaces: libroar-compat0, libroar-compat1 Description: drop-in replacements for other sound libraries - To get programs which use the EsounD (ESD), OpenBSD sndio, PulseAudio - or YIFF API running, you can install this package and replace the appropriate - libraries. + RoarAudio is a system for audio mixing. Its main purpose is to mix audio from + different clients before sending it to its outputs (for example a soundcard). + It is completely network transparent (UNIX sockets, TCP/IP, DECnet) and + supports many common codecs like Ogg Vorbis, Speex or FLAC. + . + To get programs which use the PulseAudio or YIFF API running, you can install + this package and replace the appropriate libraries. Package: libroar-compat-tools Architecture: any @@ -215,9 +177,8 @@ Breaks: libroar-compat2 (<= 1.0~beta11-2), Replaces: libroar-compat2 (<= 1.0~beta11-2), Description: drop-in replacements for other sound libraries (tools package) - To get programs which use the EsounD (ESD), OpenBSD sndio, PulseAudio - or YIFF API running, you can install this package and replace the appropriate - libraries. + To get programs which use the PulseAudio or YIFF API running, you can install + this package and replace the appropriate libraries. . This package contains the required tools for the libroar-compat package. diff -Nru roaraudio-1.0~beta11/debian/libroar-compat2.install roaraudio-1.0~beta11/debian/libroar-compat2.install --- roaraudio-1.0~beta11/debian/libroar-compat2.install 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/libroar-compat2.install 2017-07-03 11:17:48.000000000 +0000 @@ -1,4 +1,3 @@ -usr/lib/*/libroaresd.so.* usr/lib/*/libroaross.so.* usr/lib/*/libroarsndio.so.* usr/lib/*/libroarpulse*.so.* diff -Nru roaraudio-1.0~beta11/debian/libroar-compat2.lintian-overrides roaraudio-1.0~beta11/debian/libroar-compat2.lintian-overrides --- roaraudio-1.0~beta11/debian/libroar-compat2.lintian-overrides 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/libroar-compat2.lintian-overrides 2017-07-03 11:17:48.000000000 +0000 @@ -1,6 +1,5 @@ -libroar-compat2: package-name-doesnt-match-sonames libroaresd2 libroaross2 libroarpulse-simple2 libroarpulse2 libroarsndio2 +libroar-compat2: package-name-doesnt-match-sonames libroaross2 libroarpulse-simple2 libroarpulse2 libroarsndio2 libroar-compat2: no-symbols-control-file usr/lib/*/libroarsndio.so.2 libroar-compat2: no-symbols-control-file usr/lib/*/libroarpulse.so.2 libroar-compat2: no-symbols-control-file usr/lib/*/libroaross.so.2 libroar-compat2: no-symbols-control-file usr/lib/*/libroarpulse-simple.so.2 -libroar-compat2: no-symbols-control-file usr/lib/*/libroaresd.so.2 diff -Nru roaraudio-1.0~beta11/debian/libroar-compat2.shlibs roaraudio-1.0~beta11/debian/libroar-compat2.shlibs --- roaraudio-1.0~beta11/debian/libroar-compat2.shlibs 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/libroar-compat2.shlibs 2017-07-03 11:17:48.000000000 +0000 @@ -1,5 +1,4 @@ libroarpulse-simple 2 libroar-compat2 (>=1.0~beta11-3) libroaross 2 libroar-compat2 (>=1.0~beta11-3) libroarsndio 2 libroar-compat2 (>=1.0~beta11-3) -libroaresd 2 libroar-compat2 (>=1.0~beta11-3) libroarpulse 2 libroar-compat2 (>=1.0~beta11-3) diff -Nru roaraudio-1.0~beta11/debian/libroar-dev.install roaraudio-1.0~beta11/debian/libroar-dev.install --- roaraudio-1.0~beta11/debian/libroar-dev.install 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/libroar-dev.install 2017-07-03 11:17:48.000000000 +0000 @@ -7,7 +7,6 @@ usr/lib/*/libroarlight.so usr/lib/*/libroareio.so usr/lib/*/libroaross.so -usr/lib/*/libroaresd.so usr/lib/*/libroarsndio.so usr/lib/*/libroarpulse-simple.so usr/lib/*/libroarpulse.so diff -Nru roaraudio-1.0~beta11/debian/patches/10-spelling-errors.diff roaraudio-1.0~beta11/debian/patches/10-spelling-errors.diff --- roaraudio-1.0~beta11/debian/patches/10-spelling-errors.diff 1970-01-01 00:00:00.000000000 +0000 +++ roaraudio-1.0~beta11/debian/patches/10-spelling-errors.diff 2017-07-03 11:17:48.000000000 +0000 @@ -0,0 +1,136 @@ +# Fix more spelling errors. + +diff -Naur roaraudio-1.0~beta11.orig/doc/man7/roartut.7 roaraudio-1.0~beta11/doc/man7/roartut.7 +--- roaraudio-1.0~beta11.orig/doc/man7/roartut.7 2017-07-03 09:43:05.000000000 +0200 ++++ roaraudio-1.0~beta11/doc/man7/roartut.7 2017-07-03 11:59:12.221112636 +0200 +@@ -141,7 +141,7 @@ + float t = 0; /* current time */ + float length = 5; /* 5 sec */ + +-Next we need the buffer to hold the data as well as a varible used to go thru the buffer ++Next we need the buffer to hold the data as well as a variable used to go thru the buffer + on generation of data. + int16_t out[1024]; + int i; +diff -Naur roaraudio-1.0~beta11.orig/include/libroar/vs.h roaraudio-1.0~beta11/include/libroar/vs.h +--- roaraudio-1.0~beta11.orig/include/libroar/vs.h 2017-07-03 09:43:05.000000000 +0200 ++++ roaraudio-1.0~beta11/include/libroar/vs.h 2017-07-03 12:02:23.340259495 +0200 +@@ -136,7 +136,7 @@ + #define ROAR_VS_WAIT 1 + /* wait value for no waiting */ + #define ROAR_VS_NOWAIT 0 +-/* Trigger action but do not wait for it to complet */ ++/* Trigger action but do not wait for it to complete */ + #define ROAR_VS_ASYNC -1 + + /* sync a stream with the server (flush buffers) +diff -Naur roaraudio-1.0~beta11.orig/include/libroardsp/channels.h roaraudio-1.0~beta11/include/libroardsp/channels.h +--- roaraudio-1.0~beta11.orig/include/libroardsp/channels.h 2014-01-13 10:51:59.000000000 +0100 ++++ roaraudio-1.0~beta11/include/libroardsp/channels.h 2017-07-03 12:02:09.588320885 +0200 +@@ -53,7 +53,7 @@ + * $ = Side Center has null-vector possion and because of this + * arg(Pos) is undefined. This means that the channel does + * not have a defined phase and therefor can not exist. +- * we include it just to have the matrix complet. ++ * we include it just to have the matrix complete. + * + * + * Low Frequency Effects: +diff -Naur roaraudio-1.0~beta11.orig/libroar/asyncctl.c roaraudio-1.0~beta11/libroar/asyncctl.c +--- roaraudio-1.0~beta11.orig/libroar/asyncctl.c 2014-01-13 10:52:26.000000000 +0100 ++++ roaraudio-1.0~beta11/libroar/asyncctl.c 2017-07-03 12:00:16.236826882 +0200 +@@ -84,7 +84,7 @@ + u16[0] = ROAR_NET2HOST16(u16[0]); + u16[1] = ROAR_NET2HOST16(u16[1]); + +- // check if we have a complet header: ++ // check if we have a complete header: + if ( m.datalen < 2 ) + return -1; + +diff -Naur roaraudio-1.0~beta11.orig/libroar/notify.c roaraudio-1.0~beta11/libroar/notify.c +--- roaraudio-1.0~beta11.orig/libroar/notify.c 2014-01-13 10:52:34.000000000 +0100 ++++ roaraudio-1.0~beta11/libroar/notify.c 2017-07-03 12:00:37.004734176 +0200 +@@ -471,11 +471,11 @@ + + needed_len += ROAR_NET2HOST16(u16[3]); + +- // is all of the event complet? ++ // is all of the event complete? + if ( *len < needed_len ) + return -1; + +- // now we know everything is complet we can start to extract data... ++ // now we know everything is complete we can start to extract data... + + *len = 0; + +diff -Naur roaraudio-1.0~beta11.orig/libroar/serverinfo.c roaraudio-1.0~beta11/libroar/serverinfo.c +--- roaraudio-1.0~beta11.orig/libroar/serverinfo.c 2014-01-13 10:52:36.000000000 +0100 ++++ roaraudio-1.0~beta11/libroar/serverinfo.c 2017-07-03 12:00:49.740677324 +0200 +@@ -294,7 +294,7 @@ + + needlen += 4*idx; + +- // recheck if we have a complet index. ++ // recheck if we have a complete index. + if ( mes->datalen < needlen ) + return NULL; + +diff -Naur roaraudio-1.0~beta11.orig/roard/driver_jack.c roaraudio-1.0~beta11/roard/driver_jack.c +--- roaraudio-1.0~beta11.orig/roard/driver_jack.c 2017-07-03 09:43:05.000000000 +0200 ++++ roaraudio-1.0~beta11/roard/driver_jack.c 2017-07-03 12:01:54.172389703 +0200 +@@ -160,7 +160,7 @@ + int driver_jack_sync (struct roar_vio_calls * vio) { + struct driver_jack * self = vio->inst; + // init to sync data to device. +- // sync does not need to be complet when this function returns. ++ // sync does not need to be complete when this function returns. + return 0; + } + +diff -Naur roaraudio-1.0~beta11.orig/roard/rdtcs.c roaraudio-1.0~beta11/roard/rdtcs.c +--- roaraudio-1.0~beta11.orig/roard/rdtcs.c 2017-07-03 09:43:05.000000000 +0200 ++++ roaraudio-1.0~beta11/roard/rdtcs.c 2017-07-03 12:01:03.972613793 +0200 +@@ -155,7 +155,7 @@ + s |= crc << (fill & 0x03FF); + fill += 10; + +- // shift all complet bytes we already have out ++ // shift all complete bytes we already have out + while (fill >= 8) { + *c = s & 0xFF; + c++; +diff -Naur roaraudio-1.0~beta11.orig/roard/req.c roaraudio-1.0~beta11/roard/req.c +--- roaraudio-1.0~beta11.orig/roard/req.c 2014-01-13 10:54:06.000000000 +0100 ++++ roaraudio-1.0~beta11/roard/req.c 2017-07-03 12:01:17.452553620 +0200 +@@ -1883,7 +1883,7 @@ + + vp += 4; + +- // check for complet header... ++ // check for complete header... + if ( mes->datalen < 4 ) + return -1; + +diff -Naur roaraudio-1.0~beta11.orig/roard/roard.c roaraudio-1.0~beta11/roard/roard.c +--- roaraudio-1.0~beta11.orig/roard/roard.c 2017-07-03 09:43:05.000000000 +0200 ++++ roaraudio-1.0~beta11/roard/roard.c 2017-07-03 12:01:38.556459412 +0200 +@@ -147,7 +147,7 @@ + " --log-syslog - Log Warnings, Errors, ... to syslog\n" + #endif + #ifdef ROAR_HAVE_SYSTEM +- " --script-postdown S - Run command lion S after complet shutdown.\n" ++ " --script-postdown S - Run command lion S after complete shutdown.\n" + #endif + ); + +@@ -2595,7 +2595,7 @@ + // update sync counter. + streams_change_sync_num(-1, 0); + +- ROAR_INFO("Startup complet", ROAR_DBG_INFO_INFO); ++ ROAR_INFO("Startup complete", ROAR_DBG_INFO_INFO); + + // start main loop... + ROAR_INFO("Entering main loop", ROAR_DBG_INFO_INFO); diff -Nru roaraudio-1.0~beta11/debian/patches/series roaraudio-1.0~beta11/debian/patches/series --- roaraudio-1.0~beta11/debian/patches/series 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/patches/series 2017-07-03 11:17:48.000000000 +0000 @@ -7,3 +7,4 @@ 07-reproducible-build.diff 08-spelling-errors.diff 09-spelling-errors.diff +10-spelling-errors.diff diff -Nru roaraudio-1.0~beta11/debian/roaraudio.lintian-overrides roaraudio-1.0~beta11/debian/roaraudio.lintian-overrides --- roaraudio-1.0~beta11/debian/roaraudio.lintian-overrides 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/roaraudio.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -roaraudio: hardening-no-fortify-functions usr/lib/*/roaraudio/plugins/0-RoarAudio/roard/0-RoarAudio/protocol-esound.so diff -Nru roaraudio-1.0~beta11/debian/rules roaraudio-1.0~beta11/debian/rules --- roaraudio-1.0~beta11/debian/rules 2016-12-19 15:38:40.000000000 +0000 +++ roaraudio-1.0~beta11/debian/rules 2017-07-03 11:17:48.000000000 +0000 @@ -41,6 +41,3 @@ cp dist/debian-like/roaraudio debian/roaraudio.init cp dist/debian-like/defaults debian/roaraudio.default dh_install - -override_dh_strip: - dh_strip --dbg-package=roaraudio-dbg