Package: navit
Version: 0.5.0~svn5738+dfsg.1
Severity: normal
Tags: patch upstream

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi maintainer of navit,

I uploaded version 0.8 of speech-dispatcher yesterday 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 navit code (and probably let your upstream know).

Please find a patch attached that should solve the issue. I used it to
build navit against my latest version of speech-dispatcher and it seemed
to do what I intended, but still, please review.

Paul

- -- 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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAEBCAAGBQJTAQPiAAoJEJxcmesFvXUKqowH/2mh89FnWrybSR7Yo7t8gtft
DeFeEwtFNWlPwlKJTfGKCIAHFVoi3JGlxKLyyOZjx/9JHqkGA/ny6rMW+hrPV4Ss
Pl69byNkKbauXt97boK+HMLBT7PzDLvwkqt7Zx/9WthaYxQAIvRCGmp2ZK4EU65Q
ZycvqohDmrc2VhuLk04Jv6hJptxlBv7GJpG+spXygwMQW49v0XXx3ae2m0QXxPDD
xic7kyAZ2RifwyB65KhcJii4hV4dgnyV96js44Nc040jaxeRBcd25EtGTSZ3LyOq
BOC1ZpaldhOu1c0OLSViKR/2cBqIFR4Osu4UG3ktuqPZJdtfrmrhzGtyDpYrf/I=
=jDL3
-----END PGP SIGNATURE-----
Description: speech-dispatcher 0.8 moved the location of the header files
Author: Paul Gevers <elb...@debian.org>
Forwarded: no

--- a/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
+++ b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <stdarg.h>
 #include "config.h"
-#include <libspeechd.h>
+#include <speech-dispatcher/libspeechd.h>
 #include "plugin.h"
 #include "speech.h"
 
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,7 @@
 CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
 CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H)
 CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND)
-CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD)
+CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD)
 CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET)
 CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM)
 CHECK_FUNCTION_EXISTS(snprintf   HAVE_SNPRINTF)
--- a/configure.in
+++ b/configure.in
@@ -1038,7 +1038,7 @@
 # speech-dispatcher
 AC_ARG_ENABLE(speech-speech-dispatcher, [  --disable-speech-speech-dispatcher  disable speech type speech-dispatcher], speech_speech_dispatcher=$enableval;speech_speech_dispatcher_reason="configure parameter")
 if test "x$speech_speech_dispatcher" = "xyes"; then
-	AC_CHECK_HEADER(libspeechd.h, AC_DEFINE([HAVE_LIBSPEECHD],[],Define to 1 if you have the <libspeechd.h> header file.) SPEECHD_LIBS="-lspeechd",  speech_speech_dispatcher=no; speech_speech_dispatcher_reason="libspeechd.h missing")
+	AC_CHECK_HEADER(speech-dispatcher/libspeechd.h, AC_DEFINE([HAVE_LIBSPEECHD],[],Define to 1 if you have the <speech-dispatcher/libspeechd.h> header file.) SPEECHD_LIBS="-lspeechd",  speech_speech_dispatcher=no; speech_speech_dispatcher_reason="speech-dispatcher/libspeechd.h missing")
 fi
 AC_SUBST(SPEECHD_CFLAGS)
 AC_SUBST(SPEECHD_LIBS)

Reply via email to