[Pkg-voip-commits] [twinkle] 41/73: Imported Debian patch 1:1.4.2-2~bpo50+1
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
pc-guest pushed a commit to branch master
in repository twinkle.
commit 55d2142fc86110b23c45d8885d3fc55b8fd76951
Author: Matt Taggart <taggart at debian.org>
Date: Wed Jun 17 16:11:56 2009 -0700
Imported Debian patch 1:1.4.2-2~bpo50+1
---
debian/changelog | 21 ++++++++++
debian/compat | 2 +-
debian/control | 17 +++-----
debian/patches/ccrtp1-1.7-0.patch | 88 ---------------------------------------
debian/rules | 3 +-
5 files changed, 29 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c0795a..1ae59ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+twinkle (1:1.4.2-2~bpo50+1) lenny-backports; urgency=low
+
+ * Rebuild for lenny-backports.
+ * Needed backported libzrtpcpp
+
+ -- Matt Taggart <taggart at debian.org> Wed, 17 Jun 2009 16:11:56 -0700
+
+twinkle (1:1.4.2-2) unstable; urgency=low
+
+ * Drop depreciated KDE3 support: configure --without-kde
+ - Assist with Debian KDE4 transition
+ - Fix "Add a light version compiled without kde" (Closes: #367258)
+ * Fix "FTBFS: seems to fail when building with libzrtpcpp-dev 1.3.0-1"
+ Updated Build-Depends: (Closes: #519347)
+ * DEB_AUTO_UPDATE_AUTOCONF regenerate configure (pickup boost_regex-mt.patch)
+ * Relax Build-Depends: ccrtp >= 1.7.0
+ * debian/compat -> 7
+ * Update Standards 3.8.1 - no changes
+
+ -- Mark Purcell <msp at debian.org> Sat, 16 May 2009 11:33:53 +1000
+
twinkle (1:1.4.2-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 002a43e..d3ac129 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: comm
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>, Mikael Magnusson <mikma at users.sourceforge.net>
-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.7.0), libzrtpcpp-dev (>= 1.3.0),
+Build-Depends: debhelper (>= 7), cdbs, help2man,
+ autotools-dev, autoconf,
+ libqt3-mt-dev (>= 3:3.3.0), qt3-apps-dev,
+ libcommoncpp2-dev (>= 1.4.2), libccrtp-dev, libzrtpcpp-dev (>= 1.4.0),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libgsm1-dev, libsndfile1-dev, libspeex-dev, libspeexdsp-dev,
libreadline-dev,
libboost-regex-dev, libxml2-dev, libxpm-dev, libmagic-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.twinklephone.com/
Vcs-Svn: svn://svn.debian.org/pkg-voip/twinkle/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/twinkle/?op=log
@@ -19,7 +19,6 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/twinkle/?op=log
Package: twinkle
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: kaddressbook
Description: Voice over Internet Protocol (VoIP) SIP Phone
Soft-phone for making telephone calls using SIP over an IP network.
.
@@ -96,9 +95,3 @@ Description: Voice over Internet Protocol (VoIP) SIP Phone
Noise reduction (new)
Voice activity detection (VAD) (new)
Acoustic echo control (AEC) [experimental] (new)
- .
- KDE3 goodies
- Balloon pop-up from system tray when a call comes in
- Interface to KAddressBook: dial phone numbers from your address book
- Display names from KAddressBook on incoming calls
- Display photos from KAddressBook on incoming calls
diff --git a/debian/patches/ccrtp1-1.7-0.patch b/debian/patches/ccrtp1-1.7-0.patch
deleted file mode 100644
index 787f2b5..0000000
--- a/debian/patches/ccrtp1-1.7-0.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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
diff --git a/debian/rules b/debian/rules
index 59a46c3..c75980f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@ include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc
+DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc --without-kde
+DEB_AUTO_UPDATE_AUTOCONF := yes
get-orig-source:
@@dh_testdir
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git
More information about the Pkg-voip-commits
mailing list