r8511 - in /vdr/vdr-plugin-fritzbox/trunk/debian: changelog control patches/ patches/00list patches/01_gnutls.dpatch rules

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

Author: tiber-guest
Date: Sun Apr  4 11:21:26 2010
New Revision: 8511

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8511
Log:
* Build-depend on vdr-dev >= 1.6.0-16
* Replaced openssl by gnutls to avoid GPL licence conflict

Added:
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list
    vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_gnutls.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=8511&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/changelog Sun Apr  4 11:21:26 2010
@@ -1,3 +1,10 @@
+vdr-plugin-fritzbox (1.3.2-2) unstable; urgency=low
+
+  * Build-depend on vdr-dev >= 1.6.0-16
+  * Replaced openssl by gnutls to avoid GPL licence conflict
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 28 Mar 2010 15:04:46 +0200
+
 vdr-plugin-fritzbox (1.3.2-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=8511&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/control (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/control Sun Apr  4 11:21:26 2010
@@ -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 <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext, libssl-dev
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-16), gettext, libgnutls-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/

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=8511&op=file
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/patches/00list Sun Apr  4 11:21:26 2010
@@ -1,0 +1,1 @@
+01_gnutls

Added: vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_gnutls.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_gnutls.dpatch?rev=8511&op=file
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_gnutls.dpatch (added)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/patches/01_gnutls.dpatch Sun Apr  4 11:21:26 2010
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gnutls.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Replace openssl by gnutls
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-plugin-fritzbox-1.3.2~/Makefile vdr-plugin-fritzbox-1.3.2/Makefile
+--- vdr-plugin-fritzbox-1.3.2~/Makefile	2009-08-23 15:07:13.000000000 +0200
++++ vdr-plugin-fritzbox-1.3.2/Makefile	2010-03-28 18:45:23.000000000 +0200
+@@ -51,7 +51,7 @@
+ ### libfritz++
+ LIBFRITZ = libfritz++
+ INCLUDES += -I$(LIBFRITZ)
+-LIBS += $(LIBFRITZ)/$(LIBFRITZ).a -lssl
++LIBS += $(LIBFRITZ)/$(LIBFRITZ).a -lgnutls
+ 
+ ### libpthread++
+ LIBPTHREAD = libpthread++
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-plugin-fritzbox-1.3.2~/libfritz++/FritzClient.cpp vdr-plugin-fritzbox-1.3.2/libfritz++/FritzClient.cpp
+--- vdr-plugin-fritzbox-1.3.2~/libfritz++/FritzClient.cpp	2009-11-29 12:31:19.000000000 +0100
++++ vdr-plugin-fritzbox-1.3.2/libfritz++/FritzClient.cpp	2010-03-28 18:45:23.000000000 +0200
+@@ -19,7 +19,7 @@
+  *
+  */
+ 
+-#include <openssl/md5.h>
++#include <gnutls/openssl.h>
+ #include <iomanip>
+ #include <cstring>
+ 

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=8511&op=diff
==============================================================================
--- vdr/vdr-plugin-fritzbox/trunk/debian/rules (original)
+++ vdr/vdr-plugin-fritzbox/trunk/debian/rules Sun Apr  4 11:21:26 2010
@@ -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