[Pkg-voip-commits] r5812 - in /twinkle/trunk/debian: changelog menu patches/gcc4.3.patch rules
msp at alioth.debian.org
msp at alioth.debian.org
Sat May 31 01:48:10 UTC 2008
Author: msp
Date: Sat May 31 01:48:10 2008
New Revision: 5812
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5812
Log:
* 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)
Added:
twinkle/trunk/debian/patches/gcc4.3.patch
Modified:
twinkle/trunk/debian/changelog
twinkle/trunk/debian/menu
twinkle/trunk/debian/rules
Modified: twinkle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/changelog?rev=5812&op=diff
==============================================================================
--- twinkle/trunk/debian/changelog (original)
+++ twinkle/trunk/debian/changelog Sat May 31 01:48:10 2008
@@ -1,3 +1,13 @@
+twinkle (1:1.2-2) UNRELEASED; 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)
+
+ -- Mark Purcell <msp at debian.org> Sat, 31 May 2008 11:31:51 +1000
+
twinkle (1:1.2-1) unstable; urgency=low
[ Kilian Krause ]
Modified: twinkle/trunk/debian/menu
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/menu?rev=5812&op=diff
==============================================================================
--- twinkle/trunk/debian/menu (original)
+++ twinkle/trunk/debian/menu Sat May 31 01:48:10 2008
@@ -1,4 +1,4 @@
-?package(twinkle):needs="X11" section="Applications/Net"\
+?package(twinkle):needs="X11" section="Applications/Network/Communications"\
title="twinkle" command="/usr/bin/twinkle" \
icon16x16="/usr/share/twinkle/twinkle16.png" \
icon32x32="/usr/share/twinkle/twinkle32.png" \
Added: twinkle/trunk/debian/patches/gcc4.3.patch
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/patches/gcc4.3.patch?rev=5812&op=file
==============================================================================
--- twinkle/trunk/debian/patches/gcc4.3.patch (added)
+++ twinkle/trunk/debian/patches/gcc4.3.patch Sat May 31 01:48:10 2008
@@ -1,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:
Modified: twinkle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/rules?rev=5812&op=diff
==============================================================================
--- twinkle/trunk/debian/rules (original)
+++ twinkle/trunk/debian/rules Sat May 31 01:48:10 2008
@@ -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 @@
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
More information about the Pkg-voip-commits
mailing list