[Pkg-voip-commits] [twinkle] 35/73: Imported Debian patch 1:1.2-2
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:50 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 104acaadc294971fd9bce30f7ad8f89fd91bb1db
Author: Mark Purcell <msp at debian.org>
Date: Sat May 31 12:38:57 2008 +1000
Imported Debian patch 1:1.2-2
---
debian/changelog | 11 +++++++
debian/menu | 2 +-
debian/patches/gcc4.3.patch | 72 +++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 19 +++---------
debian/twinkle.1 | 25 ++++++++--------
5 files changed, 100 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6488f34..bf951b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+twinkle (1:1.2-2) unstable; urgency=low
+
+ * Provide gcc4.3.patch to fix build issues
+ - FTBFS: twinkle_zrtp_ui.h:47: error: 'MessageSeverity' has not been
+ declared (Closes: #479874)
+ * Fixup menu entry. Thks Rodrigo Campos
+ - switch to new debian menu policy (Closes: #475424)
+ * Update debian/twinkle.1 manpage for 1.2 version
+
+ -- Mark Purcell <msp at debian.org> Sat, 31 May 2008 12:38:57 +1000
+
twinkle (1:1.2-1) unstable; urgency=low
[ Kilian Krause ]
diff --git a/debian/menu b/debian/menu
index aba2a0a..1635c4a 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,4 +1,4 @@
-?package(twinkle):needs="X11" section="Applications/Net"\
+?package(twinkle):needs="X11" section="Applications/Network/Communication"\
title="twinkle" command="/usr/bin/twinkle" \
icon16x16="/usr/share/twinkle/twinkle16.png" \
icon32x32="/usr/share/twinkle/twinkle32.png" \
diff --git a/debian/patches/gcc4.3.patch b/debian/patches/gcc4.3.patch
new file mode 100644
index 0000000..4d4a995
--- /dev/null
+++ b/debian/patches/gcc4.3.patch
@@ -0,0 +1,72 @@
+diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp
+--- twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp 2008-02-27 08:10:50.000000000 +1100
++++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.cpp 2008-05-31 11:30:59.000000000 +1000
+@@ -32,7 +32,7 @@
+ extern t_phone *phone;
+
+ TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) :
+- ZrtpUserCallback(queue), audioSession(session)
++ ZrtpUserCallback(), audioSession(session)
+ {}
+
+ void TwinkleZrtpUI::secureOn(std::string cipher) {
+@@ -96,7 +96,7 @@
+ ui->cb_async_zrtp_confirm_go_clear(lineno);
+ }
+
+-void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) {
++void TwinkleZrtpUI::showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message) {
+ t_line *line = audioSession->get_line();
+ int lineno = line->get_line_number();
+
+@@ -106,11 +106,11 @@
+ msg += message;
+
+ switch (sev) {
+- case Info:
++ case GnuZrtpCodes::Info:
+ log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
+ LOG_INFO);
+ break;
+- case Warning:
++ case GnuZrtpCodes::Warning:
+ log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
+ LOG_WARNING);
+ break;
+@@ -120,7 +120,7 @@
+ }
+ }
+
+-void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) {
++void TwinkleZrtpUI::zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg) {
+ t_line *line = audioSession->get_line();
+ int lineno = line->get_line_number();
+
+@@ -130,11 +130,11 @@
+ m += msg;
+
+ switch (severity) {
+- case Info:
++ case GnuZrtpCodes::Info:
+ log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
+ LOG_INFO);
+ break;
+- case Warning:
++ case GnuZrtpCodes::Warning:
+ log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
+ LOG_WARNING);
+ break;
+diff -Nur -x '*.orig' -x '*~' twinkle-1.2/src/audio/twinkle_zrtp_ui.h twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h
+--- twinkle-1.2/src/audio/twinkle_zrtp_ui.h 2008-02-27 08:10:48.000000000 +1100
++++ twinkle-1.2.new/src/audio/twinkle_zrtp_ui.h 2008-05-31 11:30:20.000000000 +1000
+@@ -44,8 +44,8 @@
+ virtual void secureOff();
+ virtual void showSAS(std::string sas);
+ virtual void confirmGoClear();
+- virtual void showMessage(MessageSeverity sev, std::string message);
+- virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg);
++ virtual void showMessage(GnuZrtpCodes::MessageSeverity sev, std::string message);
++ virtual void zrtpNegotiationFailed(GnuZrtpCodes::MessageSeverity severity, std::string msg);
+ virtual void zrtpNotSuppOther();
+
+ private:
diff --git a/debian/rules b/debian/rules
index 0180cb4..1b9b102 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,13 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
-# This file is public domain.
-
-# Add here any variable or target overrides you need
export QTDIR=/usr/share/qt3
URL = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
-
FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
--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
+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
@@ -22,17 +17,11 @@ install/twinkle::
cp twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
-print-version:
- @@echo DEB_VERSION: $(DEB_VERSION)
- @@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
- @@echo FILENAME: $(FILENAME)
- @@echo URL: $(URL)
-
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading $(FILENAME) from $(URL) ...
- @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+ @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
help2man:
help2man twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1
diff --git a/debian/twinkle.1 b/debian/twinkle.1
index f03ff55..0c9f8b2 100644
--- a/debian/twinkle.1
+++ b/debian/twinkle.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH TWINKLE "1" "January 2007" "Twinkle 1.0 - 22 January 2007" "User Commands"
+.TH TWINKLE "1" "May 2008" "Twinkle 1.2 - 09 March 2008" "User Commands"
.SH NAME
Twinkle \- Voice over Internet Protocol (VoIP) SIP Phone
.SH SYNOPSIS
@@ -22,24 +22,16 @@ You may specify multiple profiles separated by spaces.
\fB\-\-force\fR
If a lock file is detected at startup, then override it
and startup.
-.TP
-\fB\-i\fR <IP addr>
-If you have multiple IP addresses on your computer,
-then you can supply the IP address to use here.
.HP
\fB\-\-sip\-port\fR <port>
.IP
-Port for SIP UDP signalling.
+Port for SIP signalling.
This port overrides the port from the system settings.
.HP
\fB\-\-rtp\-port\fR <port>
.IP
Port for RTP.
This port overrides the port from the system settings.
-.TP
-\fB\-\-nic\fR <NIC>
-If you have multiple NICs on your computer,
-then you can supply the NIC name to use here (e.g. eth0).
.HP
\fB\-\-call\fR <address>
.IP
@@ -67,9 +59,8 @@ Examples:
twinkle \fB\-\-cmd\fR answer
twinkle \fB\-\-cmd\fR mute
twinkle \fB\-\-cmd\fR 'transfer 12345'
-.HP
+.TP
\fB\-\-immediate\fR
-.IP
This option can be used in conjunction with \fB\-\-call\fR or \fB\-\-cmd\fR
It indicates the the command or call is to be performed
immediately without asking the user for any confirmation.
@@ -80,6 +71,14 @@ Make <profile> the active profile.
When using this option in conjuction with \fB\-\-call\fR and \fB\-\-cmd\fR,
then the profile is activated before executing \fB\-\-call\fR or
\fB\-\-cmd\fR.
+.TP
+\fB\-\-show\fR
+Instruct a running instance of Twinkle to show the main window
+and take focus.
+.TP
+\fB\-\-hide\fR
+Instruct a running instance of Twinkle to hide in the sytem tray.
+If no system tray is used, then Twinkle will minimize.
.HP
\fB\-\-help\-cli\fR [cli command]
.IP
@@ -90,7 +89,7 @@ the CLI command.
\fB\-\-version\fR
Get version information.
.SH COPYRIGHT
-Copyright \(co 2005-2007 Michel de Boer
+Copyright \(co 2005-2008 Michel de Boer
http://www.twinklephone.com
.PP
Built with support for: ALSA, KDE, Speex, ZRTP
--
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