Package: mumble Version: 1.2.4-0.2 Severity: normal Tags: patch upstream Already mentioned in the current ITA bug (#739997):
I uploaded version 0.8 of speech-dispatcher two weeks ago to the Debian sid archive. Upstream decided to move the header files in libspeechd-dev from /usr/include/ to /usr/include/speech-dispatcher/ For the time being, I add symbolic links from the old to the new location so this is not an immediate issue. I still recommend you to adapt the mumble code (and probably let your upstream know). Please find a patch attached that should solve the issue. I used it to build mumble against my latest version of speech-dispatcher and it seemed to do what I intended, but still, please review. Maybe you can draw inspiration from the commit to navit, if you want a more flexible solution for backporting purposes: http://anonscm.debian.org/gitweb/?p=collab-maint/navit.git;a=commit;h=aa5d86eae09602de0a46b455ab2b8d31228c0d70 - -- System Information: Debian Release: 7.4 APT prefers stable APT policy: (500, 'stable'), (99, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru mumble-1.2.4/debian/changelog mumble-1.2.4/debian/changelog
--- mumble-1.2.4/debian/changelog 2014-02-06 18:52:56.000000000 +0100
+++ mumble-1.2.4/debian/changelog 2014-03-01 12:36:22.000000000 +0100
@@ -1,3 +1,10 @@
+mumble (1.2.4-0.3) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Build against libspeechd-dev 0.8
+
+ -- Paul Gevers <elb...@debian.org> Sat, 01 Mar 2014 12:35:39 +0100
+
mumble (1.2.4-0.2) unstable; urgency=high
* Non-maintainer upload.
diff -Nru mumble-1.2.4/debian/control mumble-1.2.4/debian/control
--- mumble-1.2.4/debian/control 2014-02-06 18:04:26.000000000 +0100
+++ mumble-1.2.4/debian/control 2014-03-01 12:36:12.000000000 +0100
@@ -22,7 +22,7 @@
ice35-translators,
ice35-slice,
libg15daemon-client-dev,
- libspeechd-dev,
+ libspeechd-dev (>= 0.8),
protobuf-compiler,
libprotobuf-dev,
libavahi-compat-libdnssd-dev,
diff -Nru
mumble-1.2.4/debian/patches/15-find_new_speech-dispatcher_header_location.patch
mumble-1.2.4/debian/patches/15-find_new_speech-dispatcher_header_location.patch
---
mumble-1.2.4/debian/patches/15-find_new_speech-dispatcher_header_location.patch
1970-01-01 01:00:00.000000000 +0100
+++
mumble-1.2.4/debian/patches/15-find_new_speech-dispatcher_header_location.patch
2014-02-17 21:09:19.000000000 +0100
@@ -0,0 +1,14 @@
+Description: speech-dispatcher 0.8 moved the location of the header files
+Author: Paul Gevers <elb...@debian.org>
+
+--- a/src/mumble/TextToSpeech_unix.cpp
++++ b/src/mumble/TextToSpeech_unix.cpp
+@@ -33,7 +33,7 @@
+ #include "TextToSpeech.h"
+
+ #ifdef USE_SPEECHD
+-#include <libspeechd.h>
++#include <speech-dispatcher/libspeechd.h>
+ #endif
+
+ #include "Global.h"
diff -Nru mumble-1.2.4/debian/patches/series mumble-1.2.4/debian/patches/series
--- mumble-1.2.4/debian/patches/series 2014-02-06 18:06:22.000000000 +0100
+++ mumble-1.2.4/debian/patches/series 2014-03-01 12:37:27.000000000 +0100
@@ -5,3 +5,4 @@
09-register-mumble-URL-handler.diff
12-Mumble-SA-2014-001.patch
14-Mumble-SA-2014-002.patch
+15-find_new_speech-dispatcher_header_location.patch
signature.asc
Description: OpenPGP digital signature
