[Pkg-voip-commits] r6665 - in /twinkle/trunk/debian: changelog control patches/ccrtp1-1.7-0.patch twinkle.1
msp at alioth.debian.org
msp at alioth.debian.org
Wed Jan 14 03:09:05 UTC 2009
Author: msp
Date: Wed Jan 14 03:09:05 2009
New Revision: 6665
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6665
Log:
Add Build-Depends: ccrtp >= 1.7.0
Added:
twinkle/trunk/debian/patches/ccrtp1-1.7-0.patch
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/control
twinkle/trunk/debian/twinkle.1
Modified: twinkle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/changelog?rev=6665&op=diff
==============================================================================
--- twinkle/trunk/debian/changelog (original)
+++ twinkle/trunk/debian/changelog Wed Jan 14 03:09:05 2009
@@ -1,14 +1,9 @@
twinkle (1:1.4~beta-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream release
-
- -- Mark Purcell <msp at debian.org> Wed, 14 Jan 2009 11:02:51 +1100
-
-twinkle (1:1.3.2-2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org> Fri, 17 Oct 2008 12:27:23 +1100
+ * Add Build-Depends: ccrtp >= 1.7.0
+
+ -- Mark Purcell <msp at debian.org> Wed, 14 Jan 2009 13:59:06 +1100
twinkle (1:1.3.2-1) experimental; urgency=low
Modified: twinkle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/control?rev=6665&op=diff
==============================================================================
--- twinkle/trunk/debian/control (original)
+++ twinkle/trunk/debian/control Wed Jan 14 03:09:05 2009
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 4.0.0), cdbs, help2man,
autotools-dev, automake1.9,
kdelibs4-dev, libqt3-mt-dev (>= 3:3.3.0), qt3-apps-dev,
- libcommoncpp2-dev (>= 1.4.2), libccrtp-dev (>= 1.5.0), libzrtpcpp-dev,
+ libcommoncpp2-dev (>= 1.4.2), libccrtp-dev (>= 1.7.0), libzrtpcpp-dev (>= 1.3.0),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libgsm1-dev, libsndfile1-dev, libspeex-dev,
libboost-regex-dev, libxml2-dev, libxpm-dev, libmagic-dev
Added: twinkle/trunk/debian/patches/ccrtp1-1.7-0.patch
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/patches/ccrtp1-1.7-0.patch?rev=6665&op=file
==============================================================================
--- twinkle/trunk/debian/patches/ccrtp1-1.7-0.patch (added)
+++ twinkle/trunk/debian/patches/ccrtp1-1.7-0.patch Wed Jan 14 03:09:05 2009
@@ -1,0 +1,88 @@
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4~beta/configure twinkle-1.4~beta.new/configure
+--- twinkle-1.4~beta/configure 2009-01-05 05:49:11.000000000 +1100
++++ twinkle-1.4~beta.new/configure 2009-01-14 13:55:12.000000000 +1100
+@@ -6772,23 +6772,23 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- { echo "$as_me:$LINENO: checking for libccrtp1 >= 1.6.0" >&5
+-echo $ECHO_N "checking for libccrtp1 >= 1.6.0... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for libccrtp1 >= 1.7.0" >&5
++echo $ECHO_N "checking for libccrtp1 >= 1.7.0... $ECHO_C" >&6; }
+
+- if $PKG_CONFIG --exists "libccrtp1 >= 1.6.0" ; then
++ if $PKG_CONFIG --exists "libccrtp1 >= 1.7.0" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ succeeded=yes
+
+ { echo "$as_me:$LINENO: checking CCRTP_CFLAGS" >&5
+ echo $ECHO_N "checking CCRTP_CFLAGS... $ECHO_C" >&6; }
+- CCRTP_CFLAGS=`$PKG_CONFIG --cflags "libccrtp1 >= 1.6.0"`
++ CCRTP_CFLAGS=`$PKG_CONFIG --cflags "libccrtp1 >= 1.7.0"`
+ { echo "$as_me:$LINENO: result: $CCRTP_CFLAGS" >&5
+ echo "${ECHO_T}$CCRTP_CFLAGS" >&6; }
+
+ { echo "$as_me:$LINENO: checking CCRTP_LIBS" >&5
+ echo $ECHO_N "checking CCRTP_LIBS... $ECHO_C" >&6; }
+- CCRTP_LIBS=`$PKG_CONFIG --libs "libccrtp1 >= 1.6.0"`
++ CCRTP_LIBS=`$PKG_CONFIG --libs "libccrtp1 >= 1.7.0"`
+ { echo "$as_me:$LINENO: result: $CCRTP_LIBS" >&5
+ echo "${ECHO_T}$CCRTP_LIBS" >&6; }
+ else
+@@ -6796,7 +6796,7 @@
+ CCRTP_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+- CCRTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libccrtp1 >= 1.6.0"`
++ CCRTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libccrtp1 >= 1.7.0"`
+ echo $CCRTP_PKG_ERRORS
+ fi
+
+@@ -6811,8 +6811,8 @@
+ if test $succeeded = yes; then
+ :
+ else
+- { { echo "$as_me:$LINENO: error: Library requirements (libccrtp1 >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-echo "$as_me: error: Library requirements (libccrtp1 >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++ { { echo "$as_me:$LINENO: error: Library requirements (libccrtp1 >= 1.7.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++echo "$as_me: error: Library requirements (libccrtp1 >= 1.7.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4~beta/configure.in twinkle-1.4~beta.new/configure.in
+--- twinkle-1.4~beta/configure.in 2009-01-14 13:54:02.000000000 +1100
++++ twinkle-1.4~beta.new/configure.in 2009-01-14 13:54:23.000000000 +1100
+@@ -66,7 +66,7 @@
+
+ export PKG_CONFIG_PATH
+
+-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
++PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.7.0)
+
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ # AC_CHECK_HEADER(libxml/tree.h, [],
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4~beta/README twinkle-1.4~beta.new/README
+--- twinkle-1.4~beta/README 2006-10-02 01:27:12.000000000 +1000
++++ twinkle-1.4~beta.new/README 2009-01-14 13:55:30.000000000 +1100
+@@ -15,7 +15,7 @@
+ libccgnu2 (version >= 1.4.2) [GNU Common C++]
+ http://www.gnu.org/software/commoncpp/
+
+-libccrtp1 (version >= 1.5.0) [GNU RTP Stack]
++libccrtp1 (version >= 1.7.0) [GNU RTP Stack]
+ libzrtpcpp (version >= 0.9.0) [Extension library of GNU ccRTP]
+ http://www.gnu.org/software/ccrtp/
+
+diff -Nur -x '*.orig' -x '*~' twinkle-1.4~beta/twinkle.spec.in twinkle-1.4~beta.new/twinkle.spec.in
+--- twinkle-1.4~beta/twinkle.spec.in 2008-08-23 22:16:10.000000000 +1000
++++ twinkle-1.4~beta.new/twinkle.spec.in 2009-01-14 13:56:32.000000000 +1100
+@@ -12,7 +12,7 @@
+ URL: http://www.twinklephone.com
+ Requires: alsa
+ Requires: commoncpp2 >= 1.6.0
+-Requires: ccrtp >= 1.6.0
++Requires: ccrtp >= 1.7.0
+ Requires: libzrtpcpp >= 1.3.0
+ Requires: kdelibs3 >= 3.2.0
+ Requires: libsndfile
Modified: twinkle/trunk/debian/twinkle.1
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/twinkle.1?rev=6665&op=diff
==============================================================================
--- twinkle/trunk/debian/twinkle.1 (original)
+++ twinkle/trunk/debian/twinkle.1 Wed Jan 14 03:09:05 2009
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH TWINKLE "1" "October 2008" "Twinkle 1.3.2 - 24 August 2008" "User Commands"
+.TH TWINKLE "1" "January 2009" "Twinkle 1.4beta - 04 January 2009" "User Commands"
.SH NAME
Twinkle \- Voice over Internet Protocol (VoIP) SIP Phone
.SH SYNOPSIS
@@ -89,14 +89,17 @@
\fB\-\-version\fR
Get version information.
.SH COPYRIGHT
-Copyright \(co 2005-2008 Michel de Boer
+Copyright \(co 2005-2009 Michel de Boer
http://www.twinklephone.com
.PP
Built with support for: ALSA, KDE, Speex, ZRTP
.PP
Contributions:
-* ALSA \- Rickard Petzall
-* ZRTP/SRTP \- Werner Dittmann
+* Werner Dittmann (ZRTP/SRTP)
+* Bogdan Harjoc (AKAv1\-MD5, Service\-Route)
+* Roman Imankulov (command line editing)
+* Ondrej Moris (codec preprocessing)
+* Rickard Petzall (ALSA)
.PP
This software contains the following software from 3rd parties:
* GSM codec from Jutta Degener and Carsten Bormann, University of Berlin
More information about the Pkg-voip-commits
mailing list