[Pkg-voip-commits] r2086 - in twinkle/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Wed Jul 19 21:24:40 UTC 2006
Author: msp
Date: 2006-07-19 21:24:37 +0000 (Wed, 19 Jul 2006)
New Revision: 2086
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/patches/libgsm.patch
Log:
Releasing
Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog 2006-07-19 20:09:36 UTC (rev 2085)
+++ twinkle/trunk/debian/changelog 2006-07-19 21:24:37 UTC (rev 2086)
@@ -1,14 +1,13 @@
-twinkle (0.8.1-1) UNRELEASED; urgency=low
+twinkle (0.8.1-1) unstable; urgency=low
[ Kilian Krause ]
- * NOT RELEASED YET
* New upstream release. Ships without iLBC, therefore no need to repackage.
[ Mark Purcell ]
* Cleanup debian/patches/libgsm.patch
* Use upstream supplied sip.protocol
- -- Mark Purcell <msp at debian.org> Tue, 18 Jul 2006 13:10:49 +0100
+ -- Mark Purcell <msp at debian.org> Wed, 19 Jul 2006 22:22:32 +0100
twinkle (0.8.dfsg-1) unstable; urgency=low
Modified: twinkle/trunk/debian/patches/libgsm.patch
===================================================================
--- twinkle/trunk/debian/patches/libgsm.patch 2006-07-19 20:09:36 UTC (rev 2085)
+++ twinkle/trunk/debian/patches/libgsm.patch 2006-07-19 21:24:37 UTC (rev 2086)
@@ -1,23 +1,28 @@
diff -Nur twinkle-0.8.1/configure.in twinkle-0.8.1.new/configure.in
---- twinkle-0.8.1/configure.in 2006-07-09 15:09:11.000000000 +0100
-+++ twinkle-0.8.1.new/configure.in 2006-07-18 18:09:50.000000000 +0100
-@@ -135,6 +135,12 @@
+--- twinkle-0.8.1/configure.in 2006-07-19 21:53:07.000000000 +0100
++++ twinkle-0.8.1.new/configure.in 2006-07-19 21:53:30.000000000 +0100
+@@ -135,6 +135,17 @@
AC_CHECK_LIB(sndfile, sf_open, [],
[AC_MSG_ERROR([libsndfile library is missing.])])
+# Check if libgsm is available
-+AC_CHECK_LIB(gsm, sf_open, [],
-+ [AC_MSG_ERROR([libgsm library is missing.])])
-+AC_CHECK_HEADER(gsm.h, [],
-+ [AC_MSG_ERROR([gsm header files msiing (gsm.h)])])
++AC_CHECK_LIB(gsm, sf_open, [
++ AC_CHECK_HEADER(gsm.h, [],
++ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
++ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
++ LIBS="-lgsm $LIBS"
++ echo "LIBS += -lgsm" >> $QT_INCL_PRO
++ have_gsm="yes" ], [
++ have_gsm="no"
++ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+
# Check if ALSA is available
AC_CHECK_LIB(asound, main, [
AC_CHECK_HEADER(alsa/asoundlib.h, [],
diff -Nur twinkle-0.8.1/src/Makefile.am twinkle-0.8.1.new/src/Makefile.am
---- twinkle-0.8.1/src/Makefile.am 2006-07-07 21:19:03.000000000 +0100
-+++ twinkle-0.8.1.new/src/Makefile.am 2006-07-18 18:09:50.000000000 +0100
-@@ -16,7 +16,6 @@
+--- twinkle-0.8.1/src/Makefile.am 2006-07-19 21:53:07.000000000 +0100
++++ twinkle-0.8.1.new/src/Makefile.am 2006-07-19 21:53:45.000000000 +0100
+@@ -16,10 +16,10 @@
$(top_builddir)/src/sockets/libsocket.a\
$(top_builddir)/src/threads/libthread.a\
$(top_builddir)/src/audio/libaudio.a\
@@ -25,50 +30,51 @@
$(top_builddir)/src/audits/libaudits.a\
$(top_builddir)/src/stun/libstun.a\
$(CCRTP_LIBS)\
-diff -Nur twinkle-0.8.1/src/audio/Makefile.am twinkle-0.8.1.new/src/audio/Makefile.am
---- twinkle-0.8.1/src/audio/Makefile.am 2006-07-07 19:39:35.000000000 +0100
-+++ twinkle-0.8.1.new/src/audio/Makefile.am 2006-07-18 18:09:50.000000000 +0100
-@@ -37,6 +37,6 @@
- tone_gen.h\
- twinkle_rtp_session.h
-
--SUBDIRS = gsm
-+SUBDIRS =
-
- EXTRA_DIST = README_G711
++ $(LIBS)\
+ -lresolv\
+ -lsndfile\
+ -lboost_regex
diff -Nur twinkle-0.8.1/src/audio/audio_decoder.h twinkle-0.8.1.new/src/audio/audio_decoder.h
---- twinkle-0.8.1/src/audio/audio_decoder.h 2006-07-07 22:03:38.000000000 +0100
-+++ twinkle-0.8.1.new/src/audio/audio_decoder.h 2006-07-18 18:09:50.000000000 +0100
-@@ -25,7 +25,7 @@
+--- twinkle-0.8.1/src/audio/audio_decoder.h 2006-07-19 21:53:08.000000000 +0100
++++ twinkle-0.8.1.new/src/audio/audio_decoder.h 2006-07-19 21:53:30.000000000 +0100
+@@ -25,7 +25,12 @@
#include "twinkle_config.h"
#include "audio_codecs.h"
#include "user.h"
--#include "gsm/inc/gsm.h"
++
++#ifdef HAVE_GSM
+#include <gsm.h>
++#else
+ #include "gsm/inc/gsm.h"
++#endif
#ifdef HAVE_SPEEX
#include <speex/speex.h>
diff -Nur twinkle-0.8.1/src/audio/audio_encoder.h twinkle-0.8.1.new/src/audio/audio_encoder.h
---- twinkle-0.8.1/src/audio/audio_encoder.h 2006-07-07 22:02:28.000000000 +0100
-+++ twinkle-0.8.1.new/src/audio/audio_encoder.h 2006-07-18 18:09:50.000000000 +0100
-@@ -25,7 +25,7 @@
+--- twinkle-0.8.1/src/audio/audio_encoder.h 2006-07-19 21:53:08.000000000 +0100
++++ twinkle-0.8.1.new/src/audio/audio_encoder.h 2006-07-19 21:53:30.000000000 +0100
+@@ -25,7 +25,12 @@
#include "twinkle_config.h"
#include "audio_codecs.h"
#include "user.h"
--#include "gsm/inc/gsm.h"
++
++#ifdef HAVE_GSM
+#include <gsm.h>
++#else
+ #include "gsm/inc/gsm.h"
++#endif
#ifdef HAVE_SPEEX
#include <speex/speex.h>
diff -Nur twinkle-0.8.1/src/gui/twinkle.pro twinkle-0.8.1.new/src/gui/twinkle.pro
---- twinkle-0.8.1/src/gui/twinkle.pro 2006-07-07 19:44:07.000000000 +0100
-+++ twinkle-0.8.1.new/src/gui/twinkle.pro 2006-07-18 18:10:16.000000000 +0100
+--- twinkle-0.8.1/src/gui/twinkle.pro 2006-07-19 21:53:08.000000000 +0100
++++ twinkle-0.8.1.new/src/gui/twinkle.pro 2006-07-19 21:53:30.000000000 +0100
@@ -3,7 +3,7 @@
CONFIG += qt warn_off release thread
-LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
-+LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -lgsm
++LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex
DEFINES += QT_NO_STL
More information about the Pkg-voip-commits
mailing list