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

[Mark Purcell]

Author: msp
Date: 2006-05-01 21:51:56 +0000 (Mon, 01 May 2006)
New Revision: 1667

Modified:
   twinkle/trunk/debian/changelog
   twinkle/trunk/debian/control
   twinkle/trunk/debian/patches/libgsm.diff
Log:
* New upstream release
* Add Build-Depends: libspeex-dev
* Modify debian/patches/libgsm.diff

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2006-05-01 20:34:35 UTC (rev 1666)
+++ twinkle/trunk/debian/changelog	2006-05-01 21:51:56 UTC (rev 1667)
@@ -1,14 +1,16 @@
-twinkle (0.7-1) UNRELEASED; urgency=low
+twinkle (0.7-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
   * Update debian/control. Fixes FTBFS on kfreebsd-amd64: unsatisfied
      Build-Depends (Closes: #361483)
   * Rebuild with updated libccrtp & libcommoncpp2
     - Fixes: libccext2-1.3.so.1: cannot open shared object file (Closes: #362440)
   * Installed debian/twinkle.desktop. Fixes: please install a .desktop
   file (Closes: #358398)
+  * Add Build-Depends: libspeex-dev
+  * Modify debian/patches/libgsm.diff
 
- -- Mark Purcell <msp at debian.org>  Mon,  1 May 2006 11:07:32 +0100
+ -- Mark Purcell <msp at debian.org>  Mon,  1 May 2006 12:21:03 +0100
 
 twinkle (0.6.2-1) unstable; urgency=low
 

Modified: twinkle/trunk/debian/control
===================================================================
--- twinkle/trunk/debian/control	2006-05-01 20:34:35 UTC (rev 1666)
+++ twinkle/trunk/debian/control	2006-05-01 21:51:56 UTC (rev 1667)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>=1.3.10-4), libccrtp-dev (>=1.3.4), help2man, libqt3-mt-dev (>= 3:3.3.4-4), qt3-apps-dev, automake1.9, libxml2-dev, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>=1.3.10-4), libccrtp-dev (>=1.3.4), help2man, libqt3-mt-dev (>= 3:3.3.4-4), qt3-apps-dev, automake1.9, libxml2-dev, cdbs, kdelibs-bin, kdelibs4-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml2-dev, libgsm1-dev, libsndfile1-dev, libxpm-dev, libspeex-dev
 Standards-Version: 3.6.1
 
 Package: twinkle

Modified: twinkle/trunk/debian/patches/libgsm.diff
===================================================================
--- twinkle/trunk/debian/patches/libgsm.diff	2006-05-01 20:34:35 UTC (rev 1666)
+++ twinkle/trunk/debian/patches/libgsm.diff	2006-05-01 21:51:56 UTC (rev 1667)
@@ -14,30 +14,31 @@
  $QTDIR/bin/qmake -o src/gui/Makefile src/gui/twinkle.pro
  echo "distdir:" >> src/gui/Makefile
  
-diff -ur orig/twinkle-0.6.1/src/audio/audio_rx.h twinkle-0.6.1/src/audio/audio_rx.h
---- orig/twinkle-0.6.1/src/audio/audio_rx.h	2006-01-01 15:38:04.000000000 +0000
-+++ twinkle-0.6.1/src/audio/audio_rx.h	2006-02-21 10:34:57.000000000 +0000
-@@ -29,7 +29,7 @@
+diff -Nur twinkle-0.7/src/audio/audio_encoder.h twinkle-0.7.new/src/audio/audio_encoder.h
+--- twinkle-0.7/src/audio/audio_encoder.h       2006-04-16 19:51:14.000000000 +0100
++++ twinkle-0.7.new/src/audio/audio_encoder.h   2006-05-01 22:25:49.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
  #include "user.h"
- #include "threads/mutex.h"
- #include "threads/sema.h"
 -#include "gsm/inc/gsm.h"
 +#include <gsm.h>
- #include "audio_device.h"
- #include "twinkle_rtp_session.h"
- 
-diff -ur orig/twinkle-0.6.1/src/audio/audio_tx.h twinkle-0.6.1/src/audio/audio_tx.h
---- orig/twinkle-0.6.1/src/audio/audio_tx.h	2006-01-01 15:38:04.000000000 +0000
-+++ twinkle-0.6.1/src/audio/audio_tx.h	2006-02-21 10:35:16.000000000 +0000
-@@ -27,7 +27,7 @@
- #include "media_buffer.h"
- #include "rtp_telephone_event.h"
- #include "threads/mutex.h"
--#include "gsm/inc/gsm.h"
+
+ #ifdef HAVE_SPEEX
+ #include <speex/speex.h>
+
+diff -Nur twinkle-0.7/src/audio/audio_rx.h twinkle-0.7.new/src/audio/audio_rx.h
+--- twinkle-0.7/src/audio/audio_rx.h    2006-04-16 20:57:15.000000000 +0100
++++ twinkle-0.7.new/src/audio/audio_rx.h        2006-05-01 22:19:25.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <assert.h>
+ #include <queue>
+ #include <string>
 +#include <gsm.h>
+ #include "audio_codecs.h"
  #include "audio_device.h"
- #include "twinkle_rtp_session.h"
- 
+ #include "audio_encoder.h"
+
 diff -ur orig/twinkle-0.6.1/src/audio/Makefile.am twinkle-0.6.1/src/audio/Makefile.am
 --- orig/twinkle-0.6.1/src/audio/Makefile.am	2005-10-09 20:11:36.000000000 +0100
 +++ twinkle-0.6.1/src/audio/Makefile.am	2006-02-21 10:35:37.000000000 +0000