r4154 - in vdr/vdr-plugin-filebrowser/trunk: . debian debian/patches
Tobias Grimm
tiber-guest at alioth.debian.org
Sat Feb 3 18:09:05 CET 2007
Author: tiber-guest
Date: 2007-02-03 18:09:05 +0100 (Sat, 03 Feb 2007)
New Revision: 4154
Added:
vdr/vdr-plugin-filebrowser/trunk/debian/
vdr/vdr-plugin-filebrowser/trunk/debian/changelog
vdr/vdr-plugin-filebrowser/trunk/debian/commands.conf
vdr/vdr-plugin-filebrowser/trunk/debian/compat
vdr/vdr-plugin-filebrowser/trunk/debian/control
vdr/vdr-plugin-filebrowser/trunk/debian/copyright
vdr/vdr-plugin-filebrowser/trunk/debian/docs
vdr/vdr-plugin-filebrowser/trunk/debian/examples
vdr/vdr-plugin-filebrowser/trunk/debian/install
vdr/vdr-plugin-filebrowser/trunk/debian/links
vdr/vdr-plugin-filebrowser/trunk/debian/order.conf
vdr/vdr-plugin-filebrowser/trunk/debian/othercommands.conf
vdr/vdr-plugin-filebrowser/trunk/debian/patches/
vdr/vdr-plugin-filebrowser/trunk/debian/patches/00list
vdr/vdr-plugin-filebrowser/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-filebrowser/trunk/debian/patches/10_smarter-conf-files.dpatch
vdr/vdr-plugin-filebrowser/trunk/debian/rules
vdr/vdr-plugin-filebrowser/trunk/debian/sources.conf
vdr/vdr-plugin-filebrowser/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: vdr/vdr-plugin-filebrowser/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: vdr/vdr-plugin-filebrowser/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/changelog 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/changelog 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,6 @@
+vdr-plugin-filebrowser (0.0.6-1) unstable; urgency=low
+
+ * Initial release (Closes: #409433)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 3 Feb 2007 01:51:53 +0100
+
Added: vdr/vdr-plugin-filebrowser/trunk/debian/commands.conf
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/commands.conf 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/commands.conf 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,7 @@
+#
+# commands configuration for the filebrowser plugin
+#
+# see /usr/share/doc/vdr-plugin-filebrowser/README.gz
+# and /usr/share/doc/vdr-plugin-filebrowser/examples/commands.conf
+#
+
Added: vdr/vdr-plugin-filebrowser/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/compat 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/compat 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-filebrowser/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/control 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/control 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-filebrowser
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>= 4.1.16), dpatch, vdr-dev (>= 1.4.5-1)
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-filebrowser
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Description: VDR plugin for file browsing and executing shell commands
+ With this plugin it's possible to browse the file system in VDR's OSD.
+ It's possible to define commands, that can be executed with the currently
+ selected files. The commands will be executed asynchronously in background.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-filebrowser/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/copyright 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/copyright 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,16 @@
+This package was debianized by Tobias Grimm <tg at e-tobi.net> on
+Sat, 3 Feb 2007 01:51:53 +0100.
+
+It was downloaded from http://www.stud.uni-karlsruhe.de/~uqg8/vdr/filebrowser/
+
+Upstream Author: Holger Brunn <holger.brunn at stud.uni-karlsruhe.de>
+
+Copyright: (C) 2006, Holger Brunn
+
+The Debian packaging is (C) 2007, Tobias Grimm <tg at e-tobi.net> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+License:
+
+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-filebrowser/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/docs 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/docs 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-filebrowser/trunk/debian/examples
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/examples 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/examples 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,2 @@
+examples/filebrowser/*
+examples/scripts
Added: vdr/vdr-plugin-filebrowser/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/install 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/install 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,5 @@
+libvdr-filebrowser.so.* usr/lib/vdr/plugins/
+debian/commands.conf etc/vdr/plugins/filebrowser/
+debian/order.conf etc/vdr/plugins/filebrowser/
+debian/othercommands.conf etc/vdr/plugins/filebrowser/
+debian/sources.conf etc/vdr/plugins/filebrowser/
Added: vdr/vdr-plugin-filebrowser/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/links 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/links 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,4 @@
+etc/vdr/plugins/filebrowser/commands.conf var/lib/vdr/plugins/filebrowser/commands.conf
+etc/vdr/plugins/filebrowser/order.conf var/lib/vdr/plugins/filebrowser/order.conf
+etc/vdr/plugins/filebrowser/othercommands.conf var/lib/vdr/plugins/filebrowser/othercommands.conf
+etc/vdr/plugins/filebrowser/sources.conf var/lib/vdr/plugins/filebrowser/sources.conf
Added: vdr/vdr-plugin-filebrowser/trunk/debian/order.conf
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/order.conf 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/order.conf 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,7 @@
+#
+# commands order configuration for the filebrowser plugin
+#
+# see /usr/share/doc/vdr-plugin-filebrowser/README.gz
+# and /usr/share/doc/vdr-plugin-filebrowser/examples/order.conf
+#
+
Added: vdr/vdr-plugin-filebrowser/trunk/debian/othercommands.conf
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/othercommands.conf 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/othercommands.conf 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,7 @@
+#
+# othercommands configuration for the filebrowser plugin
+#
+# see /usr/share/doc/vdr-plugin-filebrowser/README.gz
+# and /usr/share/doc/vdr-plugin-filebrowser/examples/othercommands.conf
+#
+
Added: vdr/vdr-plugin-filebrowser/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/patches/00list 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/patches/00list 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,2 @@
+01_Makefile-fPIC-fix
+10_smarter-conf-files
Added: vdr/vdr-plugin-filebrowser/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-02-03 17:09:05 UTC (rev 4154)
@@ -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:
+
Property changes on: vdr/vdr-plugin-filebrowser/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-filebrowser/trunk/debian/patches/10_smarter-conf-files.dpatch
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/patches/10_smarter-conf-files.dpatch 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/patches/10_smarter-conf-files.dpatch 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_smarter-conf-files.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow comments in conf files
+
+ at DPATCH@
+diff -urNad filebrowser-0.0.6~/tools.c filebrowser-0.0.6/tools.c
+--- filebrowser-0.0.6~/tools.c 2007-02-03 17:14:06.000000000 +0100
++++ filebrowser-0.0.6/tools.c 2007-02-03 17:38:00.000000000 +0100
+@@ -16,6 +16,7 @@
+ ***************************************************************************/
+
+ #include <malloc.h>
++#include <ctype.h>
+ #include "tools.h"
+
+ /*
+@@ -74,7 +75,47 @@
+ {
+ return NULL;
+ }
+- return Reader->Read(File);
++
++ char *line;
++ do
++ {
++ line = Reader->Read(File);
++ StripComment(line);
++ } while ((line != NULL) && IsBlank(line));
++
++ return line;
++}
++
++void cConfigReader::StripComment(char* string)
++{
++ if (string)
++ {
++ char *commentPosition = strchr(string, '#');
++ if (commentPosition)
++ {
++ *commentPosition = 0;
++ }
++ }
++}
++
++bool cConfigReader::IsBlank(const char* string)
++{
++ bool blank = true;
++
++ if (string != NULL)
++ {
++ int len = strlen(string);
++ for (int i = 0; i < len; i++)
++ {
++ if (!isspace(string[i]))
++ {
++ blank = false;
++ break;
++ }
++ }
++ }
++
++ return blank;
+ }
+
+ /*
+diff -urNad filebrowser-0.0.6~/tools.h filebrowser-0.0.6/tools.h
+--- filebrowser-0.0.6~/tools.h 2007-02-03 17:14:06.000000000 +0100
++++ filebrowser-0.0.6/tools.h 2007-02-03 17:38:00.000000000 +0100
+@@ -71,6 +71,9 @@
+ cConfigReader(cFilebrowserStatebag* Statebag, char* Filename);
+ ~cConfigReader();
+ char* Read();
++ private:
++ void StripComment(char* string);
++ bool IsBlank(const char* string);
+ };
+
+ class cConfigParser
Property changes on: vdr/vdr-plugin-filebrowser/trunk/debian/patches/10_smarter-conf-files.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-filebrowser/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/rules 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/rules 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,93 @@
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
+# 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
+
+# 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
+
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all $(MAKE_OPTIONS)
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ 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
+ sh /usr/share/vdr-dev/patchlevel.sh subst
+ sh /usr/share/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-filebrowser/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-filebrowser/trunk/debian/sources.conf
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/sources.conf 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/sources.conf 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,6 @@
+#
+# sources configuration for the filebrowser plugin
+#
+# see /usr/share/doc/vdr-plugin-filebrowser/README.gz
+# and /usr/share/doc/vdr-plugin-filebrowser/examples/sources.conf
+#
Added: vdr/vdr-plugin-filebrowser/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-filebrowser/trunk/debian/watch 2007-02-03 17:08:55 UTC (rev 4153)
+++ vdr/vdr-plugin-filebrowser/trunk/debian/watch 2007-02-03 17:09:05 UTC (rev 4154)
@@ -0,0 +1,2 @@
+version=2
+http://www.stud.uni-karlsruhe.de/~uqg8/vdr/filebrowser/vdr-filebrowser-([0-9.]*)\.tgz
More information about the pkg-vdr-dvb-changes
mailing list