r364 - in vdr/vdr-plugin-dvd/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Fri, 01 Apr 2005 19:48:08 +0000
Author: tschmidt
Date: 2005-04-01 19:48:08 +0000 (Fri, 01 Apr 2005)
New Revision: 364
Added:
vdr/vdr-plugin-dvd/trunk/debian/links
vdr/vdr-plugin-dvd/trunk/debian/patches/02_ignore_not_existing_drive.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch
vdr/vdr-plugin-dvd/trunk/debian/plugin.dvd.conf
Modified:
vdr/vdr-plugin-dvd/trunk/debian/changelog
vdr/vdr-plugin-dvd/trunk/debian/install
vdr/vdr-plugin-dvd/trunk/debian/patches/00list
Log:
vdr-plugin-dvd:
* Added symlink /var/cache/vdr/dvd, which points to /dev/dvd
* Added the dpatches from Tobias, so we should have more or
less the same source in both repositories
Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog 2005-04-01 19:48:08 UTC (rev 364)
@@ -1,3 +1,20 @@
+vdr-plugin-dvd (0.3.4-rc10-3) unstable; urgency=low
+
+ * NOT RELEASED YET
+
+ * Tobias Grimm <tg@e-tobi.net>
+ - Make default DVD device /var/cache/vdr/dvd pointing to /dev/dvd
+ in order to make it possible for vdr to change this link when
+ not running as root
+ - Added patch to don't let the plugin abort the VDR start, when
+ the DVD device provided by the command line parameter -C does
+ not exist
+ * Thomas Schmidt <tschmidt@debian.org>
+ - Added 10_dvd.c.dpatch from Tobias to remove the stderr output
+ on correctly parsed -C parameters
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Fri, 01 Apr 2005 13:43:03 +0200
+
vdr-plugin-dvd (0.3.4-rc10-2) unstable; urgency=low
* Thomas Schmidt <tschmidt@debian.org>
Modified: vdr/vdr-plugin-dvd/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/install 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/install 2005-04-01 19:48:08 UTC (rev 364)
@@ -1 +1,2 @@
-libvdr-dvd.so.* usr/lib/vdr/plugins
+libvdr-dvd.so.* usr/lib/vdr/plugins/
+debian/plugin.dvd.conf etc/vdr/plugins/
Added: vdr/vdr-plugin-dvd/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/links 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/links 2005-04-01 19:48:08 UTC (rev 364)
@@ -0,0 +1 @@
+dev/dvd var/cache/vdr/dvd
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list 2005-04-01 19:48:08 UTC (rev 364)
@@ -1 +1,3 @@
01_Makefile-fPIC-fix
+02_ignore_not_existing_drive
+10_dvd.c
Added: vdr/vdr-plugin-dvd/trunk/debian/patches/02_ignore_not_existing_drive.dpatch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/02_ignore_not_existing_drive.dpatch 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/02_ignore_not_existing_drive.dpatch 2005-04-01 19:48:08 UTC (rev 364)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_ignore_not_existing_drive.dpatch by Tobias Grimm <tg@e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ignore not existing drive instead of aborting the VDR start.
+
+@DPATCH@
+diff -urNad vdr-plugin-dvd/dvd.c /tmp/dpep.9Lk3lV/vdr-plugin-dvd/dvd.c
+--- vdr-plugin-dvd/dvd.c 2005-03-31 22:53:27.000000000 +0200
++++ /tmp/dpep.9Lk3lV/vdr-plugin-dvd/dvd.c 2005-03-31 22:46:21.000000000 +0200
+@@ -44,8 +44,11 @@
+ fprintf(stderr, "arg: %s\n", optarg);
+ cDVD::SetDeviceName(optarg);
+ if (!cDVD::DriveExists()) {
+- fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
+- return false;
++ char* msg = "vdr: DVD drive not found: %s\n using /dev/dvd";
++ fprintf(stderr, msg, optarg);
++ isyslog(msg, optarg);
++ cDVD::SetDeviceName("/dev/dvd");
++ return true;
+ }
+ break;
+ default:
Property changes on: vdr/vdr-plugin-dvd/trunk/debian/patches/02_ignore_not_existing_drive.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/10_dvd.c.dpatch 2005-04-01 19:48:08 UTC (rev 364)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+## dvd.c patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Removes stderr output on correctly parsed -C parameter
+
+@DPATCH@
+
+--- vdr-plugin-dvd-0.3.4-rc4.orig/dvd.c
++++ vdr-plugin-dvd-0.3.4-rc4/dvd.c
+@@ -41,7 +41,7 @@
+ while ((c = getopt_long(argc, argv, "C:", long_options, NULL)) != -1) {
+ switch (c) {
+ case 'C':
+- fprintf(stderr, "arg: %s\n", optarg);
++ // fprintf(stderr, "arg: %s\n", optarg);
+ cDVD::SetDeviceName(optarg);
+ if (!cDVD::DriveExists()) {
+ fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
Added: vdr/vdr-plugin-dvd/trunk/debian/plugin.dvd.conf
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/plugin.dvd.conf 2005-04-01 18:59:45 UTC (rev 363)
+++ vdr/vdr-plugin-dvd/trunk/debian/plugin.dvd.conf 2005-04-01 19:48:08 UTC (rev 364)
@@ -0,0 +1 @@
+-C /var/cache/vdr/dvd