r3771 - in vdr/vdr-plugin-dxr3/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-01-03 21:06:06 +0100 (Wed, 03 Jan 2007)
New Revision: 3771

Added:
   vdr/vdr-plugin-dxr3/trunk/debian/README.Debian
Removed:
   vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch
Modified:
   vdr/vdr-plugin-dxr3/trunk/debian/changelog
   vdr/vdr-plugin-dxr3/trunk/debian/control
   vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
Log:
* Removed 10_em8300_mc_path.dpatch - since em8300 0.16.0-1 the firmware is
  available in /lib/firmware (reported by Brendon Higgins)
* Increased em8300-headers dependency to 0.16.0-1
* Added README.Debian with a note about the required em8300 version

Added: vdr/vdr-plugin-dxr3/trunk/debian/README.Debian
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/README.Debian	2007-01-03 20:05:25 UTC (rev 3770)
+++ vdr/vdr-plugin-dxr3/trunk/debian/README.Debian	2007-01-03 20:06:06 UTC (rev 3771)
@@ -0,0 +1,7 @@
+vdr-plugin-dxr3
+---------------
+
+In order to use vdr-plugin-dxr, you must have the em8300 driver installed.
+Version 0.16.0-1 of the em8300 (available in contrib) is required.
+
+ -- Tobias Grimm <tg at e-tobi.net>  Wed,  3 Jan 2007 20:51:09 +0100

Modified: vdr/vdr-plugin-dxr3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog	2007-01-03 20:05:25 UTC (rev 3770)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog	2007-01-03 20:06:06 UTC (rev 3771)
@@ -1,11 +1,19 @@
 vdr-plugin-dxr3 (0.2.6-8) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+  [ Thomas Günther ]
   * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
     Build-Depend on vdr-dev (>= 1.4.4-2)
 
- -- Thomas Günther <tom at toms-cafe.de>  Sun, 17 Dec 2006 16:25:05 +0100
+  [ Tobias Grimm ]
+  * Removed 10_em8300_mc_path.dpatch - since em8300 0.16.0-1 the firmware is
+    available in /lib/firmware (reported by Brendon Higgins)
+  * Increased em8300-headers dependency to 0.16.0-1
+  * Added README.Debian with a note about the required em8300 version
 
+ -- Tobias Grimm <tg at e-tobi.net>  Wed,  3 Jan 2007 20:51:09 +0100
+
 vdr-plugin-dxr3 (0.2.6-7) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.4-1)

Modified: vdr/vdr-plugin-dxr3/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/control	2007-01-03 20:05:25 UTC (rev 3770)
+++ vdr/vdr-plugin-dxr3/trunk/debian/control	2007-01-03 20:06:06 UTC (rev 3771)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Nicolas Boullis <nboullis at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2), libavcodec-dev (>= 0.cvs20060329-1), em8300-headers
+Build-Depends: debhelper (>> 4.1.16), dpatch (>= 2.0.9), vdr-dev (>= 1.4.4-2), libavcodec-dev (>= 0.cvs20060329-1), em8300-headers (>= 0.16.0-1)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-dxr3

Modified: vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/00list	2007-01-03 20:05:25 UTC (rev 3770)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/00list	2007-01-03 20:06:06 UTC (rev 3771)
@@ -1,5 +1,4 @@
 01_Makefile-fPIC-fix
 02_debian_ffmpeg
-10_em8300_mc_path
 
 90_audioid

Deleted: vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch	2007-01-03 20:05:25 UTC (rev 3770)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/10_em8300_mc_path.dpatch	2007-01-03 20:06:06 UTC (rev 3771)
@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## EM8300 Micro Code path
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes path to EM8300 micro code file
-
- at DPATCH@
-diff -urNad vdr-plugin-dxr3-0.2.5~/Makefile vdr-plugin-dxr3-0.2.5/Makefile
---- vdr-plugin-dxr3-0.2.5~/Makefile	2006-01-15 16:12:22.000000000 +0100
-+++ vdr-plugin-dxr3-0.2.5/Makefile	2006-01-15 16:12:50.000000000 +0100
-@@ -50,7 +50,7 @@
- # where is the microcode for the dxr3 located?  em8300 driver version 0.15.2
- # and later installs it by default to /lib/firmware/em8300.bin, and earlier
- # versions to /usr/share/misc/em8300.uc.
--DEFINES += -DMICROCODE=\"/lib/firmware/em8300.bin\"
-+DEFINES += -DMICROCODE=\"/usr/lib/em8300/em8300.uc\"
- 
- # use OSD scaler borrowed from the Xine plugin?
- # comment this out to use the traditional vdr-dxr3 scaler