r7490 - in /vdr/vdr-plugin-dvd/trunk/debian: changelog patches/00list patches/11_allow-non-existing-dvd-drive.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sat Nov 29 12:49:44 2008
New Revision: 7490

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7490
Log:
Added 11_allow-non-existing-dvd-drive,dpatch to fix problem with VDR beeing
unstartable, when the DVD device can not be accessed (Closes: #501337)

Added:
    vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch
Modified:
    vdr/vdr-plugin-dvd/trunk/debian/changelog
    vdr/vdr-plugin-dvd/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/changelog?rev=7490&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog Sat Nov 29 12:49:44 2008
@@ -1,3 +1,10 @@
+vdr-plugin-dvd (0.3.6~b03+cvs20070813-12) unstable; urgency=low
+
+  * Added 11_allow-non-existing-dvd-drive,dpatch to fix problem with VDR beeing
+    unstartable, when the DVD device can not be accessed (Closes: #501337)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 29 Nov 2008 12:29:17 +0100
+
 vdr-plugin-dvd (0.3.6~b03+cvs20070813-11) unstable; urgency=low
 
   * Changed my maintainer/uploader email address

Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/00list?rev=7490&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list Sat Nov 29 12:49:44 2008
@@ -1,3 +1,4 @@
 04_vdr-dvd_resume
 05_stdint
 10_dvd.c
+11_allow-non-existing-dvd-drive

Added: vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch?rev=7490&op=file
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch (added)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/11_allow-non-existing-dvd-drive.dpatch Sat Nov 29 12:49:44 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_allow-non-existing-dvd-drive.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't let VDR be unstartable, if the DVD drive is not accessible,
+## DP: just log a warning and continue.
+
+ at DPATCH@
+diff -urNad vdr-plugin-dvd-0.3.6~b03+cvs20070813~/dvd.c vdr-plugin-dvd-0.3.6~b03+cvs20070813/dvd.c
+--- vdr-plugin-dvd-0.3.6~b03+cvs20070813~/dvd.c	2004-06-30 08:18:24.000000000 +0200
++++ vdr-plugin-dvd-0.3.6~b03+cvs20070813/dvd.c	2008-11-29 11:00:10.000000000 +0100
+@@ -55,8 +55,8 @@
+ 		fprintf(stderr, "arg: %s\n", optarg);
+ 		cDVD::SetDeviceName(optarg);
+ 		if (!cDVD::DriveExists()) {
+-		    fprintf(stderr, "vdr: DVD drive not found: %s\n", optarg);
+-		    return false;
++		    fprintf(stderr, "vdr: WARNING - DVD drive not found: %s\n", optarg);
++		    esyslog("WARNING - DVD drive not found: %s\n", optarg);
+ 		}
+ 		break;
+ 	    default: