r6472 - in /vdr/vdr-plugin-fritzbox/trunk/debian: changelog control patches/ patches/00list patches/01_fd-fix.dpatch rules

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Mar 23 11:33:52 2008
New Revision: 6472

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6472
Log:
* Added 01_fd-fix.dpatch

Added:
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_fd-fix.dpatch
Modified:
    vdr/vdr-plugin-fritzbox/trunk/debian/changelog
    vdr/vdr-plugin-fritzbox/trunk/debian/control
    vdr/vdr-plugin-fritzbox/trunk/debian/rules

Modified: vdr/vdr-plugin-fritzbox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/changelog?rev=6472&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/changelog Sun Mar 23 11:33:52 2008
@@ -1,3 +1,9 @@
+vdr-plugin-fritzbox (0.0.12-2) experimental; urgency=low
+
+  * Added 01_fd-fix.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun, 23 Mar 2008 12:31:37 +0100
+
 vdr-plugin-fritzbox (0.0.12-1) experimental; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-fritzbox/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/control?rev=6472&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/control (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/control Sun Mar 23 11:33:52 2008
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.5.17), gettext
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.5.17), gettext
 Standards-Version: 3.7.3
 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/

Added: vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list?rev=6472&op=file
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list Sun Mar 23 11:33:52 2008
@@ -1,0 +1,1 @@
+01_fd-fix

Added: vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_fd-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_fd-fix.dpatch?rev=6472&op=file
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_fd-fix.dpatch (added)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_fd-fix.dpatch Sun Mar 23 11:33:52 2008
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fd-fix.dpatch by Joachim Wilke <vdr at joachim-wilke.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Small Fix for problems when fritzbox is not reachable
+
+ at DPATCH@
+diff -rup fritzbox-0.0.12/tcpclient.c fritzbox/tcpclient.c
+--- fritzbox-0.0.12/tcpclient.c	2008-02-24 18:58:55.000000000 +0100
++++ fritzbox/tcpclient.c	2008-03-23 10:57:02.000000000 +0100
+@@ -40,11 +40,14 @@ cTcpClient::cTcpClient(std::string &host
+ 	connected = false;
+ 	this->hostname = hostname;
+ 	this->port = port;
++	fd = -1;
+ }
+ 
+ cTcpClient::~cTcpClient() {
+-	shutdown(fd, SHUT_RDWR);
+-	close(fd);
++        if (fd >= 0) {
++	        shutdown(fd, SHUT_RDWR);
++	        close(fd);
++	}
+ }
+ 
+ void cTcpClient::Connect() {

Modified: vdr/vdr-plugin-fritzbox/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/rules?rev=6472&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/rules (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/rules Sun Mar 23 11:33:52 2008
@@ -1,7 +1,7 @@
 #! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 
 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