r72 - in vdr/vdr-plugin-console/trunk: . debian debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 12:55:40 +0100
Author: tschmidt
Date: 2005-02-23 12:55:39 +0100 (Wed, 23 Feb 2005)
New Revision: 72
Added:
vdr/vdr-plugin-console/trunk/debian/
vdr/vdr-plugin-console/trunk/debian/changelog
vdr/vdr-plugin-console/trunk/debian/control
vdr/vdr-plugin-console/trunk/debian/copyright
vdr/vdr-plugin-console/trunk/debian/docs
vdr/vdr-plugin-console/trunk/debian/install
vdr/vdr-plugin-console/trunk/debian/patches/
vdr/vdr-plugin-console/trunk/debian/patches/00list
vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch
vdr/vdr-plugin-console/trunk/debian/rules
vdr/vdr-plugin-console/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-console/trunk.
Added: vdr/vdr-plugin-console/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/changelog 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/changelog 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,135 @@
+vdr-plugin-console (0.5.1-14) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - First upload to the official archive (closes: #278045)
+ - Added watch-file
+ - Added patchlevel-mechanism, to be compatible with c't-vdr
+ - Use dh_install
+ - Changed maintainer to Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+ - Use dpatch, so build-dep on dpatch
+ - Add 01_Makefile-fPIC-fix.dpatch
+ - Changed architecture to any
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 24 Oct 2004 15:31:17 +0200
+
+vdr-plugin-console (0.5.1-13) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.6
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 16 Nov 2003 13:48:34 +0100
+
+vdr-plugin-console (0.5.1-12) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.5
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 17 Sep 2003 20:11:15 +0200
+
+vdr-plugin-console (0.5.1-11) unstable; urgency=low
+
+ * Applied patch from Andreas Kool <akool@akool.de>, to work correctly with
+ vdr 1.2.5pre3
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Tue, 16 Sep 2003 22:41:21 +0200
+
+vdr-plugin-console (0.5.1-10) unstable; urgency=low
+
+ * changed the plugin-dir to /usr/lib/vdr/plugins, to be FHS compliant
+ Thanks to Henning Glawe <glaweh@physik.fu-berlin.de> for pointing me
+ to this one
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 14 Sep 2003 16:19:38 +0200
+
+vdr-plugin-console (0.5.1-9) unstable; urgency=low
+
+ * Changed debian/rules and debian/control (added debian/control.template),
+ so that the correct dependancy to vdr is filled out automatically on the
+ version of vdr-dev, you have installed
+ * Bump Standards-Version to 3.6.1
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 10 Sep 2003 10:13:27 +0200
+
+vdr-plugin-console (0.5.1-8) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.2
+ * Bump Standards-Version to 3.6.0
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 13 Aug 2003 10:28:30 +0200
+
+vdr-plugin-console (0.5.1-7) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.1
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Mon, 9 Jun 2003 19:01:25 +0200
+
+vdr-plugin-console (0.5.1-6) unstable; urgency=low
+
+ * Rebuild for vdr 1.2.0
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 1 Jun 2003 21:52:09 +0200
+
+vdr-plugin-console (0.5.1-5) unstable; urgency=low
+
+ * Rebuild for vdr 1.1.29
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 30 Apr 2003 17:53:36 +0200
+
+vdr-plugin-console (0.5.1-4) unstable; urgency=low
+
+ * rebuild for vdr 1.1.28
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Tue, 22 Apr 2003 12:35:29 +0200
+
+vdr-plugin-console (0.5.1-3) unstable; urgency=low
+
+ * rebuild for vdr 1.1.27
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 13 Apr 2003 15:38:16 +0200
+
+vdr-plugin-console (0.5.1-2) unstable; urgency=low
+
+ * rebuild for vdr 1.1.25
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 5 Mar 2003 19:58:43 +0100
+
+vdr-plugin-console (0.5.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 15 Jan 2003 18:31:02 +0100
+
+vdr-plugin-console (0.3.0-2) unstable; urgency=low
+
+ * build for vdr 1.1.20
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 15 Dec 2002 18:43:34 +0100
+
+vdr-plugin-console (0.3.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Wed, 11 Dec 2002 02:39:58 +0100
+
+vdr-plugin-console (0.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * build for vdr 1.1.19
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Mon, 9 Dec 2002 23:49:24 +0100
+
+vdr-plugin-console (0.2.0-2) unstable; urgency=low
+
+ * rebuild for vdr 1.1.18
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Mon, 2 Dec 2002 12:39:53 +0100
+
+vdr-plugin-console (0.2.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 1 Dec 2002 14:37:58 +0100
+
+vdr-plugin-console (0.1.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Tue, 19 Nov 2002 12:35:39 +0100
Added: vdr/vdr-plugin-console/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/control 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/control 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,17 @@
+Source: vdr-plugin-console
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>=1.1.16), dpatch
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-console
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>=1.2.6)
+Conflicts: vdr (>=1.2.7)
+Description: Plugin for vdr that implements a virtual terminal
+ This plugin for vdr implements a virtual terminal, that can be
+ displayed by vdr's OSD, it allows you to display and control
+ allmost every console application.
+XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-console/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/copyright 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/copyright 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,25 @@
+This package was debianized by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> on
+Tue, 19 Nov 2002 12:35:00 +0200.
+
+It was downloaded from http://ricomp.de/vdr/
+
+Upstream Author: Jan Rieger <jan@ricomp.de>
+
+Copyright:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ see /usr/share/common-licenses/GPL
+
Added: vdr/vdr-plugin-console/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/docs 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/docs 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,2 @@
+README
+HISTORY
Added: vdr/vdr-plugin-console/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/install 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/install 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1 @@
+libvdr-*.so.* usr/lib/vdr/plugins
Added: vdr/vdr-plugin-console/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/00list 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/patches/00list 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,2 @@
+01_Makefile-fPIC-fix
+02_menu.h-fix
Added: vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/Makefile vdr-plugin-console-0.5.1/Makefile
+--- /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/Makefile 2003-09-10 10:19:14.000000000 +0200
++++ vdr-plugin-console-0.5.1/Makefile 2004-08-06 19:05:04.000000000 +0200
+@@ -16,7 +16,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-console/trunk/debian/patches/02_menu.h-fix.dpatch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/patches/02_menu.h-fix.dpatch 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+## 02_menu.h-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix menu.h, so that the plugin works with vdr (>=1.2.5pre3)
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/menu.h vdr-plugin-console-0.5.1/menu.h
+--- /usr/src/self-compiled/vdr/plugins/console/vdr-plugin-console-0.5.1/menu.h 2002-12-31 13:09:24.000000000 +0100
++++ vdr-plugin-console-0.5.1/menu.h 2004-08-06 19:08:07.000000000 +0200
+@@ -161,7 +161,6 @@
+ public:
+ cMenuConsole( int consoleNr );
+ virtual eOSState ProcessKey( eKeys Key );
+- void Display();
+ };
+
+
Added: vdr/vdr-plugin-console/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/rules 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/rules 2005-02-23 11:55:39 UTC (rev 72)
@@ -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
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# include dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+VDR=vdr
+PACKAGE=$(VDR)-plugin-console
+VDRDIR=/usr/include/$(VDR)
+DVBDIR=/usr/include
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ touch configure-stamp
+
+
+build: patch-stamp build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ $(MAKE) all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=. REMOTE=lirc
+
+ touch build-stamp
+
+clean: clean-patched unpatch
+
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ rm -f libvdr-*.so*
+ make clean
+
+ 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_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installcron
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+
+ # VDR can be customized with quite a lot of different patches, which can make
+ # the plugins binary incompatible.
+ # Although Debian will not provide different binary packages for VDR, we
+ # will include a patchlevel info, which is created at compile time and can
+ # be checked before a plugin is loaded.
+
+ [ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
+ [ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
+
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
Property changes on: vdr/vdr-plugin-console/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-console/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-console/trunk/debian/watch 2005-02-23 11:55:24 UTC (rev 71)
+++ vdr/vdr-plugin-console/trunk/debian/watch 2005-02-23 11:55:39 UTC (rev 72)
@@ -0,0 +1,2 @@
+version=2
+http://ricomp.de/vdr/vdr-console-(.*).tgz debian uupdate