r1952 - in vdr/vdr-plugin-recstatus/trunk: . debian debian/patches
Thomas Günther
tom-guest at costa.debian.org
Wed Feb 8 16:59:34 UTC 2006
Author: tom-guest
Date: 2006-02-08 16:59:34 +0000 (Wed, 08 Feb 2006)
New Revision: 1952
Added:
vdr/vdr-plugin-recstatus/trunk/debian/
vdr/vdr-plugin-recstatus/trunk/debian/changelog
vdr/vdr-plugin-recstatus/trunk/debian/compat
vdr/vdr-plugin-recstatus/trunk/debian/control
vdr/vdr-plugin-recstatus/trunk/debian/copyright
vdr/vdr-plugin-recstatus/trunk/debian/docs
vdr/vdr-plugin-recstatus/trunk/debian/install
vdr/vdr-plugin-recstatus/trunk/debian/patches/
vdr/vdr-plugin-recstatus/trunk/debian/patches/00list
vdr/vdr-plugin-recstatus/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-recstatus/trunk/debian/patches/90_recstatus-0.0.1.beta1-1.3.38.dpatch
vdr/vdr-plugin-recstatus/trunk/debian/patches/91_recstatus-1.3.31.dpatch
vdr/vdr-plugin-recstatus/trunk/debian/rules
Log:
Load newtrunk into vdr/vdr-plugin-recstatus/trunk.
Added: vdr/vdr-plugin-recstatus/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/changelog 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/changelog 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,6 @@
+vdr-plugin-recstatus (0+0.0.1.beta1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Tue, 7 Feb 2006 01:17:55 +0100
+
Added: vdr/vdr-plugin-recstatus/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/compat 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/compat 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-recstatus/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/control 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/control 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,18 @@
+Source: vdr-plugin-recstatus
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.41-1), dpatch
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-recstatus
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Conflicts: ${vdr:Conflicts}
+Description: VDR-Plugin to display the recording status of the available devices
+ This is a simple plugin, that displays the recording status of the
+ available devices. Each device shows its current recordings with
+ their start time and title. Selecting a recording and pressing 'ok'
+ starts it for timeshift viewing.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-recstatus/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/copyright 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/copyright 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,11 @@
+This package was debianized by Thomas Günther <tom at toms-cafe.de> on
+Tue, 7 Feb 2006 01:17:55 +0100.
+
+It was downloaded from http://vdrportal.de/board/thread.php?postid=378942#post378942
+
+Upstream Author: Christian Wieninger <cwieninger-at-gmx-dot-de>
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: vdr/vdr-plugin-recstatus/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/docs 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/docs 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-recstatus/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/install 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/install 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1 @@
+libvdr-recstatus.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-recstatus/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/patches/00list 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/patches/00list 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,4 @@
+01_Makefile-fPIC-fix
+
+90_recstatus-0.0.1.beta1-1.3.38
+91_recstatus-1.3.31
Added: vdr/vdr-plugin-recstatus/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile Sun May 16 15:48:12 2004
++++ vdrdevel-plugin-rotor/Makefile Sat Sep 11 00:28:18 2004
+@@ -18,7 +18,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-recstatus/trunk/debian/patches/90_recstatus-0.0.1.beta1-1.3.38.dpatch
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/patches/90_recstatus-0.0.1.beta1-1.3.38.dpatch 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/patches/90_recstatus-0.0.1.beta1-1.3.38.dpatch 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_recstatus-0.0.1.beta1-1.3.38.dpatch by winni at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=407811#post407811
+##
+## Thomas Günther <tom at toms-cafe.de>:
+## - added compatibility to VDR < 1.3.38
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.38.
+
+ at DPATCH@
+diff -Naur recstatus-0.0.1.beta1/recstatus.c new/recstatus.c
+--- recstatus-0.0.1.beta1/recstatus.c 2005-11-04 18:24:50.000000000 +0100
++++ new/recstatus.c 2006-02-07 01:32:57.000000000 +0100
+@@ -44,7 +44,11 @@
+ class cRecStatusMonitor : public cStatus
+ {
+ protected:
++#if VDRVERSNUM >= 10338
++ virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
++#else
+ virtual void Recording(const cDevice *Device, const char *Name);
++#endif
+ public:
+ cRecStatusMonitor();
+ };
+@@ -244,10 +248,18 @@
+ }
+
+
++#if VDRVERSNUM >= 10338
++void cRecStatusMonitor::Recording(const cDevice *Device, const char* Name, const char *FileName, bool On)
++#else
+ void cRecStatusMonitor::Recording(const cDevice *Device, const char* Name)
++#endif
+ {
+ // insert new timers currently recording in TimersRecording
++#if VDRVERSNUM >= 10338
++ if (On)
++#else
+ if (Name)
++#endif
+ {
+ for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti))
+ if (ti->Recording())
+@@ -263,8 +275,12 @@
+ return;
+ }
+ }
++#if VDRVERSNUM >= 10338
++ else
++#else
+
+ if (!Name)
++#endif
+ {
+ // remove timers that finished recording from TimersRecording
+ for (cRecObj *r = CurrentRecordings.First(); r; r = CurrentRecordings.Next(r))
Added: vdr/vdr-plugin-recstatus/trunk/debian/patches/91_recstatus-1.3.31.dpatch
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/patches/91_recstatus-1.3.31.dpatch 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/patches/91_recstatus-1.3.31.dpatch 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_recstatus-1.3.31.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compatibility to VDR < 1.3.31.
+
+ at DPATCH@
+--- recstatus-0.0.1.beta1/recstatus.c
++++ recstatus-0.0.1.beta1/recstatus.c
+@@ -156,8 +156,10 @@
+ virtual cMenuSetupPage *SetupMenu(void);
+ virtual bool SetupParse(const char *Name, const char *Value);
+ virtual bool Service(const char *Id, void *Data = NULL);
++#if VDRVERSNUM >= 10331
+ virtual const char **SVDRPHelpPages(void);
+ virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
++#endif
+ };
+
+ cPluginRecstatus::cPluginRecstatus(void)
+@@ -227,6 +229,7 @@
+ return false;
+ }
+
++#if VDRVERSNUM >= 10331
+ const char **cPluginRecstatus::SVDRPHelpPages(void)
+ {
+ // Return help text for SVDRP commands this plugin implements
+@@ -238,6 +241,7 @@
+ // Process SVDRP commands this plugin implements
+ return NULL;
+ }
++#endif
+
+ cRecStatusMonitor::cRecStatusMonitor()
+ {
Added: vdr/vdr-plugin-recstatus/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-recstatus/trunk/debian/rules 2006-02-08 16:59:19 UTC (rev 1951)
+++ vdr/vdr-plugin-recstatus/trunk/debian/rules 2006-02-08 16:59:34 UTC (rev 1952)
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ /usr/lib/$(VDR)-dev/dependencies.sh
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-recstatus/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-vdr-dvb-changes
mailing list