r3469 - in vdr/vdr-plugin-xineliboutput/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-09-30 14:03:20 +0000 (Sat, 30 Sep 2006)
New Revision: 3469

Removed:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch
Modified:
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
Log:
* New upstream release
* Removed 99_nosignal-order.dpatch - fixed upstream


Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-09-30 13:56:45 UTC (rev 3468)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-09-30 14:03:20 UTC (rev 3469)
@@ -1,12 +1,17 @@
-vdr-plugin-xineliboutput (0.99rc4+cvs20060910-3) UNRELEASED; urgency=low
+vdr-plugin-xineliboutput (1.0.0~pre5-1) unstable; urgency=low
 
+  [ Thomas Schmidt ]
   * Build-Depend on vdr-dev (>=1.4.3-1)
   * Build-Depend on sharutils
   * Added myself to Uploaders
   * Added note about the Debian maintainers to debian/copyright
 
- -- Thomas Schmidt <tschmidt at debian.org>  Sat, 23 Sep 2006 21:48:18 +0200
+  [ Tobias Grimm ]
+  * New upstream release
+  * Removed 99_nosignal-order.dpatch - fixed upstream
 
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 30 Sep 2006 16:02:53 +0200
+
 vdr-plugin-xineliboutput (0.99rc4+cvs20060910-2) unstable; urgency=low
 
   * Added author of nosignal.mpg to copyright file

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-09-30 13:56:45 UTC (rev 3468)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-09-30 14:03:20 UTC (rev 3469)
@@ -1,2 +1 @@
 10_nosignal
-99_nosignal-order

Deleted: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch	2006-09-30 13:56:45 UTC (rev 3468)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/99_nosignal-order.dpatch	2006-09-30 14:03:20 UTC (rev 3469)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_nosignal-order.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060910~/xine_input_vdr.c vdr-plugin-xineliboutput-0.99rc4+cvs20060910/xine_input_vdr.c
---- vdr-plugin-xineliboutput-0.99rc4+cvs20060910~/xine_input_vdr.c	2006-09-10 17:07:42.000000000 +0200
-+++ vdr-plugin-xineliboutput-0.99rc4+cvs20060910/xine_input_vdr.c	2006-09-10 21:24:49.000000000 +0200
-@@ -1087,11 +1087,11 @@
- 
-   asprintf(&home,"%s/.xine/nosignal.mpg", xine_get_homedir());
-   int fd = open(path=home, O_RDONLY);
--  if(fd<0) fd = open(path=NOSIGNAL_IMAGE_FILE, O_RDONLY);
-   if(fd<0) fd = open(path="/etc/vdr/plugins/xineliboutput/nosignal.mpg", O_RDONLY);
-   if(fd<0) fd = open(path="/etc/vdr/plugins/xine/noSignal.mpg", O_RDONLY);
-   if(fd<0) fd = open(path="/video/plugins/xineliboutput/nosignal.mpg", O_RDONLY);
-   if(fd<0) fd = open(path="/video/plugins/xine/noSignal.mpg", O_RDONLY);
-+  if(fd<0) fd = open(path=NOSIGNAL_IMAGE_FILE, O_RDONLY);
-   if(fd>=0) {
-     tmp = data = malloc(NOSIGNAL_MAX_SIZE);
-     datalen = read(fd, data, NOSIGNAL_MAX_SIZE);