diff -Nru vdr-plugin-fritzbox-1.3.1/debian/changelog vdr-plugin-fritzbox-1.3.2/debian/changelog --- vdr-plugin-fritzbox-1.3.1/debian/changelog 2010-04-02 17:12:22.000000000 +0100 +++ vdr-plugin-fritzbox-1.3.2/debian/changelog 2010-04-02 17:12:22.000000000 +0100 @@ -1,26 +1,17 @@ -vdr-plugin-fritzbox (1.3.1-6yavdr1) lucid; urgency=low +vdr-plugin-fritzbox (1.3.2-2yavdr1) karmic; urgency=low - * reb. vdr-1.7.14 - - -- Holger Schvestka Mon, 15 Mar 2010 22:24:54 +0100 - -vdr-plugin-fritzbox (1.3.1-5yavdr1) karmic; urgency=low - - * reb. vdr-1.7.12 - - -- Holger Schvestka Sun, 21 Feb 2010 19:56:39 +0100 - -vdr-plugin-fritzbox (1.3.1-4tvt1) karmic; urgency=low - - * updated ABI version + * New upstream release - -- Gerald Dachs Fri, 25 Dec 2009 21:02:48 +0100 + -- Holger Schvestka Fri, 02 Apr 2010 18:00:29 +0200 -vdr-plugin-fritzbox (1.3.1-3tvt2) karmic; urgency=low +vdr-plugin-fritzbox (1.3.2-1) unstable; urgency=low - * rebuild for vdrteam-ppa + * New upstream release + * Removed 01_fix-FritzClient.cpp.dpatch + * Removed dpatch from Build-Depends + * Standards-Version: 3.8.4 - -- Holger Schvestka Fri, 27 Nov 2009 15:03:53 +0100 + -- Thomas Günther Thu, 18 Mar 2010 02:33:50 +0100 vdr-plugin-fritzbox (1.3.1-1) unstable; urgency=low diff -Nru vdr-plugin-fritzbox-1.3.1/debian/control vdr-plugin-fritzbox-1.3.2/debian/control --- vdr-plugin-fritzbox-1.3.1/debian/control 2010-04-02 17:12:22.000000000 +0100 +++ vdr-plugin-fritzbox-1.3.2/debian/control 2010-04-02 17:12:22.000000000 +0100 @@ -3,8 +3,8 @@ Priority: extra Maintainer: Debian VDR Team Uploaders: Thomas Schmidt , Tobias Grimm , Thomas Günther -Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext, libssl-dev, dpatch -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext, libssl-dev +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/ Homepage: http://www.joachim-wilke.de/vdr-fritz.htm diff -Nru vdr-plugin-fritzbox-1.3.1/debian/copyright vdr-plugin-fritzbox-1.3.2/debian/copyright --- vdr-plugin-fritzbox-1.3.1/debian/copyright 2010-04-02 17:12:22.000000000 +0100 +++ vdr-plugin-fritzbox-1.3.2/debian/copyright 2010-04-02 17:12:22.000000000 +0100 @@ -11,10 +11,10 @@ Thomas Schmidt Copyright: - (C) 2007 - 2009 Joachim Wilke, Matthias Becker + (C) 2007 - 2010 Joachim Wilke, Matthias Becker Copyright (Debian packaging): - (C) 2007 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt + (C) 2007 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt License: This program is free software; you can redistribute it and/or modify diff -Nru vdr-plugin-fritzbox-1.3.1/debian/patches/00list vdr-plugin-fritzbox-1.3.2/debian/patches/00list --- vdr-plugin-fritzbox-1.3.1/debian/patches/00list 2010-04-02 17:12:22.000000000 +0100 +++ vdr-plugin-fritzbox-1.3.2/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -01_fix-FritzClient.cpp diff -Nru vdr-plugin-fritzbox-1.3.1/debian/patches/01_fix-FritzClient.cpp.dpatch vdr-plugin-fritzbox-1.3.2/debian/patches/01_fix-FritzClient.cpp.dpatch --- vdr-plugin-fritzbox-1.3.1/debian/patches/01_fix-FritzClient.cpp.dpatch 2010-04-02 17:12:22.000000000 +0100 +++ vdr-plugin-fritzbox-1.3.2/debian/patches/01_fix-FritzClient.cpp.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_fix-FritzClient.cpp.dpatch by Holger Schvestka -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Aadded missing #include in FritzClient.cpp. - -@DPATCH@ ---- fritzbox-1.3.1/libfritz++/FritzClient.cpp -+++ fritzbox-1.3.1/libfritz++/FritzClient.cpp -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - #include "Config.h" - #include "FritzClient.h" diff -Nru vdr-plugin-fritzbox-1.3.1/debian/rules vdr-plugin-fritzbox-1.3.2/debian/rules --- vdr-plugin-fritzbox-1.3.1/debian/rules 2010-04-02 17:12:22.000000000 +0100 +++ vdr-plugin-fritzbox-1.3.2/debian/rules 2010-04-02 17:12:22.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk +#include /usr/share/cdbs/1/rules/dpatch.mk DEB_INSTALL_CHANGELOGS_ALL = HISTORY diff -Nru vdr-plugin-fritzbox-1.3.1/fritzbox.c vdr-plugin-fritzbox-1.3.2/fritzbox.c --- vdr-plugin-fritzbox-1.3.1/fritzbox.c 2009-11-21 13:51:50.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/fritzbox.c 2009-11-29 11:34:37.000000000 +0000 @@ -29,7 +29,7 @@ #include "notifyosd.h" #include "menu.h" -static const char *VERSION = "1.3.1"; +static const char *VERSION = "1.3.2"; static const char *DESCRIPTION = trNOOP("Fritz Plugin for AVM Fritz!Box"); static const char *MAINMENUENTRY = trNOOP("Fritz!Box"); diff -Nru vdr-plugin-fritzbox-1.3.1/HISTORY vdr-plugin-fritzbox-1.3.2/HISTORY --- vdr-plugin-fritzbox-1.3.1/HISTORY 2009-11-21 13:51:56.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/HISTORY 2010-01-02 17:34:16.000000000 +0000 @@ -453,6 +453,16 @@ OK button, too (patch provided by Uwe [33]) +2010-01-02: Version 1.3.2 +- changes in libfritz++ + * added missing include in FritzClient.cpp + (patch provided by hotzenplotz5 [35]) + * fixed retry delay calculation in case of connection refused + * simplified implementation of connection disconnect + this possibly fixes a crash when changing the plugins setup with FB call monitor disabled + (reported by Frank [36]) +- updated italian translations (provided by Diego [24]) + --- References --- @@ -493,10 +503,12 @@ [28] http://vdr-portal.de/board/profile.php?userid=1450 [29] Thorsten Pohl http://vdr-portal.de/board/profile.php?userid=8029 -[30] http://www.vdr-portal.de/board/profile.php?userid=6793 +[30] http://vdr-portal.de/board/profile.php?userid=6793 [31] http://vdr-portal.de/board/profile.php?userid=15996 [32] http://vdr-portal.de/board/profile.php?userid=18589 [33] Uwe http://vdr-portal.de/board/profile.php?userid=862 -[34] http://www.vdr-portal.de/board/profile.php?userid=25271 - \ No newline at end of file +[34] http://vdr-portal.de/board/profile.php?userid=25271 +[35] http://vdr-portal.de/board/profile.php?userid=2951 +[36] Frank (hummingbird_de) + http://vdr-portal.de/board/profile.php?userid=715 \ No newline at end of file diff -Nru vdr-plugin-fritzbox-1.3.1/libfritz++/FritzClient.cpp vdr-plugin-fritzbox-1.3.2/libfritz++/FritzClient.cpp --- vdr-plugin-fritzbox-1.3.1/libfritz++/FritzClient.cpp 2009-11-16 20:06:57.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/libfritz++/FritzClient.cpp 2009-11-29 11:31:19.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include #include "Config.h" #include "FritzClient.h" diff -Nru vdr-plugin-fritzbox-1.3.1/libfritz++/HISTORY vdr-plugin-fritzbox-1.3.2/libfritz++/HISTORY --- vdr-plugin-fritzbox-1.3.1/libfritz++/HISTORY 2009-11-21 13:48:56.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/libfritz++/HISTORY 2009-12-08 19:12:30.000000000 +0000 @@ -100,3 +100,9 @@ 2009-11-21: - Improved matching of phone numbers: Fritz!Box control codes *xxx# are now ignored. + +2009-11-29: +- Added missing include in FritzClient.cpp + +2009-12-08: +- Fixed retry delay calculation in case of connection refused diff -Nru vdr-plugin-fritzbox-1.3.1/libfritz++/Listener.cpp vdr-plugin-fritzbox-1.3.2/libfritz++/Listener.cpp --- vdr-plugin-fritzbox-1.3.1/libfritz++/Listener.cpp 2009-11-16 19:53:16.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/libfritz++/Listener.cpp 2009-12-08 18:53:36.000000000 +0000 @@ -43,7 +43,6 @@ Listener::~Listener() { - tcpclient->Disconnect(); delete tcpclient; this->Cancel(); } @@ -70,9 +69,9 @@ unsigned int retry_delay = RETRY_DELAY / 2; while (true) { try { + retry_delay = retry_delay > 1800 ? 3600 : retry_delay * 2; if (!tcpclient) tcpclient = new tcpclient::TcpClient(gConfig->getUrl(), gConfig->getListenerPort()); - retry_delay = retry_delay > 1800 ? 3600 : retry_delay * 2; while (true) { *dsyslog << __FILE__ << ": Waiting for a message." << std::endl; //data.erase(); diff -Nru vdr-plugin-fritzbox-1.3.1/libtcpclient++/HISTORY vdr-plugin-fritzbox-1.3.2/libtcpclient++/HISTORY --- vdr-plugin-fritzbox-1.3.1/libtcpclient++/HISTORY 2009-11-16 20:07:00.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/libtcpclient++/HISTORY 2009-12-08 19:17:06.000000000 +0000 @@ -16,4 +16,8 @@ - Implemented handling of additional headers 2009-11-16 -- TcpClient now performs Connect() already in the constructor, therefore may throw a TcpExecption \ No newline at end of file +- TcpClient now performs Connect() already in the constructor, therefore may throw a TcpExecption + +2009-12-08 +- Simplified implementation of connection disconnect + diff -Nru vdr-plugin-fritzbox-1.3.1/libtcpclient++/TcpClient++.cpp vdr-plugin-fritzbox-1.3.2/libtcpclient++/TcpClient++.cpp --- vdr-plugin-fritzbox-1.3.1/libtcpclient++/TcpClient++.cpp 2009-11-16 20:06:53.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/libtcpclient++/TcpClient++.cpp 2009-12-08 18:56:32.000000000 +0000 @@ -123,10 +123,7 @@ } TcpClientBuf::~TcpClientBuf() { - if (fd >= 0) { - shutdown(fd, SHUT_RDWR); - close(fd); - } + Disconnect(); } TcpClient::~TcpClient() { @@ -191,7 +188,7 @@ } } - freeaddrinfo(ainfo); + freeaddrinfo(ainfo); //TODO: memleak in case of exception fcntl(fd, F_SETFL, O_NONBLOCK); connected = true; } @@ -205,10 +202,6 @@ } } -void TcpClient::Disconnect() { - ((TcpClientBuf *)rdbuf())->Disconnect(); -} - // ----- Stuff for reading from socket ---------------------------------------- bool TcpClientBuf::Receive() { diff -Nru vdr-plugin-fritzbox-1.3.1/libtcpclient++/TcpClient++.h vdr-plugin-fritzbox-1.3.2/libtcpclient++/TcpClient++.h --- vdr-plugin-fritzbox-1.3.1/libtcpclient++/TcpClient++.h 2009-11-16 20:06:55.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/libtcpclient++/TcpClient++.h 2009-12-08 18:59:25.000000000 +0000 @@ -123,7 +123,6 @@ TcpClient(std::string hostname, int port, TcpClientBuf *buf) : std::iostream(buf) {} virtual ~TcpClient(); - void Disconnect(); std::iostream& operator>> (std::string &s); }; diff -Nru vdr-plugin-fritzbox-1.3.1/po/de_DE.po vdr-plugin-fritzbox-1.3.2/po/de_DE.po --- vdr-plugin-fritzbox-1.3.1/po/de_DE.po 2009-11-16 19:18:57.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/po/de_DE.po 2009-12-01 19:03:25.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-16 20:18+0100\n" +"POT-Creation-Date: 2009-12-01 20:03+0100\n" "PO-Revision-Date: 2007-08-12 21:40+0200\n" "Last-Translator: Matthias Becker \n" "Language-Team: \n" diff -Nru vdr-plugin-fritzbox-1.3.1/po/fr_FR.po vdr-plugin-fritzbox-1.3.2/po/fr_FR.po --- vdr-plugin-fritzbox-1.3.1/po/fr_FR.po 2009-11-16 19:18:57.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/po/fr_FR.po 2009-12-01 19:03:25.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-16 20:18+0100\n" +"POT-Creation-Date: 2009-12-01 20:03+0100\n" "PO-Revision-Date: 2007-08-12 21:40+0200\n" "Last-Translator: Patrice Staudt\n" "Language-Team: \n" diff -Nru vdr-plugin-fritzbox-1.3.1/po/it_IT.po vdr-plugin-fritzbox-1.3.2/po/it_IT.po --- vdr-plugin-fritzbox-1.3.1/po/it_IT.po 2009-11-16 19:18:57.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/po/it_IT.po 2010-01-02 17:27:55.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-16 20:18+0100\n" -"PO-Revision-Date: 2009-05-14 17:49+0100\n" +"PO-Revision-Date: 2009-12-31 17:52+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -33,7 +33,8 @@ msgid "missed calls" msgstr "chiamate perse" -#: fritzbox.c:164 menu.c:130 +#: fritzbox.c:164 +#: menu.c:130 msgid "This phonebook is not yet available." msgstr "Questa rubrica non è ancora disponibile." @@ -62,7 +63,8 @@ msgid "VoIP" msgstr "VoIP" -#: fritzfonbuch.c:155 menu.c:43 +#: fritzfonbuch.c:155 +#: menu.c:43 msgid "Fritz!Box phone book" msgstr "Rubrica Fritz!Box" @@ -84,7 +86,7 @@ #. TRANSLATORS: telephonebook number type: this should be emtpy (one space) #: menu.c:40 msgid " " -msgstr "" +msgstr " " #: menu.c:42 msgid "Local phone book" @@ -98,11 +100,13 @@ msgid "das-oertliche.de" msgstr "das-oertliche.de" -#: menu.c:131 menu.c:230 +#: menu.c:131 +#: menu.c:230 msgid "You may need to wait some minutes," msgstr "Potresti dover aspettare alcuni minuti," -#: menu.c:132 menu.c:231 +#: menu.c:132 +#: menu.c:231 msgid "otherwise there may be a network problem." msgstr "altrimenti ci potrebbe essere un problema di rete." @@ -118,29 +122,35 @@ msgid "Fritz!Box call list" msgstr "Elenco chiamate Fritz!Box" -#: menu.c:169 setup.c:76 setup.c:92 +#: menu.c:169 +#: setup.c:76 +#: setup.c:92 msgid "incoming" msgstr "in arrivo" -#: menu.c:172 setup.c:102 +#: menu.c:172 +#: setup.c:102 msgid "missed" msgstr "perse" -#: menu.c:181 setup.c:81 setup.c:97 +#: menu.c:181 +#: setup.c:81 +#: setup.c:97 msgid "outgoing" msgstr "in uscita" -#: menu.c:201 menu.c:276 +#: menu.c:201 +#: menu.c:276 msgid "unknown" msgstr "sconosciuta" #: menu.c:229 -#, fuzzy msgid "The call list is not yet available." -msgstr "Questa rubrica non è ancora disponibile." +msgstr "Elenco chiamate non ancora disponibile." #. TRANSLATORS: this is the short form of "phone book" -#: menu.c:236 setup.c:87 +#: menu.c:236 +#: setup.c:87 msgid "PB" msgstr "RU" @@ -164,7 +174,8 @@ msgid "call was not accepted" msgstr "chiamata non accettata" -#: menu.c:267 setup.c:126 +#: menu.c:267 +#: setup.c:126 msgid "Extension" msgstr "Estensione MSN" @@ -178,41 +189,45 @@ #. TRANSLATORS: these are labels for color keys in the CallDetails menu #. TRANSLATORS: this is the label for the button to initiate a call -#: menu.c:279 menu.c:378 +#: menu.c:279 +#: menu.c:378 msgid "Button$Call" msgstr "Chiama" #: menu.c:279 -#, fuzzy msgid "Button$To PB" -msgstr "Chiama" +msgstr "A PB" -#: menu.c:301 menu.c:389 +#: menu.c:301 +#: menu.c:389 msgid "No number to call" msgstr "Nessun numero da chiamare" -#: menu.c:305 menu.c:393 +#: menu.c:305 +#: menu.c:393 msgid "Pick up your phone now" msgstr "Prendi ora la telefonata" -#: menu.c:307 menu.c:395 +#: menu.c:307 +#: menu.c:395 msgid "Error while initiating call" msgstr "Errore avvio chiamata" #: menu.c:314 -#, fuzzy msgid "No number to add" -msgstr "Nessun numero da chiamare" +msgstr "Nessun numero da aggiungere" #: menu.c:338 msgid "Phone book details" msgstr "Dettagli rubrica" -#: menu.c:351 menu.c:357 +#: menu.c:351 +#: menu.c:357 msgid "Name" msgstr "Nome" -#: menu.c:352 menu.c:358 +#: menu.c:352 +#: menu.c:358 msgid "Numbers" msgstr "Numeri" @@ -293,9 +308,8 @@ msgstr "Nascondi voce menu principale" #: setup.c:120 -#, fuzzy msgid "Default menu" -msgstr "Predefinito" +msgstr "Menu predefinito" #: setup.c:121 msgid "Setup phonebooks to use..." @@ -335,9 +349,8 @@ #, fuzzy #~ msgid "Fritz!Box Notification" #~ msgstr "Elenco chiamate Fritz!Box" - #~ msgid "Call from unknown extension" #~ msgstr "Chiamata da estensione sconosciuta" - #~ msgid "Please wait..." #~ msgstr "Attendere prego..." + diff -Nru vdr-plugin-fritzbox-1.3.1/po/ru_RU.po vdr-plugin-fritzbox-1.3.2/po/ru_RU.po --- vdr-plugin-fritzbox-1.3.1/po/ru_RU.po 2009-11-16 19:18:57.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/po/ru_RU.po 2009-12-01 19:03:25.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ru_RU-UTF8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-16 20:18+0100\n" +"POT-Creation-Date: 2009-12-01 20:03+0100\n" "PO-Revision-Date: 2008-09-09 01:48+0200\n" "Last-Translator: Alexander Gross\n" "Language-Team: russian\n" diff -Nru vdr-plugin-fritzbox-1.3.1/po/tr_TR.po vdr-plugin-fritzbox-1.3.2/po/tr_TR.po --- vdr-plugin-fritzbox-1.3.1/po/tr_TR.po 2009-11-16 19:18:57.000000000 +0000 +++ vdr-plugin-fritzbox-1.3.2/po/tr_TR.po 2009-12-01 19:03:25.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-16 20:18+0100\n" +"POT-Creation-Date: 2009-12-01 20:03+0100\n" "PO-Revision-Date: 2007-08-12 21:40+0200\n" "Last-Translator: Oktay Yolge�en \n" "Language-Team: \n"