r170 - in vdr/vdr-plugin-streamdev/trunk: . debian debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 23:37:38 +0100
Author: tschmidt
Date: 2005-02-23 23:37:37 +0100 (Wed, 23 Feb 2005)
New Revision: 170
Added:
vdr/vdr-plugin-streamdev/trunk/debian/
vdr/vdr-plugin-streamdev/trunk/debian/changelog
vdr/vdr-plugin-streamdev/trunk/debian/compat
vdr/vdr-plugin-streamdev/trunk/debian/control
vdr/vdr-plugin-streamdev/trunk/debian/copyright
vdr/vdr-plugin-streamdev/trunk/debian/patches/
vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-streamdev/trunk/debian/rules
vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.docs
vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.install
vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.docs
vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.examples
vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.install
vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.links
vdr/vdr-plugin-streamdev/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-streamdev/trunk.
Added: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,75 @@
+vdr-plugin-streamdev (0.3.1-4) unstable; urgency=low
+
+ !!! unreleased !!!
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Changed maintainer to Debian VDR Team
+ - Added Peter Siering and myself as Uploaders
+ - Build-depend on vdr 1.2.6-6 only
+ - Conflict with vdr (>=1.2.7)
+ - Converted debian/changelog to UTF8
+ - Converted existing dpatch-file to new short format
+ - Build-depend on dpatch (>=2.0.9)
+ * Tobias Grimm <tg@e-tobi.net>
+ - Using debian/compat now
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 2 Jan 2005 12:55:03 +0100
+
+vdr-plugin-streamdev (0.3.1-3) unstable; urgency=low
+
+ * adapted for vdr 1.2.6-27
+ * taken from vdrdevel by Thomas Günther <tom@toms-cafe.de>
+ - Adapted control file to alioth packages
+ - Using patchlevel.sh and custom control field "vdr-patchlevel"
+ - Added Makefile-fPIC-fix patch to fix potential FTBFS
+
+ -- Tobias Grimm <tg@e-tobi.net> Tue, 28 Sep 2004 00:25:00 +0200
+
+vdr-plugin-streamdev (0.3.1-2) unstable; urgency=low
+
+ * Using dh_install
+ * Added debian/watch file for uscan
+
+ -- Thomas Günther <tom@toms-cafe.de> Wed, 7 Jul 2004 03:03:20 +0200
+
+vdr-plugin-streamdev (0.3.1-1) unstable; urgency=low
+
+ * New upstream release (breaks it into two, client and server)
+
+ -- Peter Siering <ps@ctmagazin.de> Fri, 20 Feb 2004 19:34:00 +0100
+
+vdr-plugin-streamdev (0.3.0-2) unstable; urgency=low
+
+ * integrated patchlevel info
+
+ -- Peter Siering <ps@ctmagazin.de> Tue, 13 Jan 2004 23:45:00 +0200
+
+vdr-plugin-streamdev (0.3.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Peter Siering <ps@ctmagazin.de> Thu, 8 Jan 2004 21:47:54 +0100
+
+vdr-plugin-streamdev (0.2.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Peter Siering <ps@ctmagazin.de> Mon, 6 Oct 2003 18:28:08 +0200
+
+vdr-plugin-streamdev (0.1.0beta4-3) unstable; urgency=low
+
+ * move plugin from /usr/share to /usr/lib
+
+ -- Peter Siering <ps@ctmagazin.de> Thu, 04 Oct 2003 12:00:00 +0200
+
+vdr-plugin-streamdev (0.1.0beta4-2) unstable; urgency=low
+
+ * fixed depends, fixed control file
+
+ -- Peter Siering <ps@ctmagazin.de> Thu, 29 Sep 2003 15:00:00 +0200
+
+vdr-plugin-streamdev (0.1.0beta4-1) unstable; urgency=low
+
+ * debianized
+
+ -- Peter Siering <ps@ctmagazin.de> Thu, 17 Sep 2003 22:00:00 +0200
Added: vdr/vdr-plugin-streamdev/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/compat 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/compat 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-streamdev/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/control 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/control 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,31 @@
+Source: vdr-plugin-streamdev
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Peter Siering <ps@ctmagazin.de>, Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.2.6-6), dpatch (>=2.0.9)
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-streamdev-client
+Architecture: any
+Depends: vdr (>=1.2.6-6), ${shlibs:Depends}
+Conflicts: vdr-plugin-streamdev, vdr (>=1.2.7)
+Replaces: vdr-plugin-streamdev
+Description: Plugin to vdr that lets the software play streams
+ This plugin for vdr lets the software stream videos into
+ the network. You can interconnect several vdrs that way
+ or watch those streams with special client apps like video
+ lan client or mplayer. This is the client part.
+XB-VDR-Patchlevel: ${patchlevel}
+
+Package: vdr-plugin-streamdev-server
+Architecture: any
+Depends: vdr (>=1.2.6-6), ${shlibs:Depends}
+Conflicts: vdr-plugin-streamdev, vdr (>=1.2.7)
+Replaces: vdr-plugin-streamdev
+Description: Plugin to vdr that lets the software stream
+ This plugin for vdr lets the software stream videos into
+ the network. You can interconnect several vdrs that way
+ or watch those streams with special client apps like video
+ lan client or mplayer. This is the server part.
+XB-VDR-Patchlevel: ${patchlevel}
Added: vdr/vdr-plugin-streamdev/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/copyright 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/copyright 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,25 @@
+This package was debianized by Peter Siering <ps@ctmagazin.de> on
+Thu, 18 Sep 2003 22:00:00 +0200.
+
+It was downloaded from http://www.magoa.net/linux/
+
+Upstream Author: Sascha Volkenandt <sascha@akv-soft.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-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1 @@
+01_Makefile-fPIC-fix
Added: vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,29 @@
+#!/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 Makefiles to fix potential FTBFS.
+
+@DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-streamdev/Makefile vdrdevel-plugin-streamdev/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-streamdev/Makefile Mon Feb 16 13:08:37 2004
++++ vdrdevel-plugin-streamdev/Makefile Sat Sep 11 15:29:36 2004
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -W -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -W -Woverloaded-virtual
+
+ ### The directory environment:
+
+diff -urNad /usr/src/cvs/vdrdevel-plugin-streamdev/libdvbmpeg/Makefile vdrdevel-plugin-streamdev/libdvbmpeg/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-streamdev/libdvbmpeg/Makefile Fri Sep 26 15:20:39 2003
++++ vdrdevel-plugin-streamdev/libdvbmpeg/Makefile Sat Sep 11 15:32:00 2004
+@@ -1,5 +1,5 @@
+ INCS = -I.
+-CFLAGS = -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
++CFLAGS = -fPIC -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ MFLAG = -M
+ OBJS = ctools.o ringbuffy.o remux.o transform.o cpptools.o
+ SRC = $(wildcard *.c)
Added: vdr/vdr-plugin-streamdev/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/rules 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/rules 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,98 @@
+#!/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=.
+ cp streamdevhosts.conf.example streamdevhosts.conf
+ 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.*
+ rm -f streamdevhosts.conf
+ 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
+ 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-streamdev/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.docs
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.docs 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.docs 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,2 @@
+README
+PROTOCOL
Added: vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.install
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.install 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-client.install 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1 @@
+libvdr-streamdev-client.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.docs
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.docs 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.docs 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,2 @@
+README
+PROTOCOL
Added: vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.examples
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.examples 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.examples 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1 @@
+streamdevhosts.conf.example
Added: vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.install
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.install 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.install 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,2 @@
+libvdr-streamdev-server.so.* usr/lib/vdr/plugins/
+streamdevhosts.conf etc/vdr/plugins/
Added: vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.links
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.links 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/vdr-plugin-streamdev-server.links 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1 @@
+etc/vdr/plugins/streamdevhosts.conf var/lib/vdr/plugins/streamdevhosts.conf
Added: vdr/vdr-plugin-streamdev/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/watch 2005-02-23 22:37:22 UTC (rev 169)
+++ vdr/vdr-plugin-streamdev/trunk/debian/watch 2005-02-23 22:37:37 UTC (rev 170)
@@ -0,0 +1,2 @@
+version=2
+http://www.magoa.net/linux/index.php?view=streamdev-unstable .*/vdr-streamdev-(.*)\.tgz