r5786 - in /vdr/vdr-plugin-fritzbox/trunk/debian: changelog control patches/ patches/00list patches/90_fritzbox-0.0.9-compile-fix.dpatch rules

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

Author: tom-guest
Date: Sun Nov 18 21:05:39 2007
New Revision: 5786

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5786
Log:
New upstream release 0.0.9

Added:
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/90_fritzbox-0.0.9-compile-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=5786&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/changelog Sun Nov 18 21:05:39 2007
@@ -1,3 +1,11 @@
+vdr-plugin-fritzbox (0.0.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Added 90_fritzbox-0.0.9-compile-fix.dpatch
+  * Added dpatch to Build-Depends
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 18 Nov 2007 22:04:04 +0100
+
 vdr-plugin-fritzbox (0.0.8-1) unstable; 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=5786&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/control (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/control Sun Nov 18 21:05:39 2007
@@ -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), vdr-dev (>= 1.4.6-2ctvdr1), gettext
+Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.6-2ctvdr1), gettext, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/
 XS-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=5786&op=file
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list Sun Nov 18 21:05:39 2007
@@ -1,0 +1,1 @@
+90_fritzbox-0.0.9-compile-fix

Added: vdr/vdr-plugin-fritzbox/trunk/debian/patches/90_fritzbox-0.0.9-compile-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/patches/90_fritzbox-0.0.9-compile-fix.dpatch?rev=5786&op=file
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/patches/90_fritzbox-0.0.9-compile-fix.dpatch (added)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/patches/90_fritzbox-0.0.9-compile-fix.dpatch Sun Nov 18 21:05:39 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_fritzbox-0.0.9-compile-fix.dpatch by rnissl at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=669321#post669321
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation.
+
+ at DPATCH@
+--- fritzbox-0.0.9/fritzfonbuch.c
++++ fritzbox-0.0.9/fritzfonbuch.c
+@@ -21,7 +21,9 @@
+
+ #include <algorithm>
+ #include <sstream>
++#define swap vdr_swap
+ #include <vdr/tools.h>
++#undef swap
+ #include <vdr/config.h>
+ #include "fritzfonbuch.h"
+ #include "fritztools.h"

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=5786&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/rules (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/rules Sun Nov 18 21:05:39 2007
@@ -13,7 +13,7 @@
 endif
 
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+DPATCH=yes
 
 ifdef DPATCH
 include /usr/share/dpatch/dpatch.make