[Pkg-voip-commits] r2728 - in twinkle/trunk/debian: . patches

Fri Nov 24 00:14:22 CET 2006

Author: msp
Date: 2006-11-24 00:14:21 +0100 (Fri, 24 Nov 2006)
New Revision: 2728

Modified:
   twinkle/trunk/debian/changelog
   twinkle/trunk/debian/patches/libgsm.patch
Log:
* Include expected src/twinkle_config.h inside
  debian/patches/libgsm.patch

Modified: twinkle/trunk/debian/changelog
===================================================================

--- twinkle/trunk/debian/changelog	2006-11-23 12:03:20 UTC (rev 2727)
+++ twinkle/trunk/debian/changelog	2006-11-23 23:14:21 UTC (rev 2728)
@@ -3,12 +3,14 @@
   * NOT RELEASED YET
   * Update debian/patches/libgsm to both configure and configure.in to
     avoid race condition. Previously it was only appled to configure.in
+  * Include expected src/twinkle_config.h inside
+    debian/patches/libgsm.patch
     - Closes: #394153: FTBFS: undefined reference to gsm_decode
 
-  * However, it still isn't building :-(
 
- -- Mark Purcell <msp at debian.org>  Sat, 18 Nov 2006 11:54:03 +0000
 
+ -- Mark Purcell <msp at debian.org>  Thu, 23 Nov 2006 23:12:33 +0000
+
 twinkle (1:0.9-4) unstable; urgency=low
 
   * Grab upstream patches: DTMF & Invite4xx

Modified: twinkle/trunk/debian/patches/libgsm.patch
===================================================================
--- twinkle/trunk/debian/patches/libgsm.patch	2006-11-23 12:03:20 UTC (rev 2727)
+++ twinkle/trunk/debian/patches/libgsm.patch	2006-11-23 23:14:21 UTC (rev 2728)
@@ -1,6 +1,6 @@
 diff -Nur twinkle-0.9/configure twinkle-0.9.new/configure
 --- twinkle-0.9/configure	2006-10-01 20:11:04.000000000 +0100
-+++ twinkle-0.9.new/configure	2006-11-18 11:43:40.000000000 +0000
++++ twinkle-0.9.new/configure	2006-11-23 23:10:33.000000000 +0000
 @@ -1,8 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -20973,7 +20973,7 @@
 +echo "${ECHO_T}Libgsm dynamic link:	$have_gsm" >&6; }
 diff -Nur twinkle-0.9/configure.in twinkle-0.9.new/configure.in
 --- twinkle-0.9/configure.in	2006-10-01 16:34:08.000000000 +0100
-+++ twinkle-0.9.new/configure.in	2006-11-18 11:43:31.000000000 +0000
++++ twinkle-0.9.new/configure.in	2006-11-23 23:10:33.000000000 +0000
 @@ -140,6 +140,17 @@
  AC_CHECK_LIB(sndfile, sf_open, [], 
  	[AC_MSG_ERROR([libsndfile library is missing.])])
@@ -20999,7 +20999,7 @@
 +AC_MSG_RESULT([Libgsm dynamic link:	$have_gsm])
 diff -Nur twinkle-0.9/src/Makefile.am twinkle-0.9.new/src/Makefile.am
 --- twinkle-0.9/src/Makefile.am	2006-09-18 21:12:56.000000000 +0100
-+++ twinkle-0.9.new/src/Makefile.am	2006-11-18 11:42:37.000000000 +0000
++++ twinkle-0.9.new/src/Makefile.am	2006-11-23 23:10:33.000000000 +0000
 @@ -16,10 +16,10 @@
          $(top_builddir)/src/sockets/libsocket.a\
          $(top_builddir)/src/threads/libthread.a\
@@ -21014,7 +21014,7 @@
  	-lboost_regex
 diff -Nur twinkle-0.9/src/audio/audio_decoder.h twinkle-0.9.new/src/audio/audio_decoder.h
 --- twinkle-0.9/src/audio/audio_decoder.h	2006-09-18 21:12:55.000000000 +0100
-+++ twinkle-0.9.new/src/audio/audio_decoder.h	2006-11-18 11:42:37.000000000 +0000
++++ twinkle-0.9.new/src/audio/audio_decoder.h	2006-11-23 23:10:33.000000000 +0000
 @@ -25,7 +25,12 @@
  #include "twinkle_config.h"
  #include "audio_codecs.h"
@@ -21030,7 +21030,7 @@
  #include <speex/speex.h>
 diff -Nur twinkle-0.9/src/audio/audio_encoder.h twinkle-0.9.new/src/audio/audio_encoder.h
 --- twinkle-0.9/src/audio/audio_encoder.h	2006-09-18 21:12:55.000000000 +0100
-+++ twinkle-0.9.new/src/audio/audio_encoder.h	2006-11-18 11:42:37.000000000 +0000
++++ twinkle-0.9.new/src/audio/audio_encoder.h	2006-11-23 23:10:33.000000000 +0000
 @@ -25,7 +25,12 @@
  #include "twinkle_config.h"
  #include "audio_codecs.h"
@@ -21046,7 +21046,7 @@
  #include <speex/speex.h>
 diff -Nur twinkle-0.9/src/gui/twinkle.pro twinkle-0.9.new/src/gui/twinkle.pro
 --- twinkle-0.9/src/gui/twinkle.pro	2006-09-30 22:45:13.000000000 +0100
-+++ twinkle-0.9.new/src/gui/twinkle.pro	2006-11-18 11:42:37.000000000 +0000
++++ twinkle-0.9.new/src/gui/twinkle.pro	2006-11-23 23:10:33.000000000 +0000
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -21056,3 +21056,286 @@
  
  DEFINES	+= QT_NO_STL
  
+diff -Nur twinkle-0.9/src/twinkle_config.h twinkle-0.9.new/src/twinkle_config.h
+--- twinkle-0.9/src/twinkle_config.h	1970-01-01 01:00:00.000000000 +0100
++++ twinkle-0.9.new/src/twinkle_config.h	2006-11-23 23:10:39.000000000 +0000
+@@ -0,0 +1,279 @@
++/* src/twinkle_config.h.  Generated from twinkle_config.h.in by configure.  */
++/* src/twinkle_config.h.in.  Generated from configure.in by autoheader.  */
++
++/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
++/* #undef HAVE_CARBON_CARBON_H */
++
++/* Define if you have the CoreAudio API */
++/* #undef HAVE_COREAUDIO */
++
++/* Define to 1 if you have the <crt_externs.h> header file. */
++/* #undef HAVE_CRT_EXTERNS_H */
++
++/* Defines if your system has the crypt function */
++#define HAVE_CRYPT 1
++
++/* Define to 1 if you have the <libgsm> library. */
++#define HAVE_GSM 1
++
++/* Define to 1 if you have the <ilbc> library. */
++/* #undef HAVE_ILBC */
++
++/* Define to 1 if you have a C++ ilbc library. */
++/* #undef HAVE_ILBC_CPP */
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have KDE. */
++#define HAVE_KDE 1
++
++/* Define to 1 if you have the <libasound> library. */
++#define HAVE_LIBASOUND 1
++
++/* Define to 1 if you have the `boost_regex' library (-lboost_regex). */
++#define HAVE_LIBBOOST_REGEX 1
++
++/* Define if you have libjpeg */
++#define HAVE_LIBJPEG 1
++
++/* Define if you have libpng */
++#define HAVE_LIBPNG 1
++
++/* Define if you have a working libpthread (will enable threaded code) */
++#define HAVE_LIBPTHREAD 1
++
++/* Define to 1 if you have the `sndfile' library (-lsndfile). */
++#define HAVE_LIBSNDFILE 1
++
++/* Define if you have libz */
++#define HAVE_LIBZ 1
++
++/* Define to 1 if you have the <linux/errqueue.h> header file. */
++#define HAVE_LINUX_ERRQUEUE_H 1
++
++/* Define to 1 if you have the <linux/types.h> header file. */
++#define HAVE_LINUX_TYPES_H 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define if your system needs _NSGetEnviron to set up the environment */
++/* #undef HAVE_NSGETENVIRON */
++
++/* Define if you have res_init */
++#define HAVE_RES_INIT 1
++
++/* Define if you have the res_init prototype */
++#define HAVE_RES_INIT_PROTO 1
++
++/* Define if you have a STL implementation by SGI */
++#define HAVE_SGI_STL 1
++
++/* Define to 1 if you have the `snprintf' function. */
++#define HAVE_SNPRINTF 1
++
++/* Define to 1 if you have the <speex> library. */
++#define HAVE_SPEEX 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define if you have strlcat */
++/* #undef HAVE_STRLCAT */
++
++/* Define if you have the strlcat prototype */
++/* #undef HAVE_STRLCAT_PROTO */
++
++/* Define if you have strlcpy */
++/* #undef HAVE_STRLCPY */
++
++/* Define if you have the strlcpy prototype */
++/* #undef HAVE_STRLCPY_PROTO */
++
++/* Define to 1 if you have the <sys/bitypes.h> header file. */
++#define HAVE_SYS_BITYPES_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `vsnprintf' function. */
++#define HAVE_VSNPRINTF 1
++
++/* Define to 1 if you have the <libzrtpcpp> library. */
++#define HAVE_ZRTP 1
++
++/* Suffix for lib directories */
++#define KDELIBSUFF ""
++
++/* Name of package */
++#define PACKAGE "twinkle"
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT ""
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME ""
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING ""
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME ""
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION ""
++
++/* The size of `char *', as computed by sizeof. */
++#define SIZEOF_CHAR_P 4
++
++/* The size of `int', as computed by sizeof. */
++#define SIZEOF_INT 4
++
++/* The size of `long', as computed by sizeof. */
++#define SIZEOF_LONG 4
++
++/* The size of `short', as computed by sizeof. */
++#define SIZEOF_SHORT 2
++
++/* The size of `size_t', as computed by sizeof. */
++#define SIZEOF_SIZE_T 4
++
++/* The size of `unsigned long', as computed by sizeof. */
++#define SIZEOF_UNSIGNED_LONG 4
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Version number of package */
++#define VERSION "0.9"
++
++/* Version release date */
++#define VERSION_DATE "October 1 2006"
++
++/* Defined if compiling without arts */
++/* #undef WITHOUT_ARTS */
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++/* #undef WORDS_BIGENDIAN */
++
++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
++   `char[]'. */
++#define YYTEXT_POINTER 1
++
++/*
++ * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
++ * headers and I'm too lazy to write a configure test as long as only
++ * unixware is related
++ */
++#ifdef _UNIXWARE
++#define HAVE_BOOLEAN
++#endif
++
++
++
++/*
++ * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
++ * that defines bzero.
++ */
++
++#if defined(_AIX)
++#include <strings.h>
++#endif
++
++
++
++#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
++# include <sys/time.h>
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#endif
++
++
++
++#if !defined(HAVE_RES_INIT_PROTO)
++#ifdef __cplusplus
++extern "C" {
++#endif
++int res_init(void);
++#ifdef __cplusplus
++}
++#endif
++#endif
++
++
++
++#if !defined(HAVE_STRLCAT_PROTO)
++#ifdef __cplusplus
++extern "C" {
++#endif
++unsigned long strlcat(char*, const char*, unsigned long);
++#ifdef __cplusplus
++}
++#endif
++#endif
++
++
++
++#if !defined(HAVE_STRLCPY_PROTO)
++#ifdef __cplusplus
++extern "C" {
++#endif
++unsigned long strlcpy(char*, const char*, unsigned long);
++#ifdef __cplusplus
++}
++#endif
++#endif
++
++
++
++/*
++ * On HP-UX, the declaration of vsnprintf() is needed every time !
++ */
++
++#if !defined(HAVE_VSNPRINTF) || defined(hpux)
++#if __STDC__
++#include <stdarg.h>
++#include <stdlib.h>
++#else
++#include <varargs.h>
++#endif
++#ifdef __cplusplus
++extern "C"
++#endif
++int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
++#ifdef __cplusplus
++extern "C"
++#endif
++int snprintf(char *str, size_t n, char const *fmt, ...);
++#endif
++
++
++
++#if defined(__SVR4) && !defined(__svr4__)
++#define __svr4__ 1
++#endif
++
++
++/* type to use in place of socklen_t if not defined */
++#define kde_socklen_t socklen_t
++
++/* type to use in place of socklen_t if not defined (deprecated, use
++   kde_socklen_t) */
++#define ksize_t socklen_t


