[Pkg-voip-commits] r2021 - in twinkle/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Thu Jul 6 22:30:55 UTC 2006
Author: msp
Date: 2006-07-06 22:30:54 +0000 (Thu, 06 Jul 2006)
New Revision: 2021
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/patches/libgsm.diff
Log:
* New upstream release
* Remove non-free iLBC code from DFSG release
Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog 2006-07-06 22:06:39 UTC (rev 2020)
+++ twinkle/trunk/debian/changelog 2006-07-06 22:30:54 UTC (rev 2021)
@@ -1,7 +1,7 @@
-twinkle (0.8.dfsg-1) UNRELEASED; urgency=low
+twinkle (0.8.dfsg-1) unstable; urgency=low
- * (NOT RELEASED YET) New upstream release
- * dfsg release does not ship with iLBC code
+ * New upstream release
+ * Remove non-free iLBC code from DFSG release
-- Mark Purcell <msp at debian.org> Sun, 2 Jul 2006 21:37:09 +0100
Modified: twinkle/trunk/debian/patches/libgsm.diff
===================================================================
--- twinkle/trunk/debian/patches/libgsm.diff 2006-07-06 22:06:39 UTC (rev 2020)
+++ twinkle/trunk/debian/patches/libgsm.diff 2006-07-06 22:30:54 UTC (rev 2021)
@@ -1,6 +1,26 @@
-diff -ur /tmp/twinkle-0.8/configure.in twinkle-0.8.dfsg/configure.in
---- /tmp/twinkle-0.8/configure.in 2006-06-30 21:11:07.000000000 +0100
-+++ twinkle-0.8.dfsg/configure.in 2006-07-06 22:59:01.000000000 +0100
+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.])])
@@ -22,10 +42,9 @@
src/audits/Makefile src/sdp/Makefile src/parser/Makefile \
src/sockets/Makefile src/stun/Makefile src/threads/Makefile \
twinkle.spec)
-Only in twinkle-0.8.dfsg: debian
-diff -ur /tmp/twinkle-0.8/src/Makefile.am twinkle-0.8.dfsg/src/Makefile.am
---- /tmp/twinkle-0.8/src/Makefile.am 2006-06-22 21:32:19.000000000 +0100
-+++ twinkle-0.8.dfsg/src/Makefile.am 2006-07-06 22:58:32.000000000 +0100
+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\
@@ -41,9 +60,9 @@
-lboost_regex
libtwinkle_a_SOURCES =\
-diff -ur /tmp/twinkle-0.8/src/audio/Makefile.am twinkle-0.8.dfsg/src/audio/Makefile.am
---- /tmp/twinkle-0.8/src/audio/Makefile.am 2006-05-13 08:57:01.000000000 +0100
-+++ twinkle-0.8.dfsg/src/audio/Makefile.am 2006-07-06 22:58:32.000000000 +0100
+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
@@ -51,9 +70,9 @@
-SUBDIRS = gsm ilbc
-
EXTRA_DIST = README_G711
-diff -ur /tmp/twinkle-0.8/src/audio/audio_decoder.h twinkle-0.8.dfsg/src/audio/audio_decoder.h
---- /tmp/twinkle-0.8/src/audio/audio_decoder.h 2006-05-13 09:24:32.000000000 +0100
-+++ twinkle-0.8.dfsg/src/audio/audio_decoder.h 2006-07-06 22:58:32.000000000 +0100
+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"
@@ -63,9 +82,9 @@
#ifdef HAVE_SPEEX
#include <speex/speex.h>
-diff -ur /tmp/twinkle-0.8/src/audio/audio_encoder.h twinkle-0.8.dfsg/src/audio/audio_encoder.h
---- /tmp/twinkle-0.8/src/audio/audio_encoder.h 2006-05-13 09:25:02.000000000 +0100
-+++ twinkle-0.8.dfsg/src/audio/audio_encoder.h 2006-07-06 22:58:32.000000000 +0100
+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"
@@ -75,9 +94,9 @@
#ifdef HAVE_SPEEX
#include <speex/speex.h>
-diff -ur /tmp/twinkle-0.8/src/audio/audio_rx.h twinkle-0.8.dfsg/src/audio/audio_rx.h
---- /tmp/twinkle-0.8/src/audio/audio_rx.h 2006-05-13 08:50:14.000000000 +0100
-+++ twinkle-0.8.dfsg/src/audio/audio_rx.h 2006-07-06 22:58:32.000000000 +0100
+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>
@@ -86,10 +105,9 @@
#include "audio_codecs.h"
#include "audio_device.h"
#include "audio_encoder.h"
-Only in /tmp/twinkle-0.8/src/audio: ilbc
-diff -ur /tmp/twinkle-0.8/src/gui/twinkle.pro twinkle-0.8.dfsg/src/gui/twinkle.pro
---- /tmp/twinkle-0.8/src/gui/twinkle.pro 2006-07-01 08:19:17.000000000 +0100
-+++ twinkle-0.8.dfsg/src/gui/twinkle.pro 2006-07-06 22:58:32.000000000 +0100
+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
More information about the Pkg-voip-commits
mailing list