r1635 - in vdr/vdr-plugin-calc/trunk: . debian debian/patches
Thomas Günther
tom-guest at costa.debian.org
Wed Dec 14 22:56:58 UTC 2005
Author: tom-guest
Date: 2005-12-14 22:56:57 +0000 (Wed, 14 Dec 2005)
New Revision: 1635
Added:
vdr/vdr-plugin-calc/trunk/debian/
vdr/vdr-plugin-calc/trunk/debian/changelog
vdr/vdr-plugin-calc/trunk/debian/compat
vdr/vdr-plugin-calc/trunk/debian/control
vdr/vdr-plugin-calc/trunk/debian/copyright
vdr/vdr-plugin-calc/trunk/debian/docs
vdr/vdr-plugin-calc/trunk/debian/install
vdr/vdr-plugin-calc/trunk/debian/patches/
vdr/vdr-plugin-calc/trunk/debian/patches/00list
vdr/vdr-plugin-calc/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-calc/trunk/debian/patches/02_pathes.dpatch
vdr/vdr-plugin-calc/trunk/debian/rules
Log:
Load newtrunk into vdr/vdr-plugin-calc/trunk.
Added: vdr/vdr-plugin-calc/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/changelog 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/changelog 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1,6 @@
+vdr-plugin-calc (0+0.0.1rc5-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 12 Dec 2005 22:52:58 +0100
+
Added: vdr/vdr-plugin-calc/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/compat 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/compat 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-calc/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/control 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/control 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1,17 @@
+Source: vdr-plugin-calc
+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.37-1), dpatch
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-calc
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}, bc
+Conflicts: ${vdr:Conflicts}
+Description: Calculator plugin for VDR
+ This is a small calculator plugin for the VDR. It supports the 4 basic
+ mathematic functions plus a memory, just like your pocket calculator.
+ It now has also the basic trigonometric functions.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-calc/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/copyright 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/copyright 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1,11 @@
+This package was debianized by Thomas Günther <tom at toms-cafe.de> on
+Mon, 12 Dec 2005 22:52:58 +0100.
+
+It was downloaded from http://mitglied.lycos.de/delta3997/vdr-calc-0.0.1-rc5.tgz
+
+Upstream Author: Eric Svenson
+
+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-calc/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/docs 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/docs 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-calc/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/install 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/install 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1 @@
+libvdr-calc.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-calc/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/patches/00list 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/patches/00list 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1,2 @@
+01_Makefile-fPIC-fix
+02_pathes
Added: vdr/vdr-plugin-calc/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-12-14 22:56:57 UTC (rev 1635)
@@ -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-calc/trunk/debian/patches/02_pathes.dpatch
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/patches/02_pathes.dpatch 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/patches/02_pathes.dpatch 2005-12-14 22:56:57 UTC (rev 1635)
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_pathes.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set pathes for bc executable and temporary files. Remove temporary files.
+
+ at DPATCH@
+--- calc-0.0.1-rc5/calc.c
++++ calc-0.0.1-rc5/calc.c
+@@ -486,12 +486,12 @@
+ {
+ FILE *f;
+ // printf("inOperand1 %s inOperand2 %s operator %c\n",inOperand1,inOperand2,cOperator);
+- f = fopen("./bc_in.dat","w");
++ f = fopen("/tmp/bc_in.dat","w");
+ fprintf(f,"scale = 10\n");
+ fprintf(f,"%s%c%s\n",inOperand1,cOperator,inOperand2);
+ fclose(f);
+- system("bc <./bc_in.dat >./bc_out.dat");
+- f = fopen("./bc_out.dat","r");
++ system("/usr/bin/bc </tmp/bc_in.dat >/tmp/bc_out.dat");
++ f = fopen("/tmp/bc_out.dat","r");
+ if (f != NULL)
+ {
+ fscanf(f,"%s",outOperand);
+@@ -499,6 +499,8 @@
+ }
+ else
+ printf("VDR-Calc : bc run failed !!\n");
++ remove("/tmp/bc_in.dat");
++ remove("/tmp/bc_out.dat");
+ }
+
+ void cCalcMain::CalculateResultTrig(char* inOperand1, char *outOperand, char cOperator, gradType calculateGradType)
+@@ -512,7 +514,7 @@
+ CalculateResult(inOperand1, "(3.1415926535/200)",inOperand1, '*');
+
+ // printf("inOperand1 %s inOperand2 %s operator %c\n",inOperand1,inOperand2,cOperator);
+- f = fopen("./bc_in.dat","w");
++ f = fopen("/tmp/bc_in.dat","w");
+ fprintf(f,"scale = 10\n");
+
+ // only valid for cOperator == s, c, t (for sin,cos,tan)
+@@ -525,8 +527,8 @@
+ fprintf(f,"s(%s)/c(%s)\n",inOperand1,inOperand1);
+ }
+ fclose(f);
+- system("bc -l <./bc_in.dat >./bc_out.dat");
+- f = fopen("./bc_out.dat","r");
++ system("/usr/bin/bc -l </tmp/bc_in.dat >/tmp/bc_out.dat");
++ f = fopen("/tmp/bc_out.dat","r");
+ if (f != NULL)
+ {
+ fscanf(f,"%s",outOperand);
+@@ -534,6 +536,8 @@
+ }
+ else
+ printf("VDR-Calc : bc run failed !!\n");
++ remove("/tmp/bc_in.dat");
++ remove("/tmp/bc_out.dat");
+ clearOutputForNextDigit = true;
+ }
+
Added: vdr/vdr-plugin-calc/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-calc/trunk/debian/rules 2005-12-14 22:56:43 UTC (rev 1634)
+++ vdr/vdr-plugin-calc/trunk/debian/rules 2005-12-14 22:56:57 UTC (rev 1635)
@@ -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-calc/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-vdr-dvb-changes
mailing list