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

Mark Purcell msp at alioth.debian.org
Mon Jan 8 22:43:51 CET 2007 

Author: msp
Date: 2007-01-08 22:43:51 +0100 (Mon, 08 Jan 2007)
New Revision: 2981

Modified:
   twinkle/trunk/debian/changelog
   twinkle/trunk/debian/patches/libgsm.patch
Log:
* New upstream release

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2007-01-08 20:57:40 UTC (rev 2980)
+++ twinkle/trunk/debian/changelog	2007-01-08 21:43:51 UTC (rev 2981)
@@ -1,13 +1,13 @@
-twinkle (1:1.0~beta-1) UNRELEASED; urgency=low
+twinkle (1:1.0~beta-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
   * Needed for the preceeding package to get into etch
   * delete debian/patches dtmf, invite4xx and memman included upstream
   * debian/rules get-orig-source targets rewritten
   * Cleanup debian/watch
   * Add extra-qualifications.patch to fix upstream g 4.1.1 build errors
 
- -- Mark Purcell <msp at debian.org>  Mon,  8 Jan 2007 20:57:22 +0000
+ -- Mark Purcell <msp at debian.org>  Mon,  8 Jan 2007 21:29:49 +0000
 
 twinkle (1:0.9-6) testing-proposed-updates; urgency=medium
 

Modified: twinkle/trunk/debian/patches/libgsm.patch
===================================================================
--- twinkle/trunk/debian/patches/libgsm.patch	2007-01-08 20:57:40 UTC (rev 2980)
+++ twinkle/trunk/debian/patches/libgsm.patch	2007-01-08 21:43:51 UTC (rev 2981)
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.9/configure.in twinkle-0.9.new/configure.in
---- twinkle-0.9/configure.in	2006-11-25 08:39:02.000000000 +0000
-+++ twinkle-0.9.new/configure.in	2006-11-25 08:39:03.000000000 +0000
-@@ -140,6 +140,17 @@
+diff -Nur twinkle-1.0~beta/configure.in twinkle-1.0~beta.new/configure.in
+--- twinkle-1.0~beta/configure.in	2006-12-29 20:16:14.000000000 +0000
++++ twinkle-1.0~beta.new/configure.in	2007-01-08 21:07:33.000000000 +0000
+@@ -149,6 +149,17 @@
  AC_CHECK_LIB(sndfile, sf_open, [], 
  	[AC_MSG_ERROR([libsndfile library is missing.])])
  
@@ -19,29 +19,30 @@
  # Check if ALSA is available
  AC_CHECK_LIB(asound, main, [
  	AC_CHECK_HEADER(alsa/asoundlib.h, [],
-@@ -228,3 +239,4 @@
+@@ -244,3 +255,4 @@
  AC_MSG_RESULT([Speex:       $have_speex])
  AC_MSG_RESULT([iLBC:        $have_ilbc])
  AC_MSG_RESULT([ZRTP:        $have_zrtp])
 +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-11-25 08:39:02.000000000 +0000
-+++ twinkle-0.9.new/src/Makefile.am	2006-11-25 08:39:03.000000000 +0000
-@@ -16,10 +16,10 @@
+diff -Nur twinkle-1.0~beta/src/Makefile.am twinkle-1.0~beta.new/src/Makefile.am
+--- twinkle-1.0~beta/src/Makefile.am	2006-12-29 04:24:06.000000000 +0000
++++ twinkle-1.0~beta.new/src/Makefile.am	2007-01-08 21:07:46.000000000 +0000
+@@ -16,11 +16,11 @@
          $(top_builddir)/src/sockets/libsocket.a\
          $(top_builddir)/src/threads/libthread.a\
          $(top_builddir)/src/audio/libaudio.a\
 -        $(top_builddir)/src/audio/gsm/libgsm.a\
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
+         $(top_builddir)/src/mwi/libmwi.a\
  	$(CCRTP_LIBS)\
 +	$(LIBS)\
- 	-lresolv\
- 	-lsndfile\
- 	-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-11-25 08:39:02.000000000 +0000
-+++ twinkle-0.9.new/src/audio/audio_decoder.h	2006-11-25 08:39:03.000000000 +0000
+ 	-lsndfile
+ 
+ libtwinkle_a_SOURCES =\
+diff -Nur twinkle-1.0~beta/src/audio/audio_decoder.h twinkle-1.0~beta.new/src/audio/audio_decoder.h
+--- twinkle-1.0~beta/src/audio/audio_decoder.h	2006-12-28 20:56:49.000000000 +0000
++++ twinkle-1.0~beta.new/src/audio/audio_decoder.h	2007-01-08 21:07:33.000000000 +0000
 @@ -25,7 +25,12 @@
  #include "twinkle_config.h"
  #include "audio_codecs.h"
@@ -55,9 +56,9 @@
  
  #ifdef HAVE_SPEEX
  #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-11-25 08:39:02.000000000 +0000
-+++ twinkle-0.9.new/src/audio/audio_encoder.h	2006-11-25 08:39:03.000000000 +0000
+diff -Nur twinkle-1.0~beta/src/audio/audio_encoder.h twinkle-1.0~beta.new/src/audio/audio_encoder.h
+--- twinkle-1.0~beta/src/audio/audio_encoder.h	2006-12-28 20:56:17.000000000 +0000
++++ twinkle-1.0~beta.new/src/audio/audio_encoder.h	2007-01-08 21:07:33.000000000 +0000
 @@ -25,7 +25,12 @@
  #include "twinkle_config.h"
  #include "audio_codecs.h"
@@ -71,21 +72,21 @@
  
  #ifdef HAVE_SPEEX
  #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-11-25 08:39:02.000000000 +0000
-+++ twinkle-0.9.new/src/gui/twinkle.pro	2006-11-25 08:39:03.000000000 +0000
+diff -Nur twinkle-1.0~beta/src/gui/twinkle.pro twinkle-1.0~beta.new/src/gui/twinkle.pro
+--- twinkle-1.0~beta/src/gui/twinkle.pro	2006-12-29 04:24:24.000000000 +0000
++++ twinkle-1.0~beta.new/src/gui/twinkle.pro	2007-01-08 21:08:02.000000000 +0000
 @@ -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
+-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 ../mwi/libmwi.a -lsndfile
++LIBS	+= ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a -lsndfile
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.9/src/twinkle_config.h.in twinkle-0.9.new/src/twinkle_config.h.in
---- twinkle-0.9/src/twinkle_config.h.in	2006-10-01 20:11:58.000000000 +0100
-+++ twinkle-0.9.new/src/twinkle_config.h.in	2006-11-25 08:39:50.000000000 +0000
+diff -Nur twinkle-1.0~beta/src/twinkle_config.h.in twinkle-1.0~beta.new/src/twinkle_config.h.in
+--- twinkle-1.0~beta/src/twinkle_config.h.in	2006-12-29 20:18:31.000000000 +0000
++++ twinkle-1.0~beta.new/src/twinkle_config.h.in	2007-01-08 21:07:33.000000000 +0000
 @@ -12,6 +12,9 @@
  /* Defines if your system has the crypt function */
  #undef HAVE_CRYPT
@@ -96,7 +97,7 @@
  /* Define to 1 if you have the <ilbc> library. */
  #undef HAVE_ILBC
  
-@@ -135,22 +138,22 @@
+@@ -132,22 +135,22 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION

More information about the Pkg-voip-commits mailing list