[Pkg-voip-commits] r2079 - in twinkle/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Tue Jul 18 17:38:36 UTC 2006
Author: msp
Date: 2006-07-18 17:38:36 +0000 (Tue, 18 Jul 2006)
New Revision: 2079
Added:
twinkle/trunk/debian/patches/libgsm.patch
Removed:
twinkle/trunk/debian/patches/libgsm.diff
twinkle/trunk/debian/sip.protocol
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/rules
Log:
* Cleanup debian/patches/libgsm.patch
* Use upstream supplied sip.protocol
Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog 2006-07-17 21:53:36 UTC (rev 2078)
+++ twinkle/trunk/debian/changelog 2006-07-18 17:38:36 UTC (rev 2079)
@@ -1,10 +1,15 @@
twinkle (0.8.1-1) UNRELEASED; urgency=low
+ [ Kilian Krause ]
* NOT RELEASED YET
* New upstream release. Ships without iLBC, therefore no need to repackage.
- -- Kilian Krause <kilian at debian.org> Mon, 10 Jul 2006 21:25:34 +0200
+ [ 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
+
twinkle (0.8.dfsg-1) unstable; urgency=low
* New upstream release
Deleted: twinkle/trunk/debian/patches/libgsm.diff
===================================================================
--- twinkle/trunk/debian/patches/libgsm.diff 2006-07-17 21:53:36 UTC (rev 2078)
+++ twinkle/trunk/debian/patches/libgsm.diff 2006-07-18 17:38:36 UTC (rev 2079)
@@ -1,119 +0,0 @@
-diff -Nur twinkle-0.8.dfsg/configure twinkle-0.8.dfsg.new/configure
---- twinkle-0.8.dfsg/configure 2006-07-01 08:22:54.000000000 +0100
-+++ twinkle-0.8.dfsg.new/configure 2006-07-06 23:10:48.000000000 +0100
-@@ -17185,7 +17185,7 @@
- PARSER_CXXFLAGS=`echo $CXXFLAGS | sed -e "s/\-O2//;s/\-Os//"`
-
-
-- ac_config_files="$ac_config_files Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile src/audio/ilbc/Makefile src/audits/Makefile src/sdp/Makefile src/parser/Makefile src/sockets/Makefile src/stun/Makefile src/threads/Makefile twinkle.spec"
-+ ac_config_files="$ac_config_files Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile src/audits/Makefile src/sdp/Makefile src/parser/Makefile src/sockets/Makefile src/stun/Makefile src/threads/Makefile twinkle.spec"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -17760,7 +17760,6 @@
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/audio/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/Makefile" ;;
- "src/audio/gsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/gsm/Makefile" ;;
-- "src/audio/ilbc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/ilbc/Makefile" ;;
- "src/audits/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audits/Makefile" ;;
- "src/sdp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/sdp/Makefile" ;;
- "src/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/parser/Makefile" ;;
-diff -Nur twinkle-0.8.dfsg/configure.in twinkle-0.8.dfsg.new/configure.in
---- twinkle-0.8.dfsg/configure.in 2006-06-30 21:11:07.000000000 +0100
-+++ twinkle-0.8.dfsg.new/configure.in 2006-07-06 23:11:33.000000000 +0100
-@@ -127,6 +127,12 @@
- 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)])])
-+
- # Check if ALSA is available
- AC_CHECK_LIB(asound, main, [
- AC_CHECK_HEADER(alsa/asoundlib.h, [],
-@@ -173,7 +179,6 @@
- AC_SUBST(PARSER_CXXFLAGS)
-
- AC_OUTPUT(Makefile src/Makefile src/audio/Makefile src/audio/gsm/Makefile \
-- src/audio/ilbc/Makefile \
- src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
- src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
- twinkle.spec)
-diff -Nur twinkle-0.8.dfsg/src/Makefile.am twinkle-0.8.dfsg.new/src/Makefile.am
---- twinkle-0.8.dfsg/src/Makefile.am 2006-06-22 21:32:19.000000000 +0100
-+++ twinkle-0.8.dfsg.new/src/Makefile.am 2006-07-06 23:11:33.000000000 +0100
-@@ -16,13 +16,12 @@
- $(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/audio/ilbc/libilbc.a\
- $(top_builddir)/src/audits/libaudits.a\
- $(top_builddir)/src/stun/libstun.a\
- $(CCRTP_LIBS)\
- -lresolv\
- -lsndfile\
-+ -lgsm\
- -lboost_regex
-
- libtwinkle_a_SOURCES =\
-diff -Nur twinkle-0.8.dfsg/src/audio/Makefile.am twinkle-0.8.dfsg.new/src/audio/Makefile.am
---- twinkle-0.8.dfsg/src/audio/Makefile.am 2006-05-13 08:57:01.000000000 +0100
-+++ twinkle-0.8.dfsg.new/src/audio/Makefile.am 2006-07-06 23:11:33.000000000 +0100
-@@ -37,6 +37,4 @@
- tone_gen.h\
- twinkle_rtp_session.h
-
--SUBDIRS = gsm ilbc
--
- EXTRA_DIST = README_G711
-diff -Nur twinkle-0.8.dfsg/src/audio/audio_decoder.h twinkle-0.8.dfsg.new/src/audio/audio_decoder.h
---- twinkle-0.8.dfsg/src/audio/audio_decoder.h 2006-05-13 09:24:32.000000000 +0100
-+++ twinkle-0.8.dfsg.new/src/audio/audio_decoder.h 2006-07-06 23:11:33.000000000 +0100
-@@ -25,7 +25,7 @@
- #include "twinkle_config.h"
- #include "audio_codecs.h"
- #include "user.h"
--#include "gsm/inc/gsm.h"
-+#include <gsm.h>
-
- #ifdef HAVE_SPEEX
- #include <speex/speex.h>
-diff -Nur twinkle-0.8.dfsg/src/audio/audio_encoder.h twinkle-0.8.dfsg.new/src/audio/audio_encoder.h
---- twinkle-0.8.dfsg/src/audio/audio_encoder.h 2006-05-13 09:25:02.000000000 +0100
-+++ twinkle-0.8.dfsg.new/src/audio/audio_encoder.h 2006-07-06 23:11:33.000000000 +0100
-@@ -25,7 +25,7 @@
- #include "twinkle_config.h"
- #include "audio_codecs.h"
- #include "user.h"
--#include "gsm/inc/gsm.h"
-+#include <gsm.h>
-
- #ifdef HAVE_SPEEX
- #include <speex/speex.h>
-diff -Nur twinkle-0.8.dfsg/src/audio/audio_rx.h twinkle-0.8.dfsg.new/src/audio/audio_rx.h
---- twinkle-0.8.dfsg/src/audio/audio_rx.h 2006-05-13 08:50:14.000000000 +0100
-+++ twinkle-0.8.dfsg.new/src/audio/audio_rx.h 2006-07-06 23:11:33.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 "audio_encoder.h"
-diff -Nur twinkle-0.8.dfsg/src/gui/twinkle.pro twinkle-0.8.dfsg.new/src/gui/twinkle.pro
---- twinkle-0.8.dfsg/src/gui/twinkle.pro 2006-07-01 08:19:17.000000000 +0100
-+++ twinkle-0.8.dfsg.new/src/gui/twinkle.pro 2006-07-06 23:11:33.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 ../audio/ilbc/libilbc.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
-
- DEFINES += QT_NO_STL
-
Added: twinkle/trunk/debian/patches/libgsm.patch
===================================================================
--- twinkle/trunk/debian/patches/libgsm.patch 2006-07-17 21:53:36 UTC (rev 2078)
+++ twinkle/trunk/debian/patches/libgsm.patch 2006-07-18 17:38:36 UTC (rev 2079)
@@ -0,0 +1,74 @@
+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 @@
+ 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)])])
++
+ # 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 @@
+ $(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\
+ $(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
+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 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
+ #include "user.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
+
+ #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 @@
+ #include "twinkle_config.h"
+ #include "audio_codecs.h"
+ #include "user.h"
+-#include "gsm/inc/gsm.h"
++#include <gsm.h>
+
+ #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
+@@ -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
+
+ DEFINES += QT_NO_STL
+
Modified: twinkle/trunk/debian/rules
===================================================================
--- twinkle/trunk/debian/rules 2006-07-17 21:53:36 UTC (rev 2078)
+++ twinkle/trunk/debian/rules 2006-07-18 17:38:36 UTC (rev 2079)
@@ -22,7 +22,7 @@
install/twinkle::
cp debian/twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
- cp debian/sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
+ cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
print-version:
@@echo "Debian version: $(DEBVERSION)"
Deleted: twinkle/trunk/debian/sip.protocol
===================================================================
--- twinkle/trunk/debian/sip.protocol 2006-07-17 21:53:36 UTC (rev 2078)
+++ twinkle/trunk/debian/sip.protocol 2006-07-18 17:38:36 UTC (rev 2079)
@@ -1,12 +0,0 @@
-[Protocol]
-exec=twinkle --call %u
-protocol=sip
-input=none
-output=none
-helper=true
-listing=
-reading=false
-writing=false
-makedir=false
-deleting=false
-Icon=multimedia
More information about the Pkg-voip-commits
mailing list